From 49be444d74cfdecdaa1090a2a51c19f70ae9b0b1 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sat, 17 Aug 2019 21:09:13 +0200 Subject: [PATCH] OOP :convenience_store: --- include/aoblipplayer.h | 3 ++- include/aosfxplayer.h | 3 ++- src/aosfxplayer.cpp | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/include/aoblipplayer.h b/include/aoblipplayer.h index 68dca19..44ca48b 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 5b4b41d..19d4bdf 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 3faaad4..98dd2cd 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) { }