aboutsummaryrefslogtreecommitdiff
path: root/src/audio_core/audio_out.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-31 21:04:26 -0700
committerGitHub <noreply@github.com>2018-07-31 21:04:26 -0700
commitd2ad279a32751756c6c7bcb9354136f52dea0795 (patch)
tree973766c8d6fdd43835f160d5844e286b5aabdc0b /src/audio_core/audio_out.cpp
parentff2c1b0a94d83e35023732a323fc8b6500bc2a9a (diff)
parentca84b530a376e826c1a90d7c7e402d4a3bce00b7 (diff)
Merge pull request #871 from bunnei/audio-config
audio_core: Add configuration settings.
Diffstat (limited to 'src/audio_core/audio_out.cpp')
-rw-r--r--src/audio_core/audio_out.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/audio_core/audio_out.cpp b/src/audio_core/audio_out.cpp
index 77cedb6ba..0cabaa354 100644
--- a/src/audio_core/audio_out.cpp
+++ b/src/audio_core/audio_out.cpp
@@ -7,6 +7,7 @@
#include "audio_core/sink_details.h"
#include "common/assert.h"
#include "common/logging/log.h"
+#include "core/settings.h"
namespace AudioCore {
@@ -29,8 +30,8 @@ static Stream::Format ChannelsToStreamFormat(u32 num_channels) {
StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels,
Stream::ReleaseCallback&& release_callback) {
if (!sink) {
- const SinkDetails& sink_details = GetSinkDetails("auto");
- sink = sink_details.factory("");
+ const SinkDetails& sink_details = GetSinkDetails(Settings::values.sink_id);
+ sink = sink_details.factory(Settings::values.audio_device_id);
}
return std::make_shared<Stream>(sample_rate, ChannelsToStreamFormat(num_channels),