archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 03:11:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2447 from lioncash/virtual

Browse source 
AudioCommon: Add override specifiers to SoundStream subclasses.
This commit is contained in:
Lioncash 2015-05-24 17:29:12 -04:00
commit b4ee315a72
10 changed files with 44 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/Core/AudioCommon/AOSoundStream.h
View file

@ -33,17 +33,15 @@ class AOSound final : public SoundStream
short realtimeBuffer[1024 * 1024]; short realtimeBuffer[1024 * 1024];
public: public:
virtual bool Start() override; bool Start() override;
void SoundLoop() override;
virtual void SoundLoop() override; void Stop() override;
void Update() override;
virtual void Stop() override;
static bool isValid() static bool isValid()
{ {
return true; return true;
} }
virtual void Update() override;
#endif #endif
}; };

9
Source/Core/AudioCommon/AlsaSoundStream.h
View file

@ -21,17 +21,16 @@ public:
AlsaSound(); AlsaSound();
virtual ~AlsaSound(); virtual ~AlsaSound();
virtual bool Start() override; bool Start() override;
virtual void SoundLoop() override; void SoundLoop() override;
virtual void Stop() override; void Stop() override;
void Update() override;
static bool isValid() static bool isValid()
{ {
return true; return true;
} }
virtual void Update() override;
private: private:
enum class ALSAThreadStatus enum class ALSAThreadStatus
{ {

11
Source/Core/AudioCommon/CoreAudioSoundStream.h
View file

@ -14,18 +14,17 @@ class CoreAudioSound final : public SoundStream
{ {
#ifdef __APPLE__ #ifdef __APPLE__
public: public:
virtual bool Start(); bool Start() override;
virtual void SetVolume(int volume); void SetVolume(int volume) override;
virtual void SoundLoop(); void SoundLoop() override;
virtual void Stop(); void Stop() override;
void Update() override;
static bool isValid() static bool isValid()
{ {
return true; return true;
} }
virtual void Update();
private: private:
AudioUnit audioUnit; AudioUnit audioUnit;
int m_volume; int m_volume;

13
Source/Core/AudioCommon/NullSoundStream.h
View file

@ -15,11 +15,12 @@ class NullSound final : public SoundStream
short realtimeBuffer[BUF_SIZE / sizeof(short)]; short realtimeBuffer[BUF_SIZE / sizeof(short)];
public: public:
virtual bool Start() override; bool Start() override;
virtual void SoundLoop() override; void SoundLoop() override;
virtual void SetVolume(int volume) override; void SetVolume(int volume) override;
virtual void Stop() override; void Stop() override;
virtual void Clear(bool mute) override; void Clear(bool mute) override;
void Update() override;
static bool isValid() { return true; } static bool isValid() { return true; }
virtual void Update() override;
}; };

13
Source/Core/AudioCommon/OpenALStream.h
View file

@ -60,13 +60,14 @@ public:
{ {
} }
virtual bool Start() override; bool Start() override;
virtual void SoundLoop() override; void SoundLoop() override;
virtual void SetVolume(int volume) override; void SetVolume(int volume) override;
virtual void Stop() override; void Stop() override;
virtual void Clear(bool mute) override; void Clear(bool mute) override;
void Update() override;
static bool isValid() { return true; } static bool isValid() { return true; }
virtual void Update() override;
private: private:
std::thread thread; std::thread thread;

4
Source/Core/AudioCommon/OpenSLESStream.h
View file

@ -13,8 +13,8 @@ class OpenSLESStream final : public SoundStream
{ {
#ifdef ANDROID #ifdef ANDROID
public: public:
virtual bool Start(); bool Start() override;
virtual void Stop(); void Stop() override;
static bool isValid() { return true; } static bool isValid() { return true; }
private: private:

7
Source/Core/AudioCommon/PulseAudioStream.h
View file

@ -20,13 +20,12 @@ class PulseAudio final : public SoundStream
public: public:
PulseAudio(); PulseAudio();
virtual bool Start() override; bool Start() override;
virtual void Stop() override; void Stop() override;
void Update() override;
static bool isValid() { return true; } static bool isValid() { return true; }
virtual void Update() override;
void StateCallback(pa_context *c); void StateCallback(pa_context *c);
void WriteCallback(pa_stream *s, size_t length); void WriteCallback(pa_stream *s, size_t length);
void UnderflowCallback(pa_stream *s); void UnderflowCallback(pa_stream *s);

4
Source/Core/AudioCommon/SoundStream.h
View file

@ -32,7 +32,7 @@ public:
virtual void Clear(bool mute) { m_muted = mute; } virtual void Clear(bool mute) { m_muted = mute; }
bool IsMuted() const { return m_muted; } bool IsMuted() const { return m_muted; }
virtual void StartLogAudio(const std::string& filename) void StartLogAudio(const std::string& filename)
{ {
if (!m_logAudio) if (!m_logAudio)
{ {
@ -47,7 +47,7 @@ public:
} }
} }
virtual void StopLogAudio() void StopLogAudio()
{ {
if (m_logAudio) if (m_logAudio)
{ {

10
Source/Core/AudioCommon/XAudio2Stream.h
View file

@ -54,12 +54,12 @@ public:
XAudio2(); XAudio2();
virtual ~XAudio2(); virtual ~XAudio2();
virtual bool Start(); bool Start() override;
virtual void Stop(); void Stop() override;
virtual void Update(); void Update() override;
virtual void Clear(bool mute); void Clear(bool mute) override;
virtual void SetVolume(int volume); void SetVolume(int volume) override;
static bool isValid() { return InitLibrary(); } static bool isValid() { return InitLibrary(); }
#endif #endif

10
Source/Core/AudioCommon/XAudio2_7Stream.h
View file

@ -61,12 +61,12 @@ public:
XAudio2_7(); XAudio2_7();
virtual ~XAudio2_7(); virtual ~XAudio2_7();
virtual bool Start(); bool Start() override;
virtual void Stop(); void Stop() override;
virtual void Update(); void Update() override;
virtual void Clear(bool mute); void Clear(bool mute) override;
virtual void SetVolume(int volume); void SetVolume(int volume) override;
static bool isValid() { return InitLibrary(); } static bool isValid() { return InitLibrary(); }
#endif #endif