From 8b50c660dfce50a07c2b2aa3c1b6b8642259a944 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 15 Jul 2020 18:30:06 -0400 Subject: core_timing: Make use of std::chrono with ScheduleEvent --- src/audio_core/stream.cpp | 14 ++++++-------- src/audio_core/stream.h | 6 ++---- 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'src/audio_core') diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp index aab3e979a..abd8576e2 100644 --- a/src/audio_core/stream.cpp +++ b/src/audio_core/stream.cpp @@ -59,11 +59,9 @@ Stream::State Stream::GetState() const { return state; } -s64 Stream::GetBufferReleaseNS(const Buffer& buffer) const { +std::chrono::nanoseconds Stream::GetBufferReleaseNS(const Buffer& buffer) const { const std::size_t num_samples{buffer.GetSamples().size() / GetNumChannels()}; - const auto ns = - std::chrono::nanoseconds((static_cast(num_samples) * 1000000000ULL) / sample_rate); - return ns.count(); + return std::chrono::nanoseconds((static_cast(num_samples) * 1000000000ULL) / sample_rate); } static void VolumeAdjustSamples(std::vector& samples, float game_volume) { @@ -105,10 +103,10 @@ void Stream::PlayNextBuffer(s64 cycles_late) { sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples()); - core_timing.ScheduleEvent( - GetBufferReleaseNS(*active_buffer) - - (Settings::values.enable_audio_stretching.GetValue() ? 0 : cycles_late), - release_event, {}); + const auto time_stretch_delta = std::chrono::nanoseconds{ + Settings::values.enable_audio_stretching.GetValue() ? 0 : cycles_late}; + const auto future_time = GetBufferReleaseNS(*active_buffer) - time_stretch_delta; + core_timing.ScheduleEvent(future_time, release_event, {}); } void Stream::ReleaseActiveBuffer(s64 cycles_late) { diff --git a/src/audio_core/stream.h b/src/audio_core/stream.h index 524376257..2febd647c 100644 --- a/src/audio_core/stream.h +++ b/src/audio_core/stream.h @@ -4,6 +4,7 @@ #pragma once +#include #include #include #include @@ -96,10 +97,7 @@ private: void ReleaseActiveBuffer(s64 cycles_late = 0); /// Gets the number of core cycles when the specified buffer will be released - s64 GetBufferReleaseNS(const Buffer& buffer) const; - - /// Gets the number of core cycles when the specified buffer will be released - s64 GetBufferReleaseNSHostTiming(const Buffer& buffer) const; + std::chrono::nanoseconds GetBufferReleaseNS(const Buffer& buffer) const; u32 sample_rate; ///< Sample rate of the stream Format format; ///< Format of the stream -- cgit v1.2.3