diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp index 8008e1bd00..c45d7bee1c 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp @@ -41,11 +41,6 @@ bool AlsaSound::Init() return true; } -void AlsaSound::Update() -{ - // don't need to do anything here. -} - // Called on audio thread. void AlsaSound::SoundLoop() { diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h index d4f7d02150..8926cb34a6 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.h +++ b/Source/Core/AudioCommon/AlsaSoundStream.h @@ -24,7 +24,6 @@ public: bool Init() override; void SoundLoop() override; - void Update() override; bool SetRunning(bool running) override; static bool isValid() { return true; } diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp index 6623b5ad8b..4b1b812f94 100644 --- a/Source/Core/AudioCommon/AudioCommon.cpp +++ b/Source/Core/AudioCommon/AudioCommon.cpp @@ -197,8 +197,6 @@ void SendAIBuffer(const short* samples, unsigned int num_samples) { pMixer->PushSamples(samples, num_samples); } - - g_sound_stream->Update(); } void StartAudioDump() diff --git a/Source/Core/AudioCommon/NullSoundStream.cpp b/Source/Core/AudioCommon/NullSoundStream.cpp index 0918e8bb35..fb97f23667 100644 --- a/Source/Core/AudioCommon/NullSoundStream.cpp +++ b/Source/Core/AudioCommon/NullSoundStream.cpp @@ -20,7 +20,3 @@ bool NullSound::SetRunning(bool running) void NullSound::SetVolume(int volume) { } - -void NullSound::Update() -{ -} diff --git a/Source/Core/AudioCommon/NullSoundStream.h b/Source/Core/AudioCommon/NullSoundStream.h index 0a39250c99..91cf113e7d 100644 --- a/Source/Core/AudioCommon/NullSoundStream.h +++ b/Source/Core/AudioCommon/NullSoundStream.h @@ -12,7 +12,6 @@ public: void SoundLoop() override; bool SetRunning(bool running) override; void SetVolume(int volume) override; - void Update() override; static bool isValid() { return true; } }; diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp index 96b2a5d628..b2e61dae98 100644 --- a/Source/Core/AudioCommon/OpenALStream.cpp +++ b/Source/Core/AudioCommon/OpenALStream.cpp @@ -126,9 +126,6 @@ bool OpenALStream::Init() OpenALStream::~OpenALStream() { m_run_thread.Clear(); - // kick the thread if it's waiting - m_sound_sync_event.Set(); - m_thread.join(); palSourceStop(m_source); @@ -155,11 +152,6 @@ void OpenALStream::SetVolume(int volume) palSourcef(m_source, AL_GAIN, m_volume); } -void OpenALStream::Update() -{ - m_sound_sync_event.Set(); -} - bool OpenALStream::SetRunning(bool running) { if (running) diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h index 962e7a2ac4..4fb858069b 100644 --- a/Source/Core/AudioCommon/OpenALStream.h +++ b/Source/Core/AudioCommon/OpenALStream.h @@ -59,7 +59,6 @@ public: void SoundLoop() override; void SetVolume(int volume) override; bool SetRunning(bool running) override; - void Update() override; static bool isValid(); @@ -67,8 +66,6 @@ private: std::thread m_thread; Common::Flag m_run_thread; - Common::Event m_sound_sync_event; - std::vector m_realtime_buffer; std::array m_buffers; ALuint m_source; diff --git a/Source/Core/AudioCommon/SoundStream.h b/Source/Core/AudioCommon/SoundStream.h index 1b3300ae97..dd6deecf9b 100644 --- a/Source/Core/AudioCommon/SoundStream.h +++ b/Source/Core/AudioCommon/SoundStream.h @@ -21,7 +21,6 @@ public: virtual bool Init() { return false; } virtual void SetVolume(int) {} virtual void SoundLoop() {} - virtual void Update() {} // Returns true if successful. virtual bool SetRunning(bool running) { return false; } };