summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2019-02-17 11:26:33 -0500
committerGravatar GitHub2019-02-17 11:26:33 -0500
commit2bb02a0b7896320e6fb7cef6792fa8faeb095091 (patch)
tree23a99542a3d1d0be7982b3dff9c355c3a8fc9cbb /src
parentMerge pull request #2133 from lioncash/arbiter (diff)
parentaudio_core/buffer: Make const and non-const getter for samples consistent (diff)
downloadyuzu-2bb02a0b7896320e6fb7cef6792fa8faeb095091.tar.gz
yuzu-2bb02a0b7896320e6fb7cef6792fa8faeb095091.tar.xz
yuzu-2bb02a0b7896320e6fb7cef6792fa8faeb095091.zip
Merge pull request #2134 from lioncash/naming
audio_core/buffer: Make const and non-const getter for samples consistent
Diffstat (limited to 'src')
-rw-r--r--src/audio_core/buffer.h2
-rw-r--r--src/audio_core/stream.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/audio_core/buffer.h b/src/audio_core/buffer.h
index a323b23ec..5ee09e9aa 100644
--- a/src/audio_core/buffer.h
+++ b/src/audio_core/buffer.h
@@ -21,7 +21,7 @@ public:
21 Buffer(Tag tag, std::vector<s16>&& samples) : tag{tag}, samples{std::move(samples)} {} 21 Buffer(Tag tag, std::vector<s16>&& samples) : tag{tag}, samples{std::move(samples)} {}
22 22
23 /// Returns the raw audio data for the buffer 23 /// Returns the raw audio data for the buffer
24 std::vector<s16>& Samples() { 24 std::vector<s16>& GetSamples() {
25 return samples; 25 return samples;
26 } 26 }
27 27
diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp
index d89ff30b7..4b66a6786 100644
--- a/src/audio_core/stream.cpp
+++ b/src/audio_core/stream.cpp
@@ -95,7 +95,7 @@ void Stream::PlayNextBuffer() {
95 active_buffer = queued_buffers.front(); 95 active_buffer = queued_buffers.front();
96 queued_buffers.pop(); 96 queued_buffers.pop();
97 97
98 VolumeAdjustSamples(active_buffer->Samples()); 98 VolumeAdjustSamples(active_buffer->GetSamples());
99 99
100 sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples()); 100 sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples());
101 101