aboutsummaryrefslogtreecommitdiff
path: root/include/aomusicplayer.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/aomusicplayer.h')
-rw-r--r--include/aomusicplayer.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/aomusicplayer.h b/include/aomusicplayer.h
index 8ed07710..8e0d239a 100644
--- a/include/aomusicplayer.h
+++ b/include/aomusicplayer.h
@@ -19,16 +19,19 @@ class AOMusicPlayer
public:
AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
virtual ~AOMusicPlayer();
-
- void play(QString p_song, int channel=0, bool crossfade=false);
- void stop(int channel=0);
- void set_volume(int p_value, int channel=0);
+ void set_volume(int p_value, int channel=-1);
void set_looping(bool toggle, int channel=0);
+ const int m_channelmax = 4;
+
//These have to be public for the stupid sync thing
// QWORD loop_start = 0;
// QWORD loop_end = 0;
+public slots:
+ void play(QString p_song, int channel=0, bool crossfade=false);
+ void stop(int channel=0);
+
private:
QWidget *m_parent;
AOApplication *ao_app;
@@ -36,7 +39,6 @@ private:
bool m_looping = false;
int m_volume = 0;
- const int m_channelmax = 4;
// Channel 0 = music
// Channel 1 = ambience
// Channel 2 = extra