diff options
| author |  Chris Xiong <chirs241097@gmail.com>
| 2017-06-21 21:32:35 +0800 |
|---|---|---|
| committer | Chris Xiong <chirs241097@gmail.com>
| 2017-06-21 21:32:35 +0800 |
| commit | a97307ba6e625468a1d8ad1049e6d9db0ad42d4d (patch) | |
| tree | ab5f9b74b3316f63ae3a7d1bbb2f0dcb6dd445d9 /qmidiplayer-desktop | |
| parent | fd3fc10798fb4c8d63f6f3e538018774741f2b15 (diff) | |
| download | QMidiPlayer-a97307ba6e625468a1d8ad1049e6d9db0ad42d4d.tar.xz | |
Fixed FTBFS on Windows.
Fixed the default output device option.
Seeking now restores CC values correctly.
Diffstat (limited to 'qmidiplayer-desktop')
| -rw-r--r-- | qmidiplayer-desktop/qmidiplayer-desktop.pro | 2 | ||||
| -rw-r--r-- | qmidiplayer-desktop/qmpchannelswindow.cpp | 2 | ||||
| -rw-r--r-- | qmidiplayer-desktop/qmpmainwindow.cpp | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/qmidiplayer-desktop/qmidiplayer-desktop.pro b/qmidiplayer-desktop/qmidiplayer-desktop.pro index 74317c2..9b0928c 100644 --- a/qmidiplayer-desktop/qmidiplayer-desktop.pro +++ b/qmidiplayer-desktop/qmidiplayer-desktop.pro @@ -112,7 +112,7 @@ unix{ win32{ DEFINES += RT_MIDI_H=\\\"RtMidi.h\\\" #change these before building... - LIBS += e:/libs/fluidsynth/fluidsynth.lib winmm.lib + LIBS += e:/libs/fluidsynth/libfluidsynth.dll.a winmm.lib Release:LIBS += e:/libs/rtmidi/rtmidi.lib Debug:LIBS += e:/libs/rtmidi/rtmidid.lib INCLUDEPATH += e:/libs/fluidsynth/include diff --git a/qmidiplayer-desktop/qmpchannelswindow.cpp b/qmidiplayer-desktop/qmpchannelswindow.cpp index 0626697..cdbb607 100644 --- a/qmidiplayer-desktop/qmpchannelswindow.cpp +++ b/qmidiplayer-desktop/qmpchannelswindow.cpp @@ -28,7 +28,7 @@ qmpChannelsWindow::qmpChannelsWindow(QWidget *parent) : qmpSettingsWindow::getDefaultOutWidget()->addItem(devs[i].c_str()); if(!QString(devs[i].c_str()).compare(qmpSettingsWindow::getSettingsIntf()-> value("Midi/DefaultOutput","Internal FluidSynth").toString())) - qmpSettingsWindow::getDefaultOutWidget()->setCurrentIndex(i+1); + qmpSettingsWindow::getDefaultOutWidget()->setCurrentIndex(i); } qmpSettingsWindow::getSettingsIntf()->setValue("Midi/DefaultOutput", qmpSettingsWindow::getDefaultOutWidget()->currentText()); diff --git a/qmidiplayer-desktop/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp index 1c4d7d3..6e10389 100644 --- a/qmidiplayer-desktop/qmpmainwindow.cpp +++ b/qmidiplayer-desktop/qmpmainwindow.cpp @@ -577,8 +577,9 @@ void qmpMainWindow::startRender() #ifdef _WIN32 char* ofstr=wcsto8bit((plistw->getSelectedItem()+QString(".wav")).toStdWString().c_str()); char* ifstr=wcsto8bit(plistw->getSelectedItem().toStdWString().c_str()); - player->rendererLoadFile(ofstr); - playerSetup();player->rendererInit(ifstr); + fluidrenderer=new qmpFileRendererFluid(ifstr,ofstr); + playerSetup(fluidrenderer); + fluidrenderer->rendererInit(); free(ofstr);free(ifstr); #else fluidrenderer=new qmpFileRendererFluid( |