From 3c0cedbe922c9fcacd0d171423f83e375f66e178 Mon Sep 17 00:00:00 2001
From: iamgoofball <iamgoofball@gmail.com>
Date: Fri, 18 Jan 2019 19:08:56 -0800
Subject: Add screenshake, frame-specific effects, looping SFX, and clientside
 music looping

Committed by patch since Goof is currently banned on GitHub for no good reason.
---
 include/aomusicplayer.h | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'include/aomusicplayer.h')

diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index 560a7f9..54f3b5f 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -7,22 +7,32 @@
 #include <QWidget>
 #include <string.h>
 #include <QDebug>
+#include <QTimer>
+#include <QObject>
 
-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();
+
 private:
   QWidget *m_parent;
   AOApplication *ao_app;
-
+  QTimer *music_loop_timer;
   int m_volume = 0;
+  QString f_path;
+
   HSTREAM m_stream;
+
+private slots:
+  void restart_loop();
 };
 
 #endif // AOMUSICPLAYER_H
-- 
cgit 


From 10436992148e2342e6bd563d1acfb684f225aa30 Mon Sep 17 00:00:00 2001
From: iamgoofball <iamgoofball@gmail.com>
Date: Sat, 19 Jan 2019 21:01:19 -0800
Subject: Suffix-independent Music, Mod Music List, looping bugfixes, easter
 eggs, etc.

---
 include/aomusicplayer.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/aomusicplayer.h')

diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index 54f3b5f..24ea0c5 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -21,6 +21,7 @@ public:
 
   void kill_loop();
   QString get_path();
+  bool enable_looping = true;
 
 private:
   QWidget *m_parent;
-- 
cgit 


From fc984fcfe2a4416274810de81a8f36fe77b0dba9 Mon Sep 17 00:00:00 2001
From: iamgoofball <iamgoofball@gmail.com>
Date: Fri, 1 Feb 2019 16:28:14 -0800
Subject: bugfixes and shit

---
 include/aomusicplayer.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'include/aomusicplayer.h')

diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index 24ea0c5..a88cb79 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -26,14 +26,11 @@ public:
 private:
   QWidget *m_parent;
   AOApplication *ao_app;
-  QTimer *music_loop_timer;
   int m_volume = 0;
   QString f_path;
 
   HSTREAM m_stream;
 
-private slots:
-  void restart_loop();
 };
 
 #endif // AOMUSICPLAYER_H
-- 
cgit 


From c8b11b398a7db6d8f45a88136e8a45e35b44320e Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Fri, 21 Feb 2020 16:48:11 +0100
Subject: fix audio

---
 include/aomusicplayer.h | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'include/aomusicplayer.h')

diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index 71ae604..255cc45 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
 
-- 
cgit