From 531a3ed09a85f646aff5dfb5754f0a2147842518 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 14 Jan 2016 00:58:01 -0500 Subject: Mixer: Devirtualize Nothing in the codebase inherits from this class --- Source/Core/AudioCommon/Mixer.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/Core/AudioCommon/Mixer.cpp') diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 5d1207bbe3..eff1dbe584 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -31,6 +31,10 @@ CMixer::CMixer(unsigned int BackendSampleRate) INFO_LOG(AUDIO_INTERFACE, "Mixer is initialized"); } +CMixer::~CMixer() +{ +} + // Executed from sound stream thread unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, bool consider_framelimit) { -- cgit v1.2.3 From fc6a2f490ffe9bfcf68d56549b4887e6ff5aa515 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 14 Jan 2016 01:19:25 -0500 Subject: Mixer: Directly initialize class members --- Source/Core/AudioCommon/Mixer.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'Source/Core/AudioCommon/Mixer.cpp') diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index eff1dbe584..505a3b2551 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -6,11 +6,11 @@ #include "AudioCommon/AudioCommon.h" #include "AudioCommon/Mixer.h" -#include "Common/CPUDetect.h" +#include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" +#include "Common/Logging/Log.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/HW/AudioInterface.h" // UGLINESS #include "Core/PowerPC/PowerPC.h" @@ -20,13 +20,7 @@ #endif CMixer::CMixer(unsigned int BackendSampleRate) - : m_dma_mixer(this, 32000) - , m_streaming_mixer(this, 48000) - , m_wiimote_speaker_mixer(this, 3000) - , m_sampleRate(BackendSampleRate) - , m_log_dtk_audio(false) - , m_log_dsp_audio(false) - , m_speed(0) + : m_sampleRate(BackendSampleRate) { INFO_LOG(AUDIO_INTERFACE, "Mixer is initialized"); } -- cgit v1.2.3 From c70487163f3e67633170e10a513d936e4f033f71 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 14 Jan 2016 03:00:47 -0500 Subject: Mixer: Convert defines into concrete variables Gets defines out of global scope. --- Source/Core/AudioCommon/Mixer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/AudioCommon/Mixer.cpp') diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 505a3b2551..f35a671094 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -44,7 +44,7 @@ unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, boo u32 indexR = m_indexR.load(); u32 indexW = m_indexW.load(); - int low_waterwark = m_input_sample_rate * SConfig::GetInstance().iTimingVariance / 1000; + u32 low_waterwark = m_input_sample_rate * SConfig::GetInstance().iTimingVariance / 1000; low_waterwark = std::min(low_waterwark, MAX_SAMPLES / 2); float numLeft = (float)(((indexW - indexR) & INDEX_MASK) / 2); -- cgit v1.2.3