mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-04-24 22:34:54 +00:00
Merge pull request #13555 from jordan-woyak/cubeb-default
AudioCommon: Make cubeb sound backend default on Linux.
This commit is contained in:
commit
fd8ce3ce80
1 changed files with 11 additions and 12 deletions
|
@ -14,7 +14,6 @@
|
||||||
#include "AudioCommon/OpenSLESStream.h"
|
#include "AudioCommon/OpenSLESStream.h"
|
||||||
#include "AudioCommon/PulseAudioStream.h"
|
#include "AudioCommon/PulseAudioStream.h"
|
||||||
#include "AudioCommon/WASAPIStream.h"
|
#include "AudioCommon/WASAPIStream.h"
|
||||||
#include "Common/Common.h"
|
|
||||||
#include "Common/FileUtil.h"
|
#include "Common/FileUtil.h"
|
||||||
#include "Common/Logging/Log.h"
|
#include "Common/Logging/Log.h"
|
||||||
#include "Core/Config/MainSettings.h"
|
#include "Core/Config/MainSettings.h"
|
||||||
|
@ -94,19 +93,19 @@ void ShutdownSoundStream(Core::System& system)
|
||||||
|
|
||||||
std::string GetDefaultSoundBackend()
|
std::string GetDefaultSoundBackend()
|
||||||
{
|
{
|
||||||
std::string backend = BACKEND_NULLSOUND;
|
#if defined(ANDROID)
|
||||||
#if defined ANDROID
|
return BACKEND_OPENSLES;
|
||||||
backend = BACKEND_OPENSLES;
|
#else
|
||||||
#elif defined __linux__
|
|
||||||
if (AlsaSound::IsValid())
|
|
||||||
backend = BACKEND_ALSA;
|
|
||||||
else if (CubebStream::IsValid())
|
|
||||||
backend = BACKEND_CUBEB;
|
|
||||||
#elif defined(__APPLE__) || defined(_WIN32) || defined(__OpenBSD__)
|
|
||||||
if (CubebStream::IsValid())
|
if (CubebStream::IsValid())
|
||||||
backend = BACKEND_CUBEB;
|
return BACKEND_CUBEB;
|
||||||
#endif
|
#endif
|
||||||
return backend;
|
|
||||||
|
#if defined(__linux__)
|
||||||
|
if (AlsaSound::IsValid())
|
||||||
|
return BACKEND_ALSA;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return BACKEND_NULLSOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
DPL2Quality GetDefaultDPL2Quality()
|
DPL2Quality GetDefaultDPL2Quality()
|
||||||
|
|
Loading…
Add table
Reference in a new issue