From 9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 2 Aug 2018 18:27:22 -0400 Subject: audio_core: Streams need unique names for CoreTiming. --- src/audio_core/audio_out.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/audio_core/audio_out.cpp') diff --git a/src/audio_core/audio_out.cpp b/src/audio_core/audio_out.cpp index 3dfdf61f9..5cf665c22 100644 --- a/src/audio_core/audio_out.cpp +++ b/src/audio_core/audio_out.cpp @@ -27,16 +27,16 @@ static Stream::Format ChannelsToStreamFormat(u32 num_channels) { return {}; } -StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels, +StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels, std::string&& name, Stream::ReleaseCallback&& release_callback) { if (!sink) { const SinkDetails& sink_details = GetSinkDetails(Settings::values.sink_id); sink = sink_details.factory(Settings::values.audio_device_id); } - return std::make_shared(sample_rate, ChannelsToStreamFormat(num_channels), - std::move(release_callback), - sink->AcquireSinkStream(sample_rate, num_channels)); + return std::make_shared( + sample_rate, ChannelsToStreamFormat(num_channels), std::move(release_callback), + sink->AcquireSinkStream(sample_rate, num_channels), std::move(name)); } std::vector AudioOut::GetTagsAndReleaseBuffers(StreamPtr stream, size_t max_count) { -- cgit v1.2.3 From 34b3f8349814c8c3a7ca5f1f6bd36a98dd32a207 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 2 Aug 2018 18:54:25 -0400 Subject: audio_core: Sinks need unique names as well. --- src/audio_core/audio_out.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/audio_core/audio_out.cpp') diff --git a/src/audio_core/audio_out.cpp b/src/audio_core/audio_out.cpp index 5cf665c22..eb9db755a 100644 --- a/src/audio_core/audio_out.cpp +++ b/src/audio_core/audio_out.cpp @@ -36,7 +36,7 @@ StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels, std::string&& return std::make_shared( sample_rate, ChannelsToStreamFormat(num_channels), std::move(release_callback), - sink->AcquireSinkStream(sample_rate, num_channels), std::move(name)); + sink->AcquireSinkStream(sample_rate, num_channels, name), std::move(name)); } std::vector AudioOut::GetTagsAndReleaseBuffers(StreamPtr stream, size_t max_count) { -- cgit v1.2.3 From 1dee8ceda1e5ecd5ebaee464b1450f323e82305f Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 4 Aug 2018 00:03:12 -0400 Subject: audio_core: Use s16 where possible for audio samples. --- src/audio_core/audio_out.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/audio_core/audio_out.cpp') diff --git a/src/audio_core/audio_out.cpp b/src/audio_core/audio_out.cpp index eb9db755a..12632a95c 100644 --- a/src/audio_core/audio_out.cpp +++ b/src/audio_core/audio_out.cpp @@ -51,7 +51,7 @@ void AudioOut::StopStream(StreamPtr stream) { stream->Stop(); } -bool AudioOut::QueueBuffer(StreamPtr stream, Buffer::Tag tag, std::vector&& data) { +bool AudioOut::QueueBuffer(StreamPtr stream, Buffer::Tag tag, std::vector&& data) { return stream->QueueBuffer(std::make_shared(tag, std::move(data))); } -- cgit v1.2.3