diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-08-01 16:42:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-01 16:42:01 +0800 |
| commit | c4b2aa88ec1385a3edfed65c02314c2cde8278fc (patch) | |
| tree | a0a842d2267550918f02e1794b0dd2e0f64cbd26 /Source/Core/AudioCommon/AudioCommon.cpp | |
| parent | 91a6f746397c66188fc3cea19cf1c1547ea69550 (diff) | |
| parent | 21fa010bb66f56ed9b83e840d25c10c313b99e05 (diff) | |
Merge pull request #5690 from ligfx/removecoreaudio
Remove CoreAudio audio backend
Diffstat (limited to 'Source/Core/AudioCommon/AudioCommon.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/AudioCommon.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp index 606854159c..18aa75d1ae 100644 --- a/Source/Core/AudioCommon/AudioCommon.cpp +++ b/Source/Core/AudioCommon/AudioCommon.cpp @@ -4,7 +4,6 @@ #include "AudioCommon/AudioCommon.h" #include "AudioCommon/AlsaSoundStream.h" -#include "AudioCommon/CoreAudioSoundStream.h" #include "AudioCommon/CubebStream.h" #include "AudioCommon/Mixer.h" #include "AudioCommon/NullSoundStream.h" @@ -46,8 +45,6 @@ void InitSoundStream() } else if (backend == BACKEND_ALSA && AlsaSound::isValid()) g_sound_stream = std::make_unique<AlsaSound>(); - else if (backend == BACKEND_COREAUDIO && CoreAudioSound::isValid()) - g_sound_stream = std::make_unique<CoreAudioSound>(); else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid()) g_sound_stream = std::make_unique<PulseAudio>(); else if (backend == BACKEND_OPENSLES && OpenSLESStream::isValid()) @@ -101,7 +98,7 @@ std::string GetDefaultSoundBackend() if (AlsaSound::isValid()) backend = BACKEND_ALSA; #elif defined __APPLE__ - backend = BACKEND_COREAUDIO; + backend = BACKEND_CUBEB; #elif defined _WIN32 backend = BACKEND_XAUDIO2; #endif @@ -118,8 +115,6 @@ std::vector<std::string> GetSoundBackends() backends.push_back(BACKEND_XAUDIO2); if (AlsaSound::isValid()) backends.push_back(BACKEND_ALSA); - if (CoreAudioSound::isValid()) - backends.push_back(BACKEND_COREAUDIO); if (PulseAudio::isValid()) backends.push_back(BACKEND_PULSEAUDIO); if (OpenALStream::isValid()) @@ -152,8 +147,7 @@ bool SupportsVolumeChanges(const std::string& backend) // FIXME: this one should ask the backend whether it supports it. // but getting the backend from string etc. is probably // too much just to enable/disable a stupid slider... - return backend == BACKEND_COREAUDIO || backend == BACKEND_CUBEB || backend == BACKEND_OPENAL || - backend == BACKEND_XAUDIO2; + return backend == BACKEND_CUBEB || backend == BACKEND_OPENAL || backend == BACKEND_XAUDIO2; } void UpdateSoundStream() |