diff options
| author | Mat M <mathew1800@gmail.com> | 2016-05-22 15:19:16 -0400 |
|---|---|---|
| committer | Mat M <mathew1800@gmail.com> | 2016-05-22 15:19:16 -0400 |
| commit | 08d45b9fea67714610cc6fdbe41e7bf1262816df (patch) | |
| tree | bd873fe49b79ecd9152523a98688749825f0b047 /Source/Core/AudioCommon/Mixer.cpp | |
| parent | ff4bc5f33d6bfaab38d651b0706c77d705cf6c5c (diff) | |
| parent | c1944f623b5918ab45152795dea9e49f57878138 (diff) | |
Merge pull request #3794 from EmptyChaos/frame-advance-race
Core: Add synchronization to state changes (Fix Frame Step and FIFO Player - Issue 8718)
Diffstat (limited to 'Source/Core/AudioCommon/Mixer.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index f35a671094..5e3aef733a 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -12,9 +12,6 @@ #include "Common/Logging/Log.h" #include "Core/ConfigManager.h" -// UGLINESS -#include "Core/PowerPC/PowerPC.h" - #if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__) #include <tmmintrin.h> #endif @@ -121,12 +118,6 @@ unsigned int CMixer::Mix(short* samples, unsigned int num_samples, bool consider memset(samples, 0, num_samples * 2 * sizeof(short)); - if (PowerPC::GetState() != PowerPC::CPU_RUNNING) - { - // Silence - return num_samples; - } - m_dma_mixer.Mix(samples, num_samples, consider_framelimit); m_streaming_mixer.Mix(samples, num_samples, consider_framelimit); m_wiimote_speaker_mixer.Mix(samples, num_samples, consider_framelimit); |