From b009bda67a7f83854619d963c26c4309ee855d7b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 16 Feb 2019 15:21:32 -0500 Subject: [PATCH] audio_core/buffer: Make const and non-const getter for samples consistent This way proper const/non-const selection can occur. --- src/audio_core/buffer.h | 2 +- src/audio_core/stream.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio_core/buffer.h b/src/audio_core/buffer.h index a323b23ec9..5ee09e9aa4 100644 --- a/src/audio_core/buffer.h +++ b/src/audio_core/buffer.h @@ -21,7 +21,7 @@ public: Buffer(Tag tag, std::vector&& samples) : tag{tag}, samples{std::move(samples)} {} /// Returns the raw audio data for the buffer - std::vector& Samples() { + std::vector& GetSamples() { return samples; } diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp index d89ff30b72..4b66a6786c 100644 --- a/src/audio_core/stream.cpp +++ b/src/audio_core/stream.cpp @@ -95,7 +95,7 @@ void Stream::PlayNextBuffer() { active_buffer = queued_buffers.front(); queued_buffers.pop(); - VolumeAdjustSamples(active_buffer->Samples()); + VolumeAdjustSamples(active_buffer->GetSamples()); sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples());