aboutsummaryrefslogtreecommitdiff
path: root/qmidiplayer-desktop/qmpmainwindow.hpp
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2017-08-22 11:35:33 +0800
committerGravatar Chris Xiong <chirs241097@gmail.com> 2017-08-22 11:35:33 +0800
commit5b5eba7e68e7de8d442824d2f5076ec7d623e2b8 (patch)
treeedf3c1c093605e6c320128eda2d8b41b4ac2001d /qmidiplayer-desktop/qmpmainwindow.hpp
parentab33532da11672ee435e2b566cdba81b2e79e874 (diff)
downloadQMidiPlayer-5b5eba7e68e7de8d442824d2f5076ec7d623e2b8.tar.xz
Windows type of functionality windows is now Qt::Dialog.
Initialization fluidsynth asynchronously. Minor documentation update.
Diffstat (limited to 'qmidiplayer-desktop/qmpmainwindow.hpp')
-rw-r--r--qmidiplayer-desktop/qmpmainwindow.hpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/qmidiplayer-desktop/qmpmainwindow.hpp b/qmidiplayer-desktop/qmpmainwindow.hpp
index fd1a5eb..c713ca3 100644
--- a/qmidiplayer-desktop/qmpmainwindow.hpp
+++ b/qmidiplayer-desktop/qmpmainwindow.hpp
@@ -16,6 +16,7 @@
#include <QApplication>
#include <thread>
#include <chrono>
+#include <future>
#include <map>
#include "../core/qmpmidiplay.hpp"
#include "qmpplugin.hpp"
@@ -174,7 +175,7 @@ class qmpMainWindow:public QMainWindow
private:
Ui::qmpMainWindow *ui;
QTimer *timer;
- bool playing,stopped,dragging,fin,singleFS,havemidi;
+ bool playing,stopped,dragging,fin,havemidi;
std::thread *playerTh=NULL;
std::thread *renderTh=NULL;
std::chrono::steady_clock::time_point st;
@@ -197,6 +198,7 @@ class qmpMainWindow:public QMainWindow
void onfnChanged();
void playerSetup(IFluidSettings *fs);
+ void loadSoundFont(IFluidSettings *fs);
private:
static qmpMainWindow* ref;