aboutsummaryrefslogtreecommitdiff
path: root/include/aomusicplayer.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/aomusicplayer.h')
-rw-r--r--include/aomusicplayer.h28
1 files changed, 10 insertions, 18 deletions
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index 35bd7844..d0288443 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -1,11 +1,5 @@
#ifndef AOMUSICPLAYER_H
#define AOMUSICPLAYER_H
-#include "file_functions.h"
-
-#include "bass.h"
-#include "bassmidi.h"
-#include "bassopus.h"
-
#include "aoapplication.h"
#include <QDebug>
@@ -24,17 +18,6 @@ public:
const int m_channelmax = 4;
- // These have to be public for the stupid sync thing
- /**
- * @brief The starting sample of the AB-Loop.
- */
- unsigned int loop_start[4] = {0, 0, 0, 0};
-
- /**
- * @brief The end sample of the AB-Loop.
- */
- unsigned int loop_end[4] = {0, 0, 0, 0};
-
QFutureWatcher<QString> music_watcher;
public slots:
@@ -46,7 +29,6 @@ private:
QWidget *m_parent;
AOApplication *ao_app;
- bool m_looping = false;
bool m_muted = false;
int m_volume[4] = {0, 0, 0, 0};
@@ -56,6 +38,16 @@ private:
// Channel 3 = extra
HSTREAM m_stream_list[4];
HSYNC loop_sync[4];
+
+ /**
+ * @brief The starting sample of the AB-Loop.
+ */
+ unsigned int loop_start[4] = {0, 0, 0, 0};
+
+ /**
+ * @brief The end sample of the AB-Loop.
+ */
+ unsigned int loop_end[4] = {0, 0, 0, 0};
};
#endif // AOMUSICPLAYER_H