diff options
| author | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-07-06 19:28:10 +0200 |
|---|---|---|
| committer | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-07-06 19:28:10 +0200 |
| commit | 4ec8c3714d1d78b50d8f9a1d42cd322fcd460f71 (patch) | |
| tree | 093c49a0152375f5438e2547f3de4606082d6039 /Source/Core/AudioCommon/Mixer.cpp | |
| parent | db4e32a12448f6f536e5791a011c458defcb9057 (diff) | |
| parent | ad2aaedd8b32f1d7f869ac530268bd59c9da87c6 (diff) | |
Merge pull request #328 from Tilka/enum_cpubackend
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 388eb56b0d..6b11d31722 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::CPU_RUNNING) + if (PowerPC::GetState() != PowerPC::STATE_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::CPU_RUNNING || soundStream->IsMuted()) + if (*PowerPC::GetStatePtr() != PowerPC::STATE_RUNNING || soundStream->IsMuted()) break; // Shortcut key for Throttle Skipping if (Core::GetIsFramelimiterTempDisabled()) |