diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-07 05:32:44 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-07 05:32:44 +0200 |
| commit | 59c938d3a7e21a17d778f346fc9a5ad39159ce6e (patch) | |
| tree | b68b786ff97715ba4c4cea863ce684f1d6e35d0c /Source/Core/AudioCommon/Mixer.cpp | |
| parent | 038111b2628a36ba12e5f1099559e5b3ceeafc99 (diff) | |
| parent | b0b70381f711f0acf5001f8d2cef8458b6473344 (diff) | |
Merge pull request #574 from dolphin-emu/revert-328-enum_cpubackend
Revert "Don't add segfault handler in interpreter mode"
Diffstat (limited to 'Source/Core/AudioCommon/Mixer.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 6b11d31722..388eb56b0d 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -113,7 +113,7 @@ unsigned int CMixer::Mix(short* samples, unsigned int num_samples, bool consider memset(samples, 0, num_samples * 2 * sizeof(short)); - if (PowerPC::GetState() != PowerPC::STATE_RUNNING) + if (PowerPC::GetState() != PowerPC::CPU_RUNNING) { // Silence return num_samples; @@ -138,7 +138,7 @@ void CMixer::MixerFifo::PushSamples(const short *samples, unsigned int num_sampl // The auto throttle function. This loop will put a ceiling on the CPU MHz. while (num_samples * 2 + ((indexW - Common::AtomicLoad(m_indexR)) & INDEX_MASK) >= MAX_SAMPLES * 2) { - if (*PowerPC::GetStatePtr() != PowerPC::STATE_RUNNING || soundStream->IsMuted()) + if (*PowerPC::GetStatePtr() != PowerPC::CPU_RUNNING || soundStream->IsMuted()) break; // Shortcut key for Throttle Skipping if (Core::GetIsFramelimiterTempDisabled()) |