ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AudioCommon: rename isValid() to IsValid()

This commit is contained in:
Tillmann Karras 2021-08-08 00:23:58 +01:00
parent b6d8c111bc
commit eda2035874
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ public:
bool Init() override; bool Init() override;
bool SetRunning(bool running) override; bool SetRunning(bool running) override;
static bool isValid() { return true; } static bool IsValid() { return true; }
private: private:
void SoundLoop(); void SoundLoop();

22
Source/Core/AudioCommon/AudioCommon.cpp
View File

@ -30,17 +30,17 @@ static std::unique_ptr<SoundStream> CreateSoundStreamForBackend(std::string_view
{ {
if (backend == BACKEND_CUBEB) if (backend == BACKEND_CUBEB)
return std::make_unique<CubebStream>(); return std::make_unique<CubebStream>();
else if (backend == BACKEND_OPENAL && OpenALStream::isValid()) else if (backend == BACKEND_OPENAL && OpenALStream::IsValid())
return std::make_unique<OpenALStream>(); return std::make_unique<OpenALStream>();
else if (backend == BACKEND_NULLSOUND) else if (backend == BACKEND_NULLSOUND)
return std::make_unique<NullSound>(); return std::make_unique<NullSound>();
else if (backend == BACKEND_ALSA && AlsaSound::isValid()) else if (backend == BACKEND_ALSA && AlsaSound::IsValid())
return std::make_unique<AlsaSound>(); return std::make_unique<AlsaSound>();
else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid()) else if (backend == BACKEND_PULSEAUDIO && PulseAudio::IsValid())
return std::make_unique<PulseAudio>(); return std::make_unique<PulseAudio>();
else if (backend == BACKEND_OPENSLES && OpenSLESStream::isValid()) else if (backend == BACKEND_OPENSLES && OpenSLESStream::IsValid())
return std::make_unique<OpenSLESStream>(); return std::make_unique<OpenSLESStream>();
else if (backend == BACKEND_WASAPI && WASAPIStream::isValid()) else if (backend == BACKEND_WASAPI && WASAPIStream::IsValid())
return std::make_unique<WASAPIStream>(); return std::make_unique<WASAPIStream>();
return {}; return {};
} }
@ -96,7 +96,7 @@ std::string GetDefaultSoundBackend()
#if defined ANDROID #if defined ANDROID
backend = BACKEND_OPENSLES; backend = BACKEND_OPENSLES;
#elif defined __linux__ #elif defined __linux__
if (AlsaSound::isValid()) if (AlsaSound::IsValid())
backend = BACKEND_ALSA; backend = BACKEND_ALSA;
#elif defined(__APPLE__) || defined(_WIN32) #elif defined(__APPLE__) || defined(_WIN32)
backend = BACKEND_CUBEB; backend = BACKEND_CUBEB;
@ -115,15 +115,15 @@ std::vector<std::string> GetSoundBackends()
backends.emplace_back(BACKEND_NULLSOUND); backends.emplace_back(BACKEND_NULLSOUND);
backends.emplace_back(BACKEND_CUBEB); backends.emplace_back(BACKEND_CUBEB);
if (AlsaSound::isValid()) if (AlsaSound::IsValid())
backends.emplace_back(BACKEND_ALSA); backends.emplace_back(BACKEND_ALSA);
if (PulseAudio::isValid()) if (PulseAudio::IsValid())
backends.emplace_back(BACKEND_PULSEAUDIO); backends.emplace_back(BACKEND_PULSEAUDIO);
if (OpenALStream::isValid()) if (OpenALStream::IsValid())
backends.emplace_back(BACKEND_OPENAL); backends.emplace_back(BACKEND_OPENAL);
if (OpenSLESStream::isValid()) if (OpenSLESStream::IsValid())
backends.emplace_back(BACKEND_OPENSLES); backends.emplace_back(BACKEND_OPENSLES);
if (WASAPIStream::isValid()) if (WASAPIStream::IsValid())
backends.emplace_back(BACKEND_WASAPI); backends.emplace_back(BACKEND_WASAPI);
return backends; return backends;

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

@ -12,5 +12,5 @@ public:
bool SetRunning(bool running) override; bool SetRunning(bool running) override;
void SetVolume(int volume) override; void SetVolume(int volume) override;
static bool isValid() { return true; } static bool IsValid() { return true; }
}; };

2
Source/Core/AudioCommon/OpenALStream.cpp
View File

@ -83,7 +83,7 @@ static bool InitLibrary()
return true; return true;
} }
bool OpenALStream::isValid() bool OpenALStream::IsValid()
{ {
return InitLibrary(); return InitLibrary();
} }

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

@ -59,7 +59,7 @@ public:
void SetVolume(int volume) override; void SetVolume(int volume) override;
bool SetRunning(bool running) override; bool SetRunning(bool running) override;
static bool isValid(); static bool IsValid();
private: private:
void SoundLoop(); void SoundLoop();

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

@ -16,7 +16,7 @@ public:
bool Init() override; bool Init() override;
bool SetRunning(bool running) override { return true; } bool SetRunning(bool running) override { return true; }
void SetVolume(int volume) override; void SetVolume(int volume) override;
static bool isValid() { return true; } static bool IsValid() { return true; }
private: private:
std::thread thread; std::thread thread;

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

@ -21,7 +21,7 @@ public:
bool Init() override; bool Init() override;
bool SetRunning(bool running) override { return true; } bool SetRunning(bool running) override { return true; }
static bool isValid() { return true; } static bool IsValid() { return true; }
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);

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

@ -16,7 +16,7 @@ protected:
public: public:
SoundStream() : m_mixer(new Mixer(48000)) {} SoundStream() : m_mixer(new Mixer(48000)) {}
virtual ~SoundStream() {} virtual ~SoundStream() {}
static bool isValid() { return false; } static bool IsValid() { return false; }
Mixer* GetMixer() const { return m_mixer.get(); } Mixer* GetMixer() const { return m_mixer.get(); }
virtual bool Init() { return false; } virtual bool Init() { return false; }
virtual void SetVolume(int) {} virtual void SetVolume(int) {}

2
Source/Core/AudioCommon/WASAPIStream.cpp
View File

@ -49,7 +49,7 @@ WASAPIStream::~WASAPIStream()
m_thread.join(); m_thread.join();
} }
bool WASAPIStream::isValid() bool WASAPIStream::IsValid()
{ {
return true; return true;
} }

2
Source/Core/AudioCommon/WASAPIStream.h
View File

@ -36,7 +36,7 @@ public:
bool Init() override; bool Init() override;
bool SetRunning(bool running) override; bool SetRunning(bool running) override;
static bool isValid(); static bool IsValid();
static std::vector<std::string> GetAvailableDevices(); static std::vector<std::string> GetAvailableDevices();
static Microsoft::WRL::ComPtr<IMMDevice> GetDeviceByName(std::string_view name); static Microsoft::WRL::ComPtr<IMMDevice> GetDeviceByName(std::string_view name);