Merge pull request #117 from AttorneyOnline/2.7

2.7

1 files changed, 29 insertions, 5 deletions

diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index b34267c..255cc45 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -6,31 +6,42 @@
 #elif defined(QTAUDIO)
 #include <QMediaPlayer>
 #endif
+
 #include "aoapplication.h"
 
 #include <QWidget>
 #include <string.h>
 #include <QDebug>
+#include <QTimer>
+#include <QObject>
 
 #if defined(BASSAUDIO)
-class AOMusicPlayer
+class AOMusicPlayer : public QObject
 {
+  Q_OBJECT
 public:
   AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
-  ~AOMusicPlayer();
+  virtual ~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
+class AOMusicPlayer : public QObject
 {
 public:
   AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
@@ -39,15 +50,21 @@ 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
+class AOMusicPlayer : public QObject
 {
 public:
   AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
@@ -56,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