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

AudioCommon: if backend is unknown, use default backend

This commit is contained in:
Michael M 2019-09-14 14:16:13 -07:00
parent 0f3695a14b
commit 71c3c5626b
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,23 +27,37 @@ static bool s_sound_stream_running = false;
constexpr int AUDIO_VOLUME_MIN = 0; constexpr int AUDIO_VOLUME_MIN = 0;
constexpr int AUDIO_VOLUME_MAX = 100; constexpr int AUDIO_VOLUME_MAX = 100;
static std::unique_ptr<SoundStream> CreateSoundStreamForBackend(std::string_view backend)
{
if (backend == BACKEND_CUBEB)
return std::make_unique<CubebStream>();
else if (backend == BACKEND_OPENAL && OpenALStream::isValid())
return std::make_unique<OpenALStream>();
else if (backend == BACKEND_NULLSOUND)
return std::make_unique<NullSound>();
else if (backend == BACKEND_ALSA && AlsaSound::isValid())
return std::make_unique<AlsaSound>();
else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid())
return std::make_unique<PulseAudio>();
else if (backend == BACKEND_OPENSLES && OpenSLESStream::isValid())
return std::make_unique<OpenSLESStream>();
else if (backend == BACKEND_WASAPI && WASAPIStream::isValid())
return std::make_unique<WASAPIStream>();
return {};
}
void InitSoundStream() void InitSoundStream()
{ {
std::string backend = SConfig::GetInstance().sBackend; std::string backend = SConfig::GetInstance().sBackend;
if (backend == BACKEND_CUBEB) g_sound_stream = CreateSoundStreamForBackend(backend);
g_sound_stream = std::make_unique<CubebStream>();
else if (backend == BACKEND_OPENAL && OpenALStream::isValid()) if (!g_sound_stream)
g_sound_stream = std::make_unique<OpenALStream>(); {
else if (backend == BACKEND_NULLSOUND) WARN_LOG(AUDIO, "Unknown backend %s, using %s instead.", backend.c_str(),
g_sound_stream = std::make_unique<NullSound>(); GetDefaultSoundBackend().c_str());
else if (backend == BACKEND_ALSA && AlsaSound::isValid()) backend = GetDefaultSoundBackend();
g_sound_stream = std::make_unique<AlsaSound>(); g_sound_stream = CreateSoundStreamForBackend(GetDefaultSoundBackend());
else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid()) }
g_sound_stream = std::make_unique<PulseAudio>();
else if (backend == BACKEND_OPENSLES && OpenSLESStream::isValid())
g_sound_stream = std::make_unique<OpenSLESStream>();
else if (backend == BACKEND_WASAPI && WASAPIStream::isValid())
g_sound_stream = std::make_unique<WASAPIStream>();
if (!g_sound_stream || !g_sound_stream->Init()) if (!g_sound_stream || !g_sound_stream->Init())
{ {