diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-10-24 11:44:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 11:44:22 +0200 |
| commit | 5393575c552c733be0df89fddf2493ab7437b389 (patch) | |
| tree | 2bc792b043ef322add3cb5a044b98053d87799d3 /Source/Core/AudioCommon/NullSoundStream.cpp | |
| parent | 5fdb19f3db2b2a20c807b346102719ca8ecf9a0d (diff) | |
| parent | 6abd1c8c9941eac9d1c118a4a04baeec841b9c5f (diff) | |
Merge pull request #6130 from ligfx/emptynullsoundstream
NullSoundStream: don't call Mixer->Mix
Diffstat (limited to 'Source/Core/AudioCommon/NullSoundStream.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/NullSoundStream.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/Source/Core/AudioCommon/NullSoundStream.cpp b/Source/Core/AudioCommon/NullSoundStream.cpp index 98f8871a80..ce1cfc6a59 100644 --- a/Source/Core/AudioCommon/NullSoundStream.cpp +++ b/Source/Core/AudioCommon/NullSoundStream.cpp @@ -3,9 +3,6 @@ // Refer to the license.txt file included. #include "AudioCommon/NullSoundStream.h" -#include "Common/CommonTypes.h" -#include "Core/HW/AudioInterface.h" -#include "Core/HW/SystemTimers.h" void NullSound::SoundLoop() { @@ -22,17 +19,6 @@ void NullSound::SetVolume(int volume) void NullSound::Update() { - // num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD. - constexpr u32 stereo_16_bit_size = 4; - constexpr u32 dma_length = 32; - const u64 audio_dma_period = - SystemTimers::GetTicksPerSecond() / - (AudioInterface::GetAIDSampleRate() * stereo_16_bit_size / dma_length); - const u64 ais_samples_per_second = 48000 * stereo_16_bit_size; - const u64 num_samples_to_render = - (audio_dma_period * ais_samples_per_second) / SystemTimers::GetTicksPerSecond(); - - m_mixer->Mix(m_realtime_buffer.data(), (unsigned int)num_samples_to_render); } void NullSound::Stop() |