summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/NullSoundStream.cpp
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2015-12-15 17:38:37 +0100
committerMarkus Wick <degasus@users.noreply.github.com>2015-12-15 17:38:37 +0100
commit164e045123d07cdb3731fddca94eb1ffc568258c (patch)
treedc40d1a85150b5a05a4ba45f0946ef8f603b0894 /Source/Core/AudioCommon/NullSoundStream.cpp
parent2b60eb0e2259838a45456ccd8c41f045a6a575e9 (diff)
parent0917db7fc09390b03f2ad4e0acae245f196e31d9 (diff)
Merge pull request #3317 from lioncash/null
NullSound: Minor changes
Diffstat (limited to 'Source/Core/AudioCommon/NullSoundStream.cpp')
-rw-r--r--Source/Core/AudioCommon/NullSoundStream.cpp9
1 files changed, 4 insertions, 5 deletions
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 <cstring>
-
#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)