summaryrefslogtreecommitdiff
path: root/src/audio_core/audio_out.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-02 18:27:22 -0400
committerGravatar bunnei2018-08-04 14:34:12 -0400
commit9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7 (patch)
tree92d92a14528997d5b1cd2baab50a1045f702b9dc /src/audio_core/audio_out.cpp
parentMerge pull request #849 from DarkLordZach/xci (diff)
downloadyuzu-9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7.tar.gz
yuzu-9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7.tar.xz
yuzu-9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7.zip
audio_core: Streams need unique names for CoreTiming.
Diffstat (limited to 'src/audio_core/audio_out.cpp')
-rw-r--r--src/audio_core/audio_out.cpp8
1 files changed, 4 insertions, 4 deletions
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) {
27 return {}; 27 return {};
28} 28}
29 29
30StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels, 30StreamPtr 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 const SinkDetails& sink_details = GetSinkDetails(Settings::values.sink_id);
34 sink = sink_details.factory(Settings::values.audio_device_id); 34 sink = sink_details.factory(Settings::values.audio_device_id);
35 } 35 }
36 36
37 return std::make_shared<Stream>(sample_rate, ChannelsToStreamFormat(num_channels), 37 return std::make_shared<Stream>(
38 std::move(release_callback), 38 sample_rate, ChannelsToStreamFormat(num_channels), std::move(release_callback),
39 sink->AcquireSinkStream(sample_rate, num_channels)); 39 sink->AcquireSinkStream(sample_rate, num_channels), std::move(name));
40} 40}
41 41
42std::vector<Buffer::Tag> AudioOut::GetTagsAndReleaseBuffers(StreamPtr stream, size_t max_count) { 42std::vector<Buffer::Tag> AudioOut::GetTagsAndReleaseBuffers(StreamPtr stream, size_t max_count) {