aboutsummaryrefslogtreecommitdiff
path: root/include/aomusicplayer.h
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2021-12-30 20:31:44 -0600
committeroldmud0 <oldmud0@users.noreply.github.com>2021-12-30 20:31:44 -0600
commitee76c2ce61f6996bfae3ef027eaee8485d455c95 (patch)
treec70e266cad00d0adf27be8fa51a07e13de9828db /include/aomusicplayer.h
parentecfb791e483234308b1edacb87e499860a63e510 (diff)
parent593bd54000be14c9a1455914285c1b2549b0fa51 (diff)
Merge branch 'master' into feature/http-ms
# Conflicts: # src/networkmanager.cpp
Diffstat (limited to 'include/aomusicplayer.h')
-rw-r--r--include/aomusicplayer.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index f899b9a..7c9bfb3 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -10,6 +10,8 @@
#include <QDebug>
#include <QWidget>
#include <string.h>
+#include <QFuture>
+#include <QFutureWatcher>
class AOMusicPlayer {
public:
@@ -24,8 +26,10 @@ public:
int loop_start[4] = {0, 0, 0, 0};
int loop_end[4] = {0, 0, 0, 0};
+ QFutureWatcher<QString> music_watcher;
+
public slots:
- int play(QString p_song, int channel = 0, bool loop = false,
+ QString play(QString p_song, int channel = 0, bool loop = false,
int effect_flags = 0);
void stop(int channel = 0);