From 07d4dbe657890448d68e1c50bba9f40077959268 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 24 May 2015 06:02:30 -0400 Subject: [PATCH] AudioCommon: Add missing override specifiers Also removes unnecessary virtual keywords. --- Source/Core/AudioCommon/AOSoundStream.h | 10 ++++------ Source/Core/AudioCommon/AlsaSoundStream.h | 9 ++++----- Source/Core/AudioCommon/CoreAudioSoundStream.h | 11 +++++------ Source/Core/AudioCommon/NullSoundStream.h | 13 +++++++------ Source/Core/AudioCommon/OpenALStream.h | 13 +++++++------ Source/Core/AudioCommon/OpenSLESStream.h | 4 ++-- Source/Core/AudioCommon/PulseAudioStream.h | 7 +++---- Source/Core/AudioCommon/XAudio2Stream.h | 10 +++++----- Source/Core/AudioCommon/XAudio2_7Stream.h | 10 +++++----- 9 files changed, 42 insertions(+), 45 deletions(-) diff --git a/Source/Core/AudioCommon/AOSoundStream.h b/Source/Core/AudioCommon/AOSoundStream.h index bcb78fff39..c42b27c1ed 100644 --- a/Source/Core/AudioCommon/AOSoundStream.h +++ b/Source/Core/AudioCommon/AOSoundStream.h @@ -33,17 +33,15 @@ class AOSound final : public SoundStream short realtimeBuffer[1024 * 1024]; public: - virtual bool Start() override; - - virtual void SoundLoop() override; - - virtual void Stop() override; + bool Start() override; + void SoundLoop() override; + void Stop() override; + void Update() override; static bool isValid() { return true; } - virtual void Update() override; #endif }; diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h index 82661e2899..82c69b168b 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.h +++ b/Source/Core/AudioCommon/AlsaSoundStream.h @@ -21,17 +21,16 @@ public: AlsaSound(); virtual ~AlsaSound(); - virtual bool Start() override; - virtual void SoundLoop() override; - virtual void Stop() override; + bool Start() override; + void SoundLoop() override; + void Stop() override; + void Update() override; static bool isValid() { return true; } - virtual void Update() override; - private: enum class ALSAThreadStatus { diff --git a/Source/Core/AudioCommon/CoreAudioSoundStream.h b/Source/Core/AudioCommon/CoreAudioSoundStream.h index cbf14e46fb..8a7aa4fb9b 100644 --- a/Source/Core/AudioCommon/CoreAudioSoundStream.h +++ b/Source/Core/AudioCommon/CoreAudioSoundStream.h @@ -14,18 +14,17 @@ class CoreAudioSound final : public SoundStream { #ifdef __APPLE__ public: - virtual bool Start(); - virtual void SetVolume(int volume); - virtual void SoundLoop(); - virtual void Stop(); + bool Start() override; + void SetVolume(int volume) override; + void SoundLoop() override; + void Stop() override; + void Update() override; static bool isValid() { return true; } - virtual void Update(); - private: AudioUnit audioUnit; int m_volume; diff --git a/Source/Core/AudioCommon/NullSoundStream.h b/Source/Core/AudioCommon/NullSoundStream.h index 4c7e455b09..287f1a635b 100644 --- a/Source/Core/AudioCommon/NullSoundStream.h +++ b/Source/Core/AudioCommon/NullSoundStream.h @@ -15,11 +15,12 @@ class NullSound final : public SoundStream short realtimeBuffer[BUF_SIZE / sizeof(short)]; public: - virtual bool Start() override; - virtual void SoundLoop() override; - virtual void SetVolume(int volume) override; - virtual void Stop() override; - virtual void Clear(bool mute) override; + bool Start() override; + void SoundLoop() override; + void SetVolume(int volume) override; + void Stop() override; + void Clear(bool mute) override; + void Update() override; + static bool isValid() { return true; } - virtual void Update() override; }; diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h index 35de8e8b41..b4bc835722 100644 --- a/Source/Core/AudioCommon/OpenALStream.h +++ b/Source/Core/AudioCommon/OpenALStream.h @@ -60,13 +60,14 @@ public: { } - virtual bool Start() override; - virtual void SoundLoop() override; - virtual void SetVolume(int volume) override; - virtual void Stop() override; - virtual void Clear(bool mute) override; + bool Start() override; + void SoundLoop() override; + void SetVolume(int volume) override; + void Stop() override; + void Clear(bool mute) override; + void Update() override; + static bool isValid() { return true; } - virtual void Update() override; private: std::thread thread; diff --git a/Source/Core/AudioCommon/OpenSLESStream.h b/Source/Core/AudioCommon/OpenSLESStream.h index 47f4e879d1..cafc2826cb 100644 --- a/Source/Core/AudioCommon/OpenSLESStream.h +++ b/Source/Core/AudioCommon/OpenSLESStream.h @@ -13,8 +13,8 @@ class OpenSLESStream final : public SoundStream { #ifdef ANDROID public: - virtual bool Start(); - virtual void Stop(); + bool Start() override; + void Stop() override; static bool isValid() { return true; } private: diff --git a/Source/Core/AudioCommon/PulseAudioStream.h b/Source/Core/AudioCommon/PulseAudioStream.h index 0d31d3f65b..e53e561f46 100644 --- a/Source/Core/AudioCommon/PulseAudioStream.h +++ b/Source/Core/AudioCommon/PulseAudioStream.h @@ -20,13 +20,12 @@ class PulseAudio final : public SoundStream public: PulseAudio(); - virtual bool Start() override; - virtual void Stop() override; + bool Start() override; + void Stop() override; + void Update() override; static bool isValid() { return true; } - virtual void Update() override; - void StateCallback(pa_context *c); void WriteCallback(pa_stream *s, size_t length); void UnderflowCallback(pa_stream *s); diff --git a/Source/Core/AudioCommon/XAudio2Stream.h b/Source/Core/AudioCommon/XAudio2Stream.h index a862ded7c5..ef62a10e9c 100644 --- a/Source/Core/AudioCommon/XAudio2Stream.h +++ b/Source/Core/AudioCommon/XAudio2Stream.h @@ -54,12 +54,12 @@ public: XAudio2(); virtual ~XAudio2(); - virtual bool Start(); - virtual void Stop(); + bool Start() override; + void Stop() override; - virtual void Update(); - virtual void Clear(bool mute); - virtual void SetVolume(int volume); + void Update() override; + void Clear(bool mute) override; + void SetVolume(int volume) override; static bool isValid() { return InitLibrary(); } #endif diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.h b/Source/Core/AudioCommon/XAudio2_7Stream.h index 4914338c9a..6c1bf98e55 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.h +++ b/Source/Core/AudioCommon/XAudio2_7Stream.h @@ -61,12 +61,12 @@ public: XAudio2_7(); virtual ~XAudio2_7(); - virtual bool Start(); - virtual void Stop(); + bool Start() override; + void Stop() override; - virtual void Update(); - virtual void Clear(bool mute); - virtual void SetVolume(int volume); + void Update() override; + void Clear(bool mute) override; + void SetVolume(int volume) override; static bool isValid() { return InitLibrary(); } #endif