summaryrefslogtreecommitdiff
path: root/src/audio_core/stream.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/stream.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/stream.cpp')
-rw-r--r--src/audio_core/stream.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp
index a0045b7a1..7ab87c0c9 100644
--- a/src/audio_core/stream.cpp
+++ b/src/audio_core/stream.cpp
@@ -37,12 +37,12 @@ u32 Stream::GetSampleSize() const {
37} 37}
38 38
39Stream::Stream(u32 sample_rate, Format format, ReleaseCallback&& release_callback, 39Stream::Stream(u32 sample_rate, Format format, ReleaseCallback&& release_callback,
40 SinkStream& sink_stream) 40 SinkStream& sink_stream, std::string&& name_)
41 : sample_rate{sample_rate}, format{format}, release_callback{std::move(release_callback)}, 41 : sample_rate{sample_rate}, format{format}, release_callback{std::move(release_callback)},
42 sink_stream{sink_stream} { 42 sink_stream{sink_stream}, name{std::move(name_)} {
43 43
44 release_event = CoreTiming::RegisterEvent( 44 release_event = CoreTiming::RegisterEvent(
45 "Stream::Release", [this](u64 userdata, int cycles_late) { ReleaseActiveBuffer(); }); 45 name, [this](u64 userdata, int cycles_late) { ReleaseActiveBuffer(); });
46} 46}
47 47
48void Stream::Play() { 48void Stream::Play() {
@@ -104,6 +104,7 @@ void Stream::PlayNextBuffer() {
104} 104}
105 105
106void Stream::ReleaseActiveBuffer() { 106void Stream::ReleaseActiveBuffer() {
107 ASSERT(active_buffer);
107 released_buffers.push(std::move(active_buffer)); 108 released_buffers.push(std::move(active_buffer));
108 release_callback(); 109 release_callback();
109 PlayNextBuffer(); 110 PlayNextBuffer();