diff options
author | bunnei <bunneidev@gmail.com> | 2018-07-31 05:29:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-31 05:29:17 +0200 |
commit | bf9c62bc76a2296c1a81cfc1b83aaf4028578901 (patch) | |
tree | dad8906c597af3f579d4f72f4c9f493503c40665 /src/audio_core/audio_out.cpp | |
parent | Port #3758 from Citra (#852): Add missing std::string import in text_formatter (diff) | |
parent | audio_core: Implement Sink and SinkStream interfaces with cubeb. (diff) | |
download | yuzu-bf9c62bc76a2296c1a81cfc1b83aaf4028578901.tar yuzu-bf9c62bc76a2296c1a81cfc1b83aaf4028578901.tar.gz yuzu-bf9c62bc76a2296c1a81cfc1b83aaf4028578901.tar.bz2 yuzu-bf9c62bc76a2296c1a81cfc1b83aaf4028578901.tar.lz yuzu-bf9c62bc76a2296c1a81cfc1b83aaf4028578901.tar.xz yuzu-bf9c62bc76a2296c1a81cfc1b83aaf4028578901.tar.zst yuzu-bf9c62bc76a2296c1a81cfc1b83aaf4028578901.zip |
Diffstat (limited to 'src/audio_core/audio_out.cpp')
-rw-r--r-- | src/audio_core/audio_out.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/audio_core/audio_out.cpp b/src/audio_core/audio_out.cpp index 6d418a05b..77cedb6ba 100644 --- a/src/audio_core/audio_out.cpp +++ b/src/audio_core/audio_out.cpp @@ -3,13 +3,15 @@ // Refer to the license.txt file included. #include "audio_core/audio_out.h" +#include "audio_core/sink.h" +#include "audio_core/sink_details.h" #include "common/assert.h" #include "common/logging/log.h" namespace AudioCore { /// Returns the stream format from the specified number of channels -static Stream::Format ChannelsToStreamFormat(int num_channels) { +static Stream::Format ChannelsToStreamFormat(u32 num_channels) { switch (num_channels) { case 1: return Stream::Format::Mono16; @@ -24,11 +26,16 @@ static Stream::Format ChannelsToStreamFormat(int num_channels) { return {}; } -StreamPtr AudioOut::OpenStream(int sample_rate, int num_channels, +StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels, Stream::ReleaseCallback&& release_callback) { - streams.push_back(std::make_shared<Stream>(sample_rate, ChannelsToStreamFormat(num_channels), - std::move(release_callback))); - return streams.back(); + if (!sink) { + const SinkDetails& sink_details = GetSinkDetails("auto"); + sink = sink_details.factory(""); + } + + return std::make_shared<Stream>(sample_rate, ChannelsToStreamFormat(num_channels), + std::move(release_callback), + sink->AcquireSinkStream(sample_rate, num_channels)); } std::vector<u64> AudioOut::GetTagsAndReleaseBuffers(StreamPtr stream, size_t max_count) { |