diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-22 21:14:37 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-22 21:14:37 -0500 |
| commit | 75453510e080978681ec5603e283c36638f155cc (patch) | |
| tree | 281130e519245a116b0066593e1f129c6f55ce41 /src | |
| parent | 392cefbee43c667ca21244f08f5d97814f282327 (diff) | |
Fix compile errors from merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/aoblipplayer.cpp | 6 | ||||
| -rw-r--r-- | src/aosfxplayer.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/aoblipplayer.cpp b/src/aoblipplayer.cpp index 39158fd..b67f9c3 100644 --- a/src/aoblipplayer.cpp +++ b/src/aoblipplayer.cpp @@ -22,7 +22,7 @@ void AOBlipPlayer::set_blips(QString p_sfx) FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE); } - set_volume(m_volume); + set_volume_internal(m_volume); } void AOBlipPlayer::blip_tick() @@ -44,7 +44,9 @@ void AOBlipPlayer::blip_tick() void AOBlipPlayer::set_volume(int p_value) { - m_volume = p_value; + m_volume = static_cast<qreal>(p_value) / 100; + set_volume_internal(m_volume); +} void AOBlipPlayer::set_volume_internal(qreal p_value) { diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp index 6db6f37..607d605 100644 --- a/src/aosfxplayer.cpp +++ b/src/aosfxplayer.cpp @@ -86,7 +86,7 @@ void AOSfxPlayer::set_volume(qreal p_value) set_volume_internal(m_volume); } -void AOSfxPlayer::set_volume(int p_value) +void AOSfxPlayer::set_volume_internal(qreal p_value) { float volume = static_cast<float>(p_value); for (int n_stream = 0; n_stream < m_channelmax; ++n_stream) { |