diff options
| author |  bunnei | 2018-12-14 21:48:17 -0500 |
|---|---|---|
| committer |  GitHub | 2018-12-14 21:48:17 -0500 |
| commit | b88430c29908a0f0b9cdbce139fac4f9c392eec6 (patch) | |
| tree | 6554f524db5348ae005504a4dd13954342ca9008 /src/audio_core/audio_out.cpp | |
| parent | Merge pull request #1899 from lioncash/state (diff) | |
| parent | audio_core: Make g_sink_details internally linked (diff) | |
| download | yuzu-b88430c29908a0f0b9cdbce139fac4f9c392eec6.tar.gz yuzu-b88430c29908a0f0b9cdbce139fac4f9c392eec6.tar.xz yuzu-b88430c29908a0f0b9cdbce139fac4f9c392eec6.zip | |
Merge pull request #1902 from lioncash/audio
audio_core: Make g_sink_details internally linked
Diffstat (limited to 'src/audio_core/audio_out.cpp')
| -rw-r--r-- | src/audio_core/audio_out.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/audio_core/audio_out.cpp b/src/audio_core/audio_out.cpp index 0c8f5b18e..cbba17632 100644 --- a/src/audio_core/audio_out.cpp +++ b/src/audio_core/audio_out.cpp | |||
| @@ -30,8 +30,7 @@ static Stream::Format ChannelsToStreamFormat(u32 num_channels) { | |||
| 30 | StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels, std::string&& name, | 30 | StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels, std::string&& name, |
| 31 | Stream::ReleaseCallback&& release_callback) { | 31 | Stream::ReleaseCallback&& release_callback) { |
| 32 | if (!sink) { | 32 | if (!sink) { |
| 33 | const SinkDetails& sink_details = GetSinkDetails(Settings::values.sink_id); | 33 | sink = CreateSinkFromID(Settings::values.sink_id, Settings::values.audio_device_id); |
| 34 | sink = sink_details.factory(Settings::values.audio_device_id); | ||
| 35 | } | 34 | } |
| 36 | 35 | ||
| 37 | return std::make_shared<Stream>( | 36 | return std::make_shared<Stream>( |