aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsD <stoned@derpymail.org>2020-02-21 16:48:11 +0100
committersD <stoned@derpymail.org>2020-02-21 16:48:11 +0100
commitc8b11b398a7db6d8f45a88136e8a45e35b44320e (patch)
tree32500da4825fd542ee57afb97e403306bbf1fdbd
parentcb1ed6d60dc394f293f90f06ad9988de053feecb (diff)
fix audio
-rw-r--r--include/aomusicplayer.h19
1 files changed, 18 insertions, 1 deletions
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index 71ae6045..255cc456 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -6,6 +6,7 @@
#elif defined(QTAUDIO)
#include <QMediaPlayer>
#endif
+
#include "aoapplication.h"
#include <QWidget>
@@ -14,12 +15,14 @@
#include <QTimer>
#include <QObject>
+#if defined(BASSAUDIO)
class AOMusicPlayer : public QObject
{
Q_OBJECT
public:
AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
virtual ~AOMusicPlayer();
+
void play(QString p_song);
void set_volume(int p_value);
@@ -30,6 +33,7 @@ public:
private:
QWidget *m_parent;
AOApplication *ao_app;
+
int m_volume = 0;
QString f_path;
@@ -46,12 +50,18 @@ public:
void play(QString p_song);
void set_volume(int p_value);
+ void kill_loop();
+ QString get_path();
+ bool enable_looping = true;
+
private:
- QMediaPlayer m_player;
QWidget *m_parent;
AOApplication *ao_app;
+ QMediaPlayer m_player;
+
int m_volume = 0;
+ QString f_path;
};
#else
class AOMusicPlayer : public QObject
@@ -63,9 +73,16 @@ public:
void play(QString p_song);
void set_volume(int p_value);
+ void kill_loop();
+ QString get_path();
+ bool enable_looping = true;
+
private:
QWidget *m_parent;
AOApplication *ao_app;
+
+ int m_volume = 0;
+ QString f_path;
};
#endif