dolphin-emu/dolphin
1
0
Fork 1
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-05 23:44:39 +02:00
Code Issues Packages Projects Releases 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
parent 5213d85118 6b30c9710c
commit b4ee315a72
10 changed files with 44 additions and 47 deletions
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];
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
};

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

@@ -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
{

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

@@ -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;

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

@@ -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;
};

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

@@ -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;

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

@@ -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:

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

@@ -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);

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

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

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

@@ -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

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

@@ -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