diff options
Diffstat (limited to 'include/aomusicplayer.h')
| -rw-r--r-- | include/aomusicplayer.h | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h index 5181630c..b34267c9 100644 --- a/include/aomusicplayer.h +++ b/include/aomusicplayer.h @@ -6,40 +6,32 @@ #elif defined(QTAUDIO) #include <QMediaPlayer> #endif - #include "aoapplication.h" -#include <QDebug> -#include <QObject> -#include <QTimer> #include <QWidget> #include <string.h> +#include <QDebug> #if defined(BASSAUDIO) -class AOMusicPlayer : public QObject { - Q_OBJECT +class AOMusicPlayer +{ public: AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app); - virtual ~AOMusicPlayer(); + ~AOMusicPlayer(); 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; - HSTREAM m_stream; }; #elif defined(QTAUDIO) -class AOMusicPlayer : public QObject { +class AOMusicPlayer +{ public: AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app); ~AOMusicPlayer(); @@ -47,21 +39,16 @@ 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 { +class AOMusicPlayer +{ public: AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app); ~AOMusicPlayer(); @@ -69,16 +56,9 @@ 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 |
