Browse Source
Merge pull request #2134 from lioncash/naming
audio_core/buffer: Make const and non-const getter for samples consistent
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
src/audio_core/buffer.h
-
src/audio_core/stream.cpp
|
|
@ -21,7 +21,7 @@ public: |
|
|
Buffer(Tag tag, std::vector<s16>&& samples) : tag{tag}, samples{std::move(samples)} {} |
|
|
Buffer(Tag tag, std::vector<s16>&& samples) : tag{tag}, samples{std::move(samples)} {} |
|
|
|
|
|
|
|
|
/// Returns the raw audio data for the buffer |
|
|
/// Returns the raw audio data for the buffer |
|
|
std::vector<s16>& Samples() { |
|
|
|
|
|
|
|
|
std::vector<s16>& GetSamples() { |
|
|
return samples; |
|
|
return samples; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -95,7 +95,7 @@ void Stream::PlayNextBuffer() { |
|
|
active_buffer = queued_buffers.front(); |
|
|
active_buffer = queued_buffers.front(); |
|
|
queued_buffers.pop(); |
|
|
queued_buffers.pop(); |
|
|
|
|
|
|
|
|
VolumeAdjustSamples(active_buffer->Samples()); |
|
|
|
|
|
|
|
|
VolumeAdjustSamples(active_buffer->GetSamples()); |
|
|
|
|
|
|
|
|
sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples()); |
|
|
sink_stream.EnqueueSamples(GetNumChannels(), active_buffer->GetSamples()); |
|
|
|
|
|
|
|
|
|