diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-02 18:27:22 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-08-04 14:34:12 -0400 |
| commit | 9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7 (patch) | |
| tree | 92d92a14528997d5b1cd2baab50a1045f702b9dc /src/audio_core/stream.cpp | |
| parent | 2b06301dbfbfe79687219bf7783a6d1b47695401 (diff) | |
audio_core: Streams need unique names for CoreTiming.
Diffstat (limited to 'src/audio_core/stream.cpp')
| -rw-r--r-- | src/audio_core/stream.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp index a0045b7a12..7ab87c0c9d 100644 --- a/src/audio_core/stream.cpp +++ b/src/audio_core/stream.cpp @@ -37,12 +37,12 @@ u32 Stream::GetSampleSize() const { } Stream::Stream(u32 sample_rate, Format format, ReleaseCallback&& release_callback, - SinkStream& sink_stream) + SinkStream& sink_stream, std::string&& name_) : sample_rate{sample_rate}, format{format}, release_callback{std::move(release_callback)}, - sink_stream{sink_stream} { + sink_stream{sink_stream}, name{std::move(name_)} { release_event = CoreTiming::RegisterEvent( - "Stream::Release", [this](u64 userdata, int cycles_late) { ReleaseActiveBuffer(); }); + name, [this](u64 userdata, int cycles_late) { ReleaseActiveBuffer(); }); } void Stream::Play() { @@ -104,6 +104,7 @@ void Stream::PlayNextBuffer() { } void Stream::ReleaseActiveBuffer() { + ASSERT(active_buffer); released_buffers.push(std::move(active_buffer)); release_callback(); PlayNextBuffer(); |