summaryrefslogtreecommitdiffstats
path: root/src/audio_core/audio_core.cpp
diff options
context:
space:
mode:
authorKloen Lansfiel <kloen@outlawkiwi.com>2017-01-26 04:33:26 +0100
committerSebastian Valle <subv2112@gmail.com>2017-01-26 04:33:26 +0100
commitf8523699864b6000572affaa0e36d9a4d89ffce6 (patch)
tree952a96e11d4efe860272ea7a47ebbee896fb5d61 /src/audio_core/audio_core.cpp
parentMerge pull request #2434 from mailwl/nfc-amiibo (diff)
downloadyuzu-f8523699864b6000572affaa0e36d9a4d89ffce6.tar
yuzu-f8523699864b6000572affaa0e36d9a4d89ffce6.tar.gz
yuzu-f8523699864b6000572affaa0e36d9a4d89ffce6.tar.bz2
yuzu-f8523699864b6000572affaa0e36d9a4d89ffce6.tar.lz
yuzu-f8523699864b6000572affaa0e36d9a4d89ffce6.tar.xz
yuzu-f8523699864b6000572affaa0e36d9a4d89ffce6.tar.zst
yuzu-f8523699864b6000572affaa0e36d9a4d89ffce6.zip
Diffstat (limited to 'src/audio_core/audio_core.cpp')
-rw-r--r--src/audio_core/audio_core.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/audio_core/audio_core.cpp b/src/audio_core/audio_core.cpp
index ba6acf28e..84f9c03a7 100644
--- a/src/audio_core/audio_core.cpp
+++ b/src/audio_core/audio_core.cpp
@@ -56,20 +56,8 @@ void AddAddressSpace(Kernel::VMManager& address_space) {
}
void SelectSink(std::string sink_id) {
- auto iter =
- std::find_if(g_sink_details.begin(), g_sink_details.end(),
- [sink_id](const auto& sink_detail) { return sink_detail.id == sink_id; });
-
- if (sink_id == "auto" || iter == g_sink_details.end()) {
- if (sink_id != "auto") {
- LOG_ERROR(Audio, "AudioCore::SelectSink given invalid sink_id %s", sink_id.c_str());
- }
- // 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());
+ const SinkDetails& sink_details = GetSinkDetails(sink_id);
+ DSP::HLE::SetSink(sink_details.factory());
}
void EnableStretching(bool enable) {