diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2017-04-10 16:58:55 +0100 |
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2017-04-12 13:15:00 +0100 |
| commit | 5b81f2a31d044da2cac5ca04a7d9c5dce186ad07 (patch) | |
| tree | 05a14b5ed6ae3a6e38e24a24c672ca493e1e3317 /Source/Core/AudioCommon/Mixer.cpp | |
| parent | 8ff26a6edab1a57d7d1e10564f7ceaafcae3f7d0 (diff) | |
Mixer: Return actual number of samples mixed into buffer from MixerFifo::Mix
No code in the codebase currently depends on the return value of this function.
Diffstat (limited to 'Source/Core/AudioCommon/Mixer.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index bdaaad812c..bdfbbfe5a0 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -88,6 +88,9 @@ unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, m_frac &= 0xffff; } + // Actual number of samples written to the buffer without padding. + unsigned int actual_sample_count = currentSample / 2; + // Padding short s[2]; s[0] = Common::swap16(m_buffer[(indexR - 1) & INDEX_MASK]); @@ -106,7 +109,7 @@ unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, // Flush cached variable m_indexR.store(indexR); - return numSamples; + return actual_sample_count; } unsigned int CMixer::Mix(short* samples, unsigned int num_samples, bool consider_framelimit) |