diff options
-rw-r--r-- | README.md | 5 | ||||
-rw-r--r-- | core/qmpmidiplay.cpp (renamed from common/qmpmidiplay.cpp) | 0 | ||||
-rw-r--r-- | core/qmpmidiplay.hpp (renamed from common/qmpmidiplay.hpp) | 0 | ||||
-rw-r--r-- | core/qmpmidiread.cpp (renamed from common/qmpmidiread.cpp) | 0 | ||||
-rw-r--r-- | debian/changelog | 24 | ||||
-rw-r--r-- | debian/control | 13 | ||||
-rw-r--r-- | debian/qmidiplayer-lite.install | 1 | ||||
-rw-r--r-- | debian/qmidiplayer.install | 1 | ||||
-rwxr-xr-x | debian/rules | 2 | ||||
-rw-r--r-- | qmidiplayer-desktop/main.cpp (renamed from qmidiplayer.src.d/main.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qdialskulpturestyle.cpp (renamed from qmidiplayer.src.d/qdialskulpturestyle.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qdialskulpturestyle.hpp (renamed from qmidiplayer.src.d/qdialskulpturestyle.hpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmidiplayer-desktop.pro | 64 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpchanneleditor.cpp (renamed from qmidiplayer.src.d/qmpchanneleditor.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpchanneleditor.hpp (renamed from qmidiplayer.src.d/qmpchanneleditor.hpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpchanneleditor.ui (renamed from qmidiplayer.src.d/qmpchanneleditor.ui) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpchannelswindow.cpp (renamed from qmidiplayer.src.d/qmpchannelswindow.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpchannelswindow.hpp (renamed from qmidiplayer.src.d/qmpchannelswindow.hpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpchannelswindow.ui (renamed from qmidiplayer.src.d/qmpchannelswindow.ui) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpefxwindow.cpp (renamed from qmidiplayer.src.d/qmpefxwindow.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpefxwindow.hpp (renamed from qmidiplayer.src.d/qmpefxwindow.hpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpefxwindow.ui (renamed from qmidiplayer.src.d/qmpefxwindow.ui) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmphelpwindow.cpp (renamed from qmidiplayer.src.d/qmphelpwindow.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmphelpwindow.hpp (renamed from qmidiplayer.src.d/qmphelpwindow.hpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmphelpwindow.ui (renamed from qmidiplayer.src.d/qmphelpwindow.ui) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpimidimapper.hpp (renamed from qmidiplayer.src.d/qmpimidimapper.hpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpinfowindow.cpp (renamed from qmidiplayer.src.d/qmpinfowindow.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpinfowindow.hpp (renamed from qmidiplayer.src.d/qmpinfowindow.hpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpinfowindow.ui (renamed from qmidiplayer.src.d/qmpinfowindow.ui) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpmainwindow.cpp (renamed from qmidiplayer.src.d/qmpmainwindow.cpp) | 2 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpmainwindow.hpp (renamed from qmidiplayer.src.d/qmpmainwindow.hpp) | 2 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpmainwindow.ui (renamed from qmidiplayer.src.d/qmpmainwindow.ui) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpplistwindow.cpp (renamed from qmidiplayer.src.d/qmpplistwindow.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpplistwindow.hpp (renamed from qmidiplayer.src.d/qmpplistwindow.hpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpplistwindow.ui (renamed from qmidiplayer.src.d/qmpplistwindow.ui) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmppresetselect.cpp (renamed from qmidiplayer.src.d/qmppresetselect.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmppresetselect.hpp (renamed from qmidiplayer.src.d/qmppresetselect.hpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmppresetselect.ui (renamed from qmidiplayer.src.d/qmppresetselect.ui) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpsettingswindow.cpp (renamed from qmidiplayer.src.d/qmpsettingswindow.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpsettingswindow.hpp (renamed from qmidiplayer.src.d/qmpsettingswindow.hpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/qmpsettingswindow.ui (renamed from qmidiplayer.src.d/qmpsettingswindow.ui) | 0 | ||||
-rw-r--r-- | qmidiplayer-desktop/resources.qrc (renamed from qmidiplayer.src.d/resources.qrc) | 0 | ||||
-rw-r--r-- | qmidiplayer-lite/deployment.pri (renamed from qmidiplayerlite.src.d/deployment.pri) | 2 | ||||
-rw-r--r-- | qmidiplayer-lite/main.cpp (renamed from qmidiplayerlite.src.d/main.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-lite/main.qml (renamed from qmidiplayerlite.src.d/main.qml) | 0 | ||||
-rw-r--r-- | qmidiplayer-lite/qmidiplayer-lite.pro | 24 | ||||
-rw-r--r-- | qmidiplayer-lite/qml.qrc (renamed from qmidiplayerlite.src.d/qml.qrc) | 0 | ||||
-rw-r--r-- | qmidiplayer-lite/qmpcorewrapper.hpp (renamed from qmidiplayerlite.src.d/qmpcorewrapper.hpp) | 2 | ||||
-rw-r--r-- | qmidiplayer-lite/qmpmidiplay.cpp (renamed from qmidiplayerlite.src.d/qmpmidiplay.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-lite/qmpmidiplay.hpp (renamed from qmidiplayerlite.src.d/qmpmidiplay.hpp) | 0 | ||||
-rw-r--r-- | qmidiplayer-lite/qmpmidiread.cpp (renamed from qmidiplayerlite.src.d/qmpmidiread.cpp) | 0 | ||||
-rw-r--r-- | qmidiplayer.pro | 67 | ||||
-rw-r--r-- | qmidiplayerlite.pro | 24 |
53 files changed, 139 insertions, 94 deletions
@@ -1,6 +1,8 @@ # QMidiPlayer A cross-platform midi file player based on libfluidsynth and Qt. +[Project homepage](https://chrisoft.org/QMidiPlayer/) + Now it's in beta stage. Crashes and hangs may still occur, run with gdb attatched if you could. Features: @@ -10,5 +12,8 @@ Features: * Editing synthesizer effects * Rendering midi to wave file * Visualization using SMELT (not implemented) +* MIDI mapping (not implemented) Tested on Debian sid and Windows Vista~10. + +A QML version is now in construction. The whole project is now being overhauled... diff --git a/common/qmpmidiplay.cpp b/core/qmpmidiplay.cpp index 6f69e33..6f69e33 100644 --- a/common/qmpmidiplay.cpp +++ b/core/qmpmidiplay.cpp diff --git a/common/qmpmidiplay.hpp b/core/qmpmidiplay.hpp index fafd677..fafd677 100644 --- a/common/qmpmidiplay.hpp +++ b/core/qmpmidiplay.hpp diff --git a/common/qmpmidiread.cpp b/core/qmpmidiread.cpp index fd2e0d9..fd2e0d9 100644 --- a/common/qmpmidiread.cpp +++ b/core/qmpmidiread.cpp diff --git a/debian/changelog b/debian/changelog index 6437ab1..a57c578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +qmidiplayer (0.7.0-6) UNRELEASED; urgency=low + + * Package qmidiplayer-lite. + + -- chrisoft <chirs241097@gmail.com> Wed, 06 Apr 2016 16:45:02 +0800 + +qmidiplayer (0.7.0-5) UNRELEASED; urgency=low + + * New upstream release. + + -- chrisoft <chirs241097@gmail.com> Wed, 06 Apr 2016 09:43:57 +0800 + +qmidiplayer (0.7.0-4) UNRELEASED; urgency=low + + * New upstream release. + + -- chrisoft <chirs241097@gmail.com> Tue, 05 Apr 2016 22:17:31 +0800 + +qmidiplayer (0.7.0-3) UNRELEASED; urgency=low + + * New upstream release. + + -- chrisoft <chirs241097@gmail.com> Wed, 23 Mar 2016 15:41:15 +0800 + qmidiplayer (0.7.0-2) UNRELEASED; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index c686b55..44eeaae 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,18 @@ Maintainer: Chris Xiong <chirs241097@gmail.com> Section: sound Priority: optional Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 9), qtbase5-dev, qt5-qmake, libfluidsynth-dev +Build-Depends: debhelper (>= 9), qtbase5-dev, qt5-qmake, libfluidsynth-dev, + qml-module-qtquick-controls, + qml-module-qtquick-window2, + qml-module-qtquick2, + libqt5qml5 Package: qmidiplayer Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Midi player based on Qt and fluidsynth.
\ No newline at end of file +Description: Midi player based on Qt and fluidsynth. + +Package: qmidiplayer-lite +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Midi player based on Qt and fluidsynth (Lite version). diff --git a/debian/qmidiplayer-lite.install b/debian/qmidiplayer-lite.install new file mode 100644 index 0000000..ece593e --- /dev/null +++ b/debian/qmidiplayer-lite.install @@ -0,0 +1 @@ +usr/bin/qmidiplayer-lite diff --git a/debian/qmidiplayer.install b/debian/qmidiplayer.install new file mode 100644 index 0000000..ed86d84 --- /dev/null +++ b/debian/qmidiplayer.install @@ -0,0 +1 @@ +usr/bin/qmidiplayer diff --git a/debian/rules b/debian/rules index 589a09a..f88b391 100755 --- a/debian/rules +++ b/debian/rules @@ -2,4 +2,4 @@ %: dh $@ --parallel override_dh_auto_install: - $(MAKE) INSTALL_ROOT=$$(pwd)/debian/qmidiplayer prefix=/usr install
\ No newline at end of file + $(MAKE) INSTALL_ROOT=$$(pwd)/debian/tmp prefix=/usr install
\ No newline at end of file diff --git a/qmidiplayer.src.d/main.cpp b/qmidiplayer-desktop/main.cpp index c9f3b42..c9f3b42 100644 --- a/qmidiplayer.src.d/main.cpp +++ b/qmidiplayer-desktop/main.cpp diff --git a/qmidiplayer.src.d/qdialskulpturestyle.cpp b/qmidiplayer-desktop/qdialskulpturestyle.cpp index 7c181a0..7c181a0 100644 --- a/qmidiplayer.src.d/qdialskulpturestyle.cpp +++ b/qmidiplayer-desktop/qdialskulpturestyle.cpp diff --git a/qmidiplayer.src.d/qdialskulpturestyle.hpp b/qmidiplayer-desktop/qdialskulpturestyle.hpp index 2f3ba04..2f3ba04 100644 --- a/qmidiplayer.src.d/qdialskulpturestyle.hpp +++ b/qmidiplayer-desktop/qdialskulpturestyle.hpp diff --git a/qmidiplayer-desktop/qmidiplayer-desktop.pro b/qmidiplayer-desktop/qmidiplayer-desktop.pro new file mode 100644 index 0000000..328af5d --- /dev/null +++ b/qmidiplayer-desktop/qmidiplayer-desktop.pro @@ -0,0 +1,64 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2015-12-25T20:24:49 +# +#------------------------------------------------- + +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TARGET = qmidiplayer +TEMPLATE = app + + +SOURCES += main.cpp\ + qmpmainwindow.cpp \ + ../core/qmpmidiplay.cpp \ + ../core/qmpmidiread.cpp \ + qmpplistwindow.cpp \ + qmpchannelswindow.cpp \ + qmppresetselect.cpp \ + qmpchanneleditor.cpp \ + qmpefxwindow.cpp \ + qmpinfowindow.cpp \ + qmpsettingswindow.cpp \ + qmphelpwindow.cpp \ + qdialskulpturestyle.cpp + +HEADERS += qmpmainwindow.hpp \ + ../core/qmpmidiplay.hpp \ + qmpplistwindow.hpp \ + qmpchannelswindow.hpp \ + qmppresetselect.hpp \ + qmpchanneleditor.hpp \ + qmpefxwindow.hpp \ + qmpinfowindow.hpp \ + qmpsettingswindow.hpp \ + qmphelpwindow.hpp \ + qdialskulpturestyle.hpp \ + qmpimidimapper.hpp + +FORMS += qmpmainwindow.ui \ + qmpplistwindow.ui \ + qmpchannelswindow.ui \ + qmppresetselect.ui \ + qmpchanneleditor.ui \ + qmpefxwindow.ui \ + qmpinfowindow.ui \ + qmpsettingswindow.ui \ + qmphelpwindow.ui + +unix{ + isEmpty(PREFIX) { + PREFIX = /usr/local + } + BINDIR = $$PREFIX/bin + target.path = $$BINDIR + INSTALLS += target + QMAKE_CXXFLAGS += -std=c++11 -Wall + LIBS += -lfluidsynth +} +win32:LIBS += e:/libs/fluidsynth/fluidsynth.lib winmm.lib #You have to change these +win32:INCLUDEPATH += e:/libs/fluidsynth/include #before building... +RESOURCES = resources.qrc diff --git a/qmidiplayer.src.d/qmpchanneleditor.cpp b/qmidiplayer-desktop/qmpchanneleditor.cpp index f1d4e5e..f1d4e5e 100644 --- a/qmidiplayer.src.d/qmpchanneleditor.cpp +++ b/qmidiplayer-desktop/qmpchanneleditor.cpp diff --git a/qmidiplayer.src.d/qmpchanneleditor.hpp b/qmidiplayer-desktop/qmpchanneleditor.hpp index 0653af5..0653af5 100644 --- a/qmidiplayer.src.d/qmpchanneleditor.hpp +++ b/qmidiplayer-desktop/qmpchanneleditor.hpp diff --git a/qmidiplayer.src.d/qmpchanneleditor.ui b/qmidiplayer-desktop/qmpchanneleditor.ui index 49e8c8e..49e8c8e 100644 --- a/qmidiplayer.src.d/qmpchanneleditor.ui +++ b/qmidiplayer-desktop/qmpchanneleditor.ui diff --git a/qmidiplayer.src.d/qmpchannelswindow.cpp b/qmidiplayer-desktop/qmpchannelswindow.cpp index a9cf60e..a9cf60e 100644 --- a/qmidiplayer.src.d/qmpchannelswindow.cpp +++ b/qmidiplayer-desktop/qmpchannelswindow.cpp diff --git a/qmidiplayer.src.d/qmpchannelswindow.hpp b/qmidiplayer-desktop/qmpchannelswindow.hpp index f0591b6..f0591b6 100644 --- a/qmidiplayer.src.d/qmpchannelswindow.hpp +++ b/qmidiplayer-desktop/qmpchannelswindow.hpp diff --git a/qmidiplayer.src.d/qmpchannelswindow.ui b/qmidiplayer-desktop/qmpchannelswindow.ui index a8b43cb..a8b43cb 100644 --- a/qmidiplayer.src.d/qmpchannelswindow.ui +++ b/qmidiplayer-desktop/qmpchannelswindow.ui diff --git a/qmidiplayer.src.d/qmpefxwindow.cpp b/qmidiplayer-desktop/qmpefxwindow.cpp index 7d9c08e..7d9c08e 100644 --- a/qmidiplayer.src.d/qmpefxwindow.cpp +++ b/qmidiplayer-desktop/qmpefxwindow.cpp diff --git a/qmidiplayer.src.d/qmpefxwindow.hpp b/qmidiplayer-desktop/qmpefxwindow.hpp index 2a080f0..2a080f0 100644 --- a/qmidiplayer.src.d/qmpefxwindow.hpp +++ b/qmidiplayer-desktop/qmpefxwindow.hpp diff --git a/qmidiplayer.src.d/qmpefxwindow.ui b/qmidiplayer-desktop/qmpefxwindow.ui index 4a1e0c6..4a1e0c6 100644 --- a/qmidiplayer.src.d/qmpefxwindow.ui +++ b/qmidiplayer-desktop/qmpefxwindow.ui diff --git a/qmidiplayer.src.d/qmphelpwindow.cpp b/qmidiplayer-desktop/qmphelpwindow.cpp index 10cf083..10cf083 100644 --- a/qmidiplayer.src.d/qmphelpwindow.cpp +++ b/qmidiplayer-desktop/qmphelpwindow.cpp diff --git a/qmidiplayer.src.d/qmphelpwindow.hpp b/qmidiplayer-desktop/qmphelpwindow.hpp index c2052b2..c2052b2 100644 --- a/qmidiplayer.src.d/qmphelpwindow.hpp +++ b/qmidiplayer-desktop/qmphelpwindow.hpp diff --git a/qmidiplayer.src.d/qmphelpwindow.ui b/qmidiplayer-desktop/qmphelpwindow.ui index fd21b5f..fd21b5f 100644 --- a/qmidiplayer.src.d/qmphelpwindow.ui +++ b/qmidiplayer-desktop/qmphelpwindow.ui diff --git a/qmidiplayer.src.d/qmpimidimapper.hpp b/qmidiplayer-desktop/qmpimidimapper.hpp index d35dbb9..d35dbb9 100644 --- a/qmidiplayer.src.d/qmpimidimapper.hpp +++ b/qmidiplayer-desktop/qmpimidimapper.hpp diff --git a/qmidiplayer.src.d/qmpinfowindow.cpp b/qmidiplayer-desktop/qmpinfowindow.cpp index 689a756..689a756 100644 --- a/qmidiplayer.src.d/qmpinfowindow.cpp +++ b/qmidiplayer-desktop/qmpinfowindow.cpp diff --git a/qmidiplayer.src.d/qmpinfowindow.hpp b/qmidiplayer-desktop/qmpinfowindow.hpp index 9a1e389..9a1e389 100644 --- a/qmidiplayer.src.d/qmpinfowindow.hpp +++ b/qmidiplayer-desktop/qmpinfowindow.hpp diff --git a/qmidiplayer.src.d/qmpinfowindow.ui b/qmidiplayer-desktop/qmpinfowindow.ui index 664531a..664531a 100644 --- a/qmidiplayer.src.d/qmpinfowindow.ui +++ b/qmidiplayer-desktop/qmpinfowindow.ui diff --git a/qmidiplayer.src.d/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp index 453bd01..58caea1 100644 --- a/qmidiplayer.src.d/qmpmainwindow.cpp +++ b/qmidiplayer-desktop/qmpmainwindow.cpp @@ -5,7 +5,7 @@ #include <QDesktopWidget> #include "qmpmainwindow.hpp" #include "ui_qmpmainwindow.h" -#include "../common/qmpmidiplay.hpp" +#include "../core/qmpmidiplay.hpp" #ifdef _WIN32 #include <Windows.h> #endif diff --git a/qmidiplayer.src.d/qmpmainwindow.hpp b/qmidiplayer-desktop/qmpmainwindow.hpp index 517f792..a409d2e 100644 --- a/qmidiplayer.src.d/qmpmainwindow.hpp +++ b/qmidiplayer-desktop/qmpmainwindow.hpp @@ -11,7 +11,7 @@ #include <QMenu> #include <thread> #include <chrono> -#include "../common/qmpmidiplay.hpp" +#include "../core/qmpmidiplay.hpp" #include "qmpplistwindow.hpp" #include "qmpchannelswindow.hpp" #include "qmpefxwindow.hpp" diff --git a/qmidiplayer.src.d/qmpmainwindow.ui b/qmidiplayer-desktop/qmpmainwindow.ui index 0764e09..0764e09 100644 --- a/qmidiplayer.src.d/qmpmainwindow.ui +++ b/qmidiplayer-desktop/qmpmainwindow.ui diff --git a/qmidiplayer.src.d/qmpplistwindow.cpp b/qmidiplayer-desktop/qmpplistwindow.cpp index 8f04fc1..8f04fc1 100644 --- a/qmidiplayer.src.d/qmpplistwindow.cpp +++ b/qmidiplayer-desktop/qmpplistwindow.cpp diff --git a/qmidiplayer.src.d/qmpplistwindow.hpp b/qmidiplayer-desktop/qmpplistwindow.hpp index 6ceeb60..6ceeb60 100644 --- a/qmidiplayer.src.d/qmpplistwindow.hpp +++ b/qmidiplayer-desktop/qmpplistwindow.hpp diff --git a/qmidiplayer.src.d/qmpplistwindow.ui b/qmidiplayer-desktop/qmpplistwindow.ui index 99124df..99124df 100644 --- a/qmidiplayer.src.d/qmpplistwindow.ui +++ b/qmidiplayer-desktop/qmpplistwindow.ui diff --git a/qmidiplayer.src.d/qmppresetselect.cpp b/qmidiplayer-desktop/qmppresetselect.cpp index be589c5..be589c5 100644 --- a/qmidiplayer.src.d/qmppresetselect.cpp +++ b/qmidiplayer-desktop/qmppresetselect.cpp diff --git a/qmidiplayer.src.d/qmppresetselect.hpp b/qmidiplayer-desktop/qmppresetselect.hpp index 54f5764..54f5764 100644 --- a/qmidiplayer.src.d/qmppresetselect.hpp +++ b/qmidiplayer-desktop/qmppresetselect.hpp diff --git a/qmidiplayer.src.d/qmppresetselect.ui b/qmidiplayer-desktop/qmppresetselect.ui index f18600d..f18600d 100644 --- a/qmidiplayer.src.d/qmppresetselect.ui +++ b/qmidiplayer-desktop/qmppresetselect.ui diff --git a/qmidiplayer.src.d/qmpsettingswindow.cpp b/qmidiplayer-desktop/qmpsettingswindow.cpp index c2e31a2..c2e31a2 100644 --- a/qmidiplayer.src.d/qmpsettingswindow.cpp +++ b/qmidiplayer-desktop/qmpsettingswindow.cpp diff --git a/qmidiplayer.src.d/qmpsettingswindow.hpp b/qmidiplayer-desktop/qmpsettingswindow.hpp index c506de4..c506de4 100644 --- a/qmidiplayer.src.d/qmpsettingswindow.hpp +++ b/qmidiplayer-desktop/qmpsettingswindow.hpp diff --git a/qmidiplayer.src.d/qmpsettingswindow.ui b/qmidiplayer-desktop/qmpsettingswindow.ui index 330afa2..330afa2 100644 --- a/qmidiplayer.src.d/qmpsettingswindow.ui +++ b/qmidiplayer-desktop/qmpsettingswindow.ui diff --git a/qmidiplayer.src.d/resources.qrc b/qmidiplayer-desktop/resources.qrc index 351d2fa..351d2fa 100644 --- a/qmidiplayer.src.d/resources.qrc +++ b/qmidiplayer-desktop/resources.qrc diff --git a/qmidiplayerlite.src.d/deployment.pri b/qmidiplayer-lite/deployment.pri index 265ce71..57bdd3a 100644 --- a/qmidiplayerlite.src.d/deployment.pri +++ b/qmidiplayer-lite/deployment.pri @@ -3,7 +3,7 @@ unix:!android { qnx { target.path = /tmp/$${TARGET}/bin } else { - target.path = /opt/$${TARGET}/bin + target.path = /usr/bin } export(target.path) } diff --git a/qmidiplayerlite.src.d/main.cpp b/qmidiplayer-lite/main.cpp index 1a87b33..1a87b33 100644 --- a/qmidiplayerlite.src.d/main.cpp +++ b/qmidiplayer-lite/main.cpp diff --git a/qmidiplayerlite.src.d/main.qml b/qmidiplayer-lite/main.qml index 0ec0975..0ec0975 100644 --- a/qmidiplayerlite.src.d/main.qml +++ b/qmidiplayer-lite/main.qml diff --git a/qmidiplayer-lite/qmidiplayer-lite.pro b/qmidiplayer-lite/qmidiplayer-lite.pro new file mode 100644 index 0000000..9fb8712 --- /dev/null +++ b/qmidiplayer-lite/qmidiplayer-lite.pro @@ -0,0 +1,24 @@ +TEMPLATE = app + +QT += qml quick +unix:QT += widgets +win32:QT += widgets +CONFIG += c++11 + +SOURCES += main.cpp \ + ../core/qmpmidiplay.cpp \ + ../core/qmpmidiread.cpp + +RESOURCES += qml.qrc + +# Additional import path used to resolve QML modules in Qt Creator's code model +QML_IMPORT_PATH = + +# Default rules for deployment. +include(deployment.pri) + +HEADERS += \ + ../core/qmpmidiplay.hpp \ + qmpcorewrapper.hpp + +LIBS += -lfluidsynth diff --git a/qmidiplayerlite.src.d/qml.qrc b/qmidiplayer-lite/qml.qrc index 5f6483a..5f6483a 100644 --- a/qmidiplayerlite.src.d/qml.qrc +++ b/qmidiplayer-lite/qml.qrc diff --git a/qmidiplayerlite.src.d/qmpcorewrapper.hpp b/qmidiplayer-lite/qmpcorewrapper.hpp index 558ed74..ed024df 100644 --- a/qmidiplayerlite.src.d/qmpcorewrapper.hpp +++ b/qmidiplayer-lite/qmpcorewrapper.hpp @@ -4,7 +4,7 @@ #include <QUrl> #include <thread> #include <fluidsynth.h> -#include "../common/qmpmidiplay.hpp" +#include "../core/qmpmidiplay.hpp" class CQMPCoreWrapper:public QObject { Q_OBJECT diff --git a/qmidiplayerlite.src.d/qmpmidiplay.cpp b/qmidiplayer-lite/qmpmidiplay.cpp index baec9a2..baec9a2 100644 --- a/qmidiplayerlite.src.d/qmpmidiplay.cpp +++ b/qmidiplayer-lite/qmpmidiplay.cpp diff --git a/qmidiplayerlite.src.d/qmpmidiplay.hpp b/qmidiplayer-lite/qmpmidiplay.hpp index fafd677..fafd677 100644 --- a/qmidiplayerlite.src.d/qmpmidiplay.hpp +++ b/qmidiplayer-lite/qmpmidiplay.hpp diff --git a/qmidiplayerlite.src.d/qmpmidiread.cpp b/qmidiplayer-lite/qmpmidiread.cpp index 0bcf597..0bcf597 100644 --- a/qmidiplayerlite.src.d/qmpmidiread.cpp +++ b/qmidiplayer-lite/qmpmidiread.cpp diff --git a/qmidiplayer.pro b/qmidiplayer.pro index 63e20b6..da362f3 100644 --- a/qmidiplayer.pro +++ b/qmidiplayer.pro @@ -1,64 +1,5 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2015-12-25T20:24:49 -# -#------------------------------------------------- +TEMPLATE = subdirs -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = qmidiplayer -TEMPLATE = app - - -SOURCES += ./qmidiplayer.src.d/main.cpp\ - ./qmidiplayer.src.d/qmpmainwindow.cpp \ - ./common/qmpmidiplay.cpp \ - ./common/qmpmidiread.cpp \ - ./qmidiplayer.src.d/qmpplistwindow.cpp \ - ./qmidiplayer.src.d/qmpchannelswindow.cpp \ - ./qmidiplayer.src.d/qmppresetselect.cpp \ - ./qmidiplayer.src.d/qmpchanneleditor.cpp \ - ./qmidiplayer.src.d/qmpefxwindow.cpp \ - ./qmidiplayer.src.d/qmpinfowindow.cpp \ - ./qmidiplayer.src.d/qmpsettingswindow.cpp \ - ./qmidiplayer.src.d/qmphelpwindow.cpp \ - ./qmidiplayer.src.d/qdialskulpturestyle.cpp - -HEADERS += ./qmidiplayer.src.d/qmpmainwindow.hpp \ - ./common/qmpmidiplay.hpp \ - ./qmidiplayer.src.d/qmpplistwindow.hpp \ - ./qmidiplayer.src.d/qmpchannelswindow.hpp \ - ./qmidiplayer.src.d/qmppresetselect.hpp \ - ./qmidiplayer.src.d/qmpchanneleditor.hpp \ - ./qmidiplayer.src.d/qmpefxwindow.hpp \ - ./qmidiplayer.src.d/qmpinfowindow.hpp \ - ./qmidiplayer.src.d/qmpsettingswindow.hpp \ - ./qmidiplayer.src.d/qmphelpwindow.hpp \ - ./qmidiplayer.src.d/qdialskulpturestyle.hpp \ - ./qmidiplayer.src.d/qmpimidimapper.hpp - -FORMS += ./qmidiplayer.src.d/qmpmainwindow.ui \ - ./qmidiplayer.src.d/qmpplistwindow.ui \ - ./qmidiplayer.src.d/qmpchannelswindow.ui \ - ./qmidiplayer.src.d/qmppresetselect.ui \ - ./qmidiplayer.src.d/qmpchanneleditor.ui \ - ./qmidiplayer.src.d/qmpefxwindow.ui \ - ./qmidiplayer.src.d/qmpinfowindow.ui \ - ./qmidiplayer.src.d/qmpsettingswindow.ui \ - ./qmidiplayer.src.d/qmphelpwindow.ui - -unix{ - isEmpty(PREFIX) { - PREFIX = /usr/local - } - BINDIR = $$PREFIX/bin - target.path = $$BINDIR - INSTALLS += target - QMAKE_CXXFLAGS += -std=c++11 -Wall - LIBS += -lfluidsynth -} -win32:LIBS += e:/libs/fluidsynth/fluidsynth.lib winmm.lib #You have to change these -win32:INCLUDEPATH += e:/libs/fluidsynth/include #before building... -RESOURCES = ./qmidiplayer.src.d/resources.qrc +SUBDIRS = \ + qmidiplayer-desktop \ + qmidiplayer-lite diff --git a/qmidiplayerlite.pro b/qmidiplayerlite.pro deleted file mode 100644 index be7679d..0000000 --- a/qmidiplayerlite.pro +++ /dev/null @@ -1,24 +0,0 @@ -TEMPLATE = app - -QT += qml quick -unix:QT += widgets -win32:QT += widgets -CONFIG += c++11 - -SOURCES += ./qmidiplayerlite.src.d/main.cpp \ - ./common/qmpmidiplay.cpp \ - ./common/qmpmidiread.cpp - -RESOURCES += ./qmidiplayerlite.src.d/qml.qrc - -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH = - -# Default rules for deployment. -include(./qmidiplayerlite.src.d/deployment.pri) - -HEADERS += \ - ./common/qmpmidiplay.hpp \ - ./qmidiplayerlite.src.d/qmpcorewrapper.hpp - -LIBS += -lfluidsynth |