diff options
| author |  Lioncash | 2019-02-16 15:21:32 -0500 |
|---|---|---|
| committer | Lioncash | 2019-02-16 15:21:35 -0500 |
| commit | b009bda67a7f83854619d963c26c4309ee855d7b (patch) | |
| tree | 3e1c8c7dd8709944cae8d6aa3d30ec3577ada196 /src | |
| parent | Merge pull request #2123 from lioncash/coretiming-global (diff) | |
| download | yuzu-b009bda67a7f83854619d963c26c4309ee855d7b.tar.gz yuzu-b009bda67a7f83854619d963c26c4309ee855d7b.tar.xz yuzu-b009bda67a7f83854619d963c26c4309ee855d7b.zip | |
audio_core/buffer: Make const and non-const getter for samples consistent
This way proper const/non-const selection can occur.
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_core/buffer.h | 2 | ||||
| -rw-r--r-- | 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 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 | ||