summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-02-16 21:21:32 +0100
committerLioncash <mathew1800@gmail.com>2019-02-16 21:21:35 +0100
commitb009bda67a7f83854619d963c26c4309ee855d7b (patch)
tree3e1c8c7dd8709944cae8d6aa3d30ec3577ada196
parentMerge pull request #2123 from lioncash/coretiming-global (diff)
downloadyuzu-b009bda67a7f83854619d963c26c4309ee855d7b.tar
yuzu-b009bda67a7f83854619d963c26c4309ee855d7b.tar.gz
yuzu-b009bda67a7f83854619d963c26c4309ee855d7b.tar.bz2
yuzu-b009bda67a7f83854619d963c26c4309ee855d7b.tar.lz
yuzu-b009bda67a7f83854619d963c26c4309ee855d7b.tar.xz
yuzu-b009bda67a7f83854619d963c26c4309ee855d7b.tar.zst
yuzu-b009bda67a7f83854619d963c26c4309ee855d7b.zip
-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:
Buffer(Tag tag, std::vector<s16>&& samples) : tag{tag}, samples{std::move(samples)} {}
/// Returns the raw audio data for the buffer
- std::vector<s16>& Samples() {
+ std::vector<s16>& GetSamples() {
return samples;
}
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() {
active_buffer = queued_buffers.front();
queued_buffers.pop();
- VolumeAdjustSamples(active_buffer->Samples());
+ VolumeAdjustSamples(active_buffer->GetSamples());
sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples());