diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp index 2ad7c86a6e..6345b7646b 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp @@ -78,9 +78,9 @@ void AlsaSound::SoundLoop() m_thread_status.store(ALSAThreadStatus::STOPPED); } -void AlsaSound::Clear(bool muted) +void AlsaSound::SetRunning(bool running) { - m_thread_status.store(muted ? ALSAThreadStatus::PAUSED : ALSAThreadStatus::RUNNING); + m_thread_status.store(running ? ALSAThreadStatus::RUNNING : ALSAThreadStatus::PAUSED); cv.notify_one(); // Notify thread that status has changed } diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h index 162713f84a..dfe0faf3fb 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.h +++ b/Source/Core/AudioCommon/AlsaSoundStream.h @@ -26,7 +26,7 @@ public: void SoundLoop() override; void Stop() override; void Update() override; - void Clear(bool) override; + void SetRunning(bool running) override; static bool isValid() { return true; } private: diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp index 5e494b5e95..77da1e4c70 100644 --- a/Source/Core/AudioCommon/AudioCommon.cpp +++ b/Source/Core/AudioCommon/AudioCommon.cpp @@ -162,7 +162,7 @@ void UpdateSoundStream() void SetSoundStreamRunning(bool running) { if (g_sound_stream) - g_sound_stream->Clear(running); + g_sound_stream->SetRunning(running); } void SendAIBuffer(const short* samples, unsigned int num_samples) diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp index ed834fdac9..ed295ff18c 100644 --- a/Source/Core/AudioCommon/OpenALStream.cpp +++ b/Source/Core/AudioCommon/OpenALStream.cpp @@ -161,15 +161,15 @@ void OpenALStream::Update() m_sound_sync_event.Set(); } -void OpenALStream::Clear(bool mute) +void OpenALStream::SetRunning(bool running) { - if (mute) + if (running) { - palSourceStop(m_source); + palSourcePlay(m_source); } else { - palSourcePlay(m_source); + palSourceStop(m_source); } } diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h index 3b9364c571..69c7701de1 100644 --- a/Source/Core/AudioCommon/OpenALStream.h +++ b/Source/Core/AudioCommon/OpenALStream.h @@ -59,7 +59,7 @@ public: void SoundLoop() override; void SetVolume(int volume) override; void Stop() override; - void Clear(bool mute) override; + void SetRunning(bool running) override; void Update() override; static bool isValid(); diff --git a/Source/Core/AudioCommon/SoundStream.h b/Source/Core/AudioCommon/SoundStream.h index e839d796a5..549a89178d 100644 --- a/Source/Core/AudioCommon/SoundStream.h +++ b/Source/Core/AudioCommon/SoundStream.h @@ -24,5 +24,5 @@ public: virtual void SoundLoop() {} virtual void Stop() {} virtual void Update() {} - virtual void Clear(bool mute) {} + virtual void SetRunning(bool running) {} }; diff --git a/Source/Core/AudioCommon/XAudio2Stream.cpp b/Source/Core/AudioCommon/XAudio2Stream.cpp index 41214f181f..b87a0e0a06 100644 --- a/Source/Core/AudioCommon/XAudio2Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2Stream.cpp @@ -210,14 +210,14 @@ void XAudio2::SetVolume(int volume) m_mastering_voice->SetVolume(m_volume); } -void XAudio2::Clear(bool mute) +void XAudio2::SetRunning(bool running) { if (m_voice_context) { - if (mute) - m_voice_context->Stop(); - else + if (running) m_voice_context->Play(); + else + m_voice_context->Stop(); } } diff --git a/Source/Core/AudioCommon/XAudio2Stream.h b/Source/Core/AudioCommon/XAudio2Stream.h index 7fcb8f7b00..ce8e137097 100644 --- a/Source/Core/AudioCommon/XAudio2Stream.h +++ b/Source/Core/AudioCommon/XAudio2Stream.h @@ -59,7 +59,7 @@ public: bool Start() override; void Stop() override; - void Clear(bool mute) override; + void SetRunning(bool running) override; void SetVolume(int volume) override; static bool isValid() { return InitLibrary(); } diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.cpp b/Source/Core/AudioCommon/XAudio2_7Stream.cpp index 6cd7bccbe7..bff7c7dfa1 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2_7Stream.cpp @@ -198,14 +198,14 @@ void XAudio2_7::SetVolume(int volume) m_mastering_voice->SetVolume(m_volume); } -void XAudio2_7::Clear(bool mute) +void XAudio2_7::SetRunning(bool running) { if (m_voice_context) { - if (mute) - m_voice_context->Stop(); - else + if (running) m_voice_context->Play(); + else + m_voice_context->Stop(); } } diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.h b/Source/Core/AudioCommon/XAudio2_7Stream.h index 7a7193ea16..82270003a7 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.h +++ b/Source/Core/AudioCommon/XAudio2_7Stream.h @@ -64,7 +64,7 @@ public: bool Start() override; void Stop() override; - void Clear(bool mute) override; + void SetRunning(bool running) override; void SetVolume(int volume) override; static bool isValid() { return InitLibrary(); }