octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2296 from MerryMage/auto_is_auto 

audio_core: SelectSink should default to auto if sink_id is invalid
This commit is contained in:
Yuri Kunde Schlesner 2016-12-09 20:34:10 -08:00 committed by GitHub
parent 6edb024d38 cef0f5b5a7
commit 42edd7911e
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/audio_core/audio_core.cpp
View File

@ -56,22 +56,17 @@ void AddAddressSpace(Kernel::VMManager& address_space) {
} }
void SelectSink(std::string sink_id) { void SelectSink(std::string sink_id) {
if (sink_id == "auto") {
// Auto-select.
// g_sink_details is ordered in terms of desirability, with the best choice at the front.
const auto& sink_detail = g_sink_details.front();
DSP::HLE::SetSink(sink_detail.factory());
return;
}
auto iter = auto iter =
std::find_if(g_sink_details.begin(), g_sink_details.end(), std::find_if(g_sink_details.begin(), g_sink_details.end(),
[sink_id](const auto& sink_detail) { return sink_detail.id == sink_id; }); [sink_id](const auto& sink_detail) { return sink_detail.id == sink_id; });
if (iter == g_sink_details.end()) { if (sink_id == "auto" || iter == g_sink_details.end()) {
LOG_ERROR(Audio, "AudioCore::SelectSink given invalid sink_id"); if (sink_id != "auto") {
DSP::HLE::SetSink(std::make_unique<NullSink>()); LOG_ERROR(Audio, "AudioCore::SelectSink given invalid sink_id %s", sink_id.c_str());
return; }
// Auto-select.
// g_sink_details is ordered in terms of desirability, with the best choice at the front.
iter = g_sink_details.begin();
} }
DSP::HLE::SetSink(iter->factory()); DSP::HLE::SetSink(iter->factory());