diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-03 00:27:22 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-08-04 20:34:12 +0200 |
commit | 9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7 (patch) | |
tree | 92d92a14528997d5b1cd2baab50a1045f702b9dc /src/audio_core/stream.cpp | |
parent | Merge pull request #849 from DarkLordZach/xci (diff) | |
download | yuzu-9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7.tar yuzu-9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7.tar.gz yuzu-9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7.tar.bz2 yuzu-9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7.tar.lz yuzu-9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7.tar.xz yuzu-9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7.tar.zst yuzu-9f846d3aa42d7ad269d3d5d0cd1ad68c43b37bb7.zip |
Diffstat (limited to '')
-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 a0045b7a1..7ab87c0c9 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(); |