From 5e5ab61d0ccd8f0f6436071beb55f863ae41a3b1 Mon Sep 17 00:00:00 2001 From: lioncash Date: Tue, 18 Mar 2014 10:37:45 -0400 Subject: [PATCH 1/2] Mark the audio streams as final. These aren't intended to be continually extended. --- Source/Core/AudioCommon/AOSoundStream.h | 2 +- Source/Core/AudioCommon/AlsaSoundStream.h | 2 +- Source/Core/AudioCommon/CoreAudioSoundStream.h | 2 +- Source/Core/AudioCommon/DSoundStream.h | 2 +- Source/Core/AudioCommon/NullSoundStream.h | 2 +- Source/Core/AudioCommon/OpenALStream.h | 2 +- Source/Core/AudioCommon/OpenSLESStream.h | 2 +- Source/Core/AudioCommon/PulseAudioStream.h | 2 +- Source/Core/AudioCommon/XAudio2Stream.h | 2 +- Source/Core/AudioCommon/XAudio2_7Stream.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/Core/AudioCommon/AOSoundStream.h b/Source/Core/AudioCommon/AOSoundStream.h index efa2357327..3a18f8ebc4 100644 --- a/Source/Core/AudioCommon/AOSoundStream.h +++ b/Source/Core/AudioCommon/AOSoundStream.h @@ -11,7 +11,7 @@ #include #endif -class AOSound : public SoundStream +class AOSound final : public SoundStream { #if defined(HAVE_AO) && HAVE_AO std::thread thread; diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h index 04672b1e63..eaf4228a0f 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.h +++ b/Source/Core/AudioCommon/AlsaSoundStream.h @@ -12,7 +12,7 @@ #include "Common/Common.h" #include "Common/Thread.h" -class AlsaSound : public SoundStream +class AlsaSound final : public SoundStream { #if defined(HAVE_ALSA) && HAVE_ALSA public: diff --git a/Source/Core/AudioCommon/CoreAudioSoundStream.h b/Source/Core/AudioCommon/CoreAudioSoundStream.h index 4df7c6000e..a0208e8242 100644 --- a/Source/Core/AudioCommon/CoreAudioSoundStream.h +++ b/Source/Core/AudioCommon/CoreAudioSoundStream.h @@ -10,7 +10,7 @@ #include "AudioCommon/SoundStream.h" -class CoreAudioSound : public SoundStream +class CoreAudioSound final : public SoundStream { #ifdef __APPLE__ public: diff --git a/Source/Core/AudioCommon/DSoundStream.h b/Source/Core/AudioCommon/DSoundStream.h index b79cb0d1eb..b70a7b4e43 100644 --- a/Source/Core/AudioCommon/DSoundStream.h +++ b/Source/Core/AudioCommon/DSoundStream.h @@ -15,7 +15,7 @@ #define BUFSIZE (1024 * 8 * 4) #endif -class DSound : public SoundStream +class DSound final : public SoundStream { #ifdef _WIN32 std::thread thread; diff --git a/Source/Core/AudioCommon/NullSoundStream.h b/Source/Core/AudioCommon/NullSoundStream.h index f7e6d0e86a..21908f6a00 100644 --- a/Source/Core/AudioCommon/NullSoundStream.h +++ b/Source/Core/AudioCommon/NullSoundStream.h @@ -9,7 +9,7 @@ #define BUF_SIZE (48000 * 4 / 32) -class NullSound : public SoundStream +class NullSound final : public SoundStream { // playback position short realtimeBuffer[BUF_SIZE / sizeof(short)]; diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h index fa394d70c0..578d7e195a 100644 --- a/Source/Core/AudioCommon/OpenALStream.h +++ b/Source/Core/AudioCommon/OpenALStream.h @@ -40,7 +40,7 @@ #define FRAME_SURROUND_FLOAT SURROUND_CHANNELS * SIZE_FLOAT #endif -class OpenALStream: public SoundStream +class OpenALStream final : public SoundStream { #if defined HAVE_OPENAL && HAVE_OPENAL public: diff --git a/Source/Core/AudioCommon/OpenSLESStream.h b/Source/Core/AudioCommon/OpenSLESStream.h index ee81b30ff6..9ea3e32e61 100644 --- a/Source/Core/AudioCommon/OpenSLESStream.h +++ b/Source/Core/AudioCommon/OpenSLESStream.h @@ -7,7 +7,7 @@ #include "AudioCommon/SoundStream.h" #include "Common/Thread.h" -class OpenSLESStream : public SoundStream +class OpenSLESStream final : public SoundStream { #ifdef ANDROID public: diff --git a/Source/Core/AudioCommon/PulseAudioStream.h b/Source/Core/AudioCommon/PulseAudioStream.h index 8dddeca241..6e818b04ff 100644 --- a/Source/Core/AudioCommon/PulseAudioStream.h +++ b/Source/Core/AudioCommon/PulseAudioStream.h @@ -14,7 +14,7 @@ #include "Common/Common.h" #include "Common/Thread.h" -class PulseAudio : public SoundStream +class PulseAudio final : public SoundStream { #if defined(HAVE_PULSEAUDIO) && HAVE_PULSEAUDIO public: diff --git a/Source/Core/AudioCommon/XAudio2Stream.h b/Source/Core/AudioCommon/XAudio2Stream.h index de38c8765a..b0d4de4510 100644 --- a/Source/Core/AudioCommon/XAudio2Stream.h +++ b/Source/Core/AudioCommon/XAudio2Stream.h @@ -21,7 +21,7 @@ struct IXAudio2MasteringVoice; #endif -class XAudio2 : public SoundStream +class XAudio2 final : public SoundStream { #ifdef _WIN32 diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.h b/Source/Core/AudioCommon/XAudio2_7Stream.h index ce0806a5c9..4f0f8b5285 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.h +++ b/Source/Core/AudioCommon/XAudio2_7Stream.h @@ -26,7 +26,7 @@ struct IXAudio2MasteringVoice; #endif -class XAudio2_7 : public SoundStream +class XAudio2_7 final : public SoundStream { #ifdef _WIN32 From aecc8ea6665d5f55f8b39d2ba0bab719ec6712a7 Mon Sep 17 00:00:00 2001 From: lioncash Date: Tue, 18 Mar 2014 10:42:07 -0400 Subject: [PATCH 2/2] Remove usesMixer function from the sound streams. This isn't used anywhere in the codebase. Not even the base SoundStream has it as part of its interface. --- Source/Core/AudioCommon/AOSoundStream.h | 4 ---- Source/Core/AudioCommon/AlsaSoundStream.h | 3 --- Source/Core/AudioCommon/CoreAudioSoundStream.h | 3 --- Source/Core/AudioCommon/DSoundStream.h | 1 - Source/Core/AudioCommon/NullSoundStream.h | 1 - Source/Core/AudioCommon/OpenALStream.h | 1 - Source/Core/AudioCommon/OpenSLESStream.h | 1 - Source/Core/AudioCommon/PulseAudioStream.h | 2 -- Source/Core/AudioCommon/XAudio2Stream.h | 1 - Source/Core/AudioCommon/XAudio2_7Stream.cpp | 3 --- Source/Core/AudioCommon/XAudio2_7Stream.h | 1 - 11 files changed, 21 deletions(-) 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(); }