diff options
| author | 2018-07-30 23:57:53 -0400 | |
|---|---|---|
| committer | 2018-07-31 22:38:42 -0400 | |
| commit | ca84b530a376e826c1a90d7c7e402d4a3bce00b7 (patch) | |
| tree | 3febdf01f6402c88f0372d2c2644601108734031 /src/audio_core/audio_out.cpp | |
| parent | Merge pull request #876 from lioncash/include (diff) | |
| download | yuzu-ca84b530a376e826c1a90d7c7e402d4a3bce00b7.tar.gz yuzu-ca84b530a376e826c1a90d7c7e402d4a3bce00b7.tar.xz yuzu-ca84b530a376e826c1a90d7c7e402d4a3bce00b7.zip | |
audio_core: Add configuration settings.
Diffstat (limited to 'src/audio_core/audio_out.cpp')
| -rw-r--r-- | src/audio_core/audio_out.cpp | 5 |
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 @@ | |||
| 7 | #include "audio_core/sink_details.h" | 7 | #include "audio_core/sink_details.h" |
| 8 | #include "common/assert.h" | 8 | #include "common/assert.h" |
| 9 | #include "common/logging/log.h" | 9 | #include "common/logging/log.h" |
| 10 | #include "core/settings.h" | ||
| 10 | 11 | ||
| 11 | namespace AudioCore { | 12 | namespace AudioCore { |
| 12 | 13 | ||
| @@ -29,8 +30,8 @@ static Stream::Format ChannelsToStreamFormat(u32 num_channels) { | |||
| 29 | StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels, | 30 | StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels, |
| 30 | Stream::ReleaseCallback&& release_callback) { | 31 | Stream::ReleaseCallback&& release_callback) { |
| 31 | if (!sink) { | 32 | if (!sink) { |
| 32 | const SinkDetails& sink_details = GetSinkDetails("auto"); | 33 | const SinkDetails& sink_details = GetSinkDetails(Settings::values.sink_id); |
| 33 | sink = sink_details.factory(""); | 34 | sink = sink_details.factory(Settings::values.audio_device_id); |
| 34 | } | 35 | } |
| 35 | 36 | ||
| 36 | return std::make_shared<Stream>(sample_rate, ChannelsToStreamFormat(num_channels), | 37 | return std::make_shared<Stream>(sample_rate, ChannelsToStreamFormat(num_channels), |