From 0917db7fc09390b03f2ad4e0acae245f196e31d9 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 5 Dec 2015 14:33:33 -0500 Subject: NullSound: Use std::array for the buffer --- Source/Core/AudioCommon/NullSoundStream.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Source/Core/AudioCommon/NullSoundStream.cpp') diff --git a/Source/Core/AudioCommon/NullSoundStream.cpp b/Source/Core/AudioCommon/NullSoundStream.cpp index 4a02dcec2c..049ce2b269 100644 --- a/Source/Core/AudioCommon/NullSoundStream.cpp +++ b/Source/Core/AudioCommon/NullSoundStream.cpp @@ -2,9 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include - #include "AudioCommon/NullSoundStream.h" +#include "Common/CommonTypes.h" #include "Core/HW/AudioInterface.h" #include "Core/HW/SystemTimers.h" @@ -24,13 +23,13 @@ void NullSound::SetVolume(int volume) void NullSound::Update() { // num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD. - const u32 stereo_16_bit_size = 4; - const u32 dma_length = 32; + 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(realtimeBuffer, (unsigned int)num_samples_to_render); + m_mixer->Mix(m_realtime_buffer.data(), (unsigned int)num_samples_to_render); } void NullSound::Clear(bool mute) -- cgit v1.2.3