summaryrefslogtreecommitdiff
path: root/src/audio_core
diff options
context:
space:
mode:
Diffstat (limited to 'src/audio_core')
-rw-r--r--src/audio_core/stream.cpp7
-rw-r--r--src/audio_core/stream.h6
2 files changed, 11 insertions, 2 deletions
diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp
index ad6c587c2..5a30f55a7 100644
--- a/src/audio_core/stream.cpp
+++ b/src/audio_core/stream.cpp
@@ -107,9 +107,12 @@ void Stream::PlayNextBuffer(std::chrono::nanoseconds ns_late) {
107 active_buffer = queued_buffers.front(); 107 active_buffer = queued_buffers.front();
108 queued_buffers.pop(); 108 queued_buffers.pop();
109 109
110 VolumeAdjustSamples(active_buffer->GetSamples(), game_volume); 110 auto& samples = active_buffer->GetSamples();
111 111
112 sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples()); 112 VolumeAdjustSamples(samples, game_volume);
113
114 sink_stream.EnqueueSamples(GetNumChannels(), samples);
115 played_samples += samples.size();
113 116
114 const auto buffer_release_ns = GetBufferReleaseNS(*active_buffer); 117 const auto buffer_release_ns = GetBufferReleaseNS(*active_buffer);
115 118
diff --git a/src/audio_core/stream.h b/src/audio_core/stream.h
index 559844b9b..dbd97ec9c 100644
--- a/src/audio_core/stream.h
+++ b/src/audio_core/stream.h
@@ -89,6 +89,11 @@ public:
89 return sample_rate; 89 return sample_rate;
90 } 90 }
91 91
92 /// Gets the number of samples played so far
93 [[nodiscard]] u64 GetPlayedSampleCount() const {
94 return played_samples;
95 }
96
92 /// Gets the number of channels 97 /// Gets the number of channels
93 [[nodiscard]] u32 GetNumChannels() const; 98 [[nodiscard]] u32 GetNumChannels() const;
94 99
@@ -106,6 +111,7 @@ private:
106 [[nodiscard]] std::chrono::nanoseconds GetBufferReleaseNS(const Buffer& buffer) const; 111 [[nodiscard]] std::chrono::nanoseconds GetBufferReleaseNS(const Buffer& buffer) const;
107 112
108 u32 sample_rate; ///< Sample rate of the stream 113 u32 sample_rate; ///< Sample rate of the stream
114 u64 played_samples{}; ///< The current played sample count
109 Format format; ///< Format of the stream 115 Format format; ///< Format of the stream
110 float game_volume = 1.0f; ///< The volume the game currently has set 116 float game_volume = 1.0f; ///< The volume the game currently has set
111 ReleaseCallback release_callback; ///< Buffer release callback for the stream 117 ReleaseCallback release_callback; ///< Buffer release callback for the stream