diff --git a/Source/Core/AudioCommon/AOSoundStream.h b/Source/Core/AudioCommon/AOSoundStream.h index 3a18f8ebc4..5900a8c8b5 100644 --- a/Source/Core/AudioCommon/AOSoundStream.h +++ b/Source/Core/AudioCommon/AOSoundStream.h @@ -41,10 +41,6 @@ public: return true; } - virtual bool usesMixer() const { - return true; - } - virtual void Update() override; #else diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h index eaf4228a0f..e57d11270e 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.h +++ b/Source/Core/AudioCommon/AlsaSoundStream.h @@ -26,9 +26,6 @@ public: static bool isValid() { return true; } - virtual bool usesMixer() const { - return true; - } virtual void Update() override; diff --git a/Source/Core/AudioCommon/CoreAudioSoundStream.h b/Source/Core/AudioCommon/CoreAudioSoundStream.h index a0208e8242..c4d8ab7c14 100644 --- a/Source/Core/AudioCommon/CoreAudioSoundStream.h +++ b/Source/Core/AudioCommon/CoreAudioSoundStream.h @@ -25,9 +25,6 @@ public: static bool isValid() { return true; } - virtual bool usesMixer() const { - return true; - } virtual void Update(); diff --git a/Source/Core/AudioCommon/DSoundStream.h b/Source/Core/AudioCommon/DSoundStream.h index b70a7b4e43..331c4581d3 100644 --- a/Source/Core/AudioCommon/DSoundStream.h +++ b/Source/Core/AudioCommon/DSoundStream.h @@ -65,7 +65,6 @@ public: virtual void Stop(); virtual void Clear(bool mute); static bool isValid() { return true; } - virtual bool usesMixer() const { return true; } virtual void Update(); #else diff --git a/Source/Core/AudioCommon/NullSoundStream.h b/Source/Core/AudioCommon/NullSoundStream.h index 21908f6a00..fd975259b0 100644 --- a/Source/Core/AudioCommon/NullSoundStream.h +++ b/Source/Core/AudioCommon/NullSoundStream.h @@ -27,6 +27,5 @@ public: virtual void Stop() override; virtual void Clear(bool mute) override; static bool isValid() { return true; } - virtual bool usesMixer() const { return true; } virtual void Update() override; }; diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h index 578d7e195a..0c3f932a38 100644 --- a/Source/Core/AudioCommon/OpenALStream.h +++ b/Source/Core/AudioCommon/OpenALStream.h @@ -57,7 +57,6 @@ public: virtual void Stop() override; virtual void Clear(bool mute) override; static bool isValid() { return true; } - virtual bool usesMixer() const { return true; } virtual void Update() override; private: diff --git a/Source/Core/AudioCommon/OpenSLESStream.h b/Source/Core/AudioCommon/OpenSLESStream.h index 9ea3e32e61..08deec6eb1 100644 --- a/Source/Core/AudioCommon/OpenSLESStream.h +++ b/Source/Core/AudioCommon/OpenSLESStream.h @@ -20,7 +20,6 @@ public: virtual bool Start(); virtual void Stop(); static bool isValid() { return true; } - virtual bool usesMixer() const { return true; } private: std::thread thread; diff --git a/Source/Core/AudioCommon/PulseAudioStream.h b/Source/Core/AudioCommon/PulseAudioStream.h index 6e818b04ff..eeeeebe836 100644 --- a/Source/Core/AudioCommon/PulseAudioStream.h +++ b/Source/Core/AudioCommon/PulseAudioStream.h @@ -25,8 +25,6 @@ public: static bool isValid() {return true;} - virtual bool usesMixer() const {return true;} - virtual void Update() override; void StateCallback(pa_context *c); diff --git a/Source/Core/AudioCommon/XAudio2Stream.h b/Source/Core/AudioCommon/XAudio2Stream.h index b0d4de4510..be76d919e8 100644 --- a/Source/Core/AudioCommon/XAudio2Stream.h +++ b/Source/Core/AudioCommon/XAudio2Stream.h @@ -60,7 +60,6 @@ public: virtual void Update(); virtual void Clear(bool mute); virtual void SetVolume(int volume); - virtual bool usesMixer() const { return true; } static bool isValid() { return InitLibrary(); } diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.cpp b/Source/Core/AudioCommon/XAudio2_7Stream.cpp index ea2e43708d..816d83d47b 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2_7Stream.cpp @@ -260,8 +260,6 @@ void XAudio2_7::Stop() } } -bool XAudio2_7::usesMixer() const { return true; } - #else struct StreamingVoiceContext2_7 {}; @@ -283,7 +281,6 @@ void XAudio2_7::Stop() {} void XAudio2_7::Update() {} void XAudio2_7::Clear(bool mute) {} void XAudio2_7::SetVolume(int volume) {} -bool XAudio2_7::usesMixer() const { return false; } bool XAudio2_7::InitLibrary() { return false; } #endif diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.h b/Source/Core/AudioCommon/XAudio2_7Stream.h index 4f0f8b5285..d7dc7ba302 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.h +++ b/Source/Core/AudioCommon/XAudio2_7Stream.h @@ -66,7 +66,6 @@ public: virtual void Update(); virtual void Clear(bool mute); virtual void SetVolume(int volume); - virtual bool usesMixer() const; static bool isValid() { return InitLibrary(); }