aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstonedDiscord <stoned@derpymail.org>2019-08-17 21:09:13 +0200
committerstonedDiscord <stoned@derpymail.org>2019-08-17 21:09:13 +0200
commit49be444d74cfdecdaa1090a2a51c19f70ae9b0b1 (patch)
tree0dfd8b064f7c223f25f00de579e76b53ab484178
parent4700902551f80769b54cb452b0fcb794669c553b (diff)
OOP :convenience_store:
-rw-r--r--include/aoblipplayer.h3
-rw-r--r--include/aosfxplayer.h3
-rw-r--r--src/aosfxplayer.cpp7
3 files changed, 10 insertions, 3 deletions
diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h
index 68dca191..44ca48bb 100644
--- a/include/aoblipplayer.h
+++ b/include/aoblipplayer.h
@@ -22,7 +22,6 @@ public:
void set_blips(QString p_sfx);
void blip_tick();
void set_volume(qreal p_volume);
- void set_volume_internal(qreal p_volume);
int m_cycle = 0;
@@ -31,6 +30,8 @@ private:
AOApplication *ao_app;
qreal m_volume;
+ void set_volume_internal(qreal p_volume);
+
#if defined(BASSAUDIO)
HSTREAM m_stream_list[5];
#elif defined(QTAUDIO)
diff --git a/include/aosfxplayer.h b/include/aosfxplayer.h
index 5b4b41d8..19d4bdf3 100644
--- a/include/aosfxplayer.h
+++ b/include/aosfxplayer.h
@@ -21,13 +21,14 @@ public:
void play(QString p_sfx, QString p_char = "", QString shout = "");
void stop();
void set_volume(qreal p_volume);
- void set_volume_internal(qreal p_volume);
private:
QWidget *m_parent;
AOApplication *ao_app;
qreal m_volume = 0;
+ void set_volume_internal(qreal p_volume);
+
#if defined(BASSAUDIO)
HSTREAM m_stream;
#elif defined(QTAUDIO)
diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp
index 3faaad48..98dd2cd6 100644
--- a/src/aosfxplayer.cpp
+++ b/src/aosfxplayer.cpp
@@ -126,7 +126,12 @@ void AOSfxPlayer::stop()
}
-void AOSfxPlayer::set_volume(int p_value)
+void AOSfxPlayer::set_volume(qreal p_value)
+{
+
+}
+
+void AOSfxPlayer::set_volume_internal(qreal p_value)
{
}