diff options
| author | Tony Wasserka <neobrainx@gmail.com> | 2014-05-01 12:40:01 +0200 |
|---|---|---|
| committer | Tony Wasserka <neobrainx@gmail.com> | 2014-05-01 12:40:01 +0200 |
| commit | 557c3db4620f754ab3064599a9ed50f42579bb83 (patch) | |
| tree | 18f1caa849257894cd5489b5a088319fbfd0a19a /Source/Core/AudioCommon/Mixer.cpp | |
| parent | 95f097d79b37fef64752d40e3247da6f7f818932 (diff) | |
| parent | f254fdfd965c0d860e2e457de24fb4aa1b00a957 (diff) | |
Merge pull request #81 from degasus/skip_framelimit_hotkey
Add a hotkey for disabling the framelimit.
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 fa43baeb99..c1ff49dd03 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -7,7 +7,7 @@ #include "Common/Atomic.h" #include "Common/CPUDetect.h" #include "Core/ConfigManager.h" -#include "Core/Host.h" +#include "Core/Core.h" #include "Core/HW/AudioInterface.h" #include "Core/HW/VideoInterface.h" @@ -124,7 +124,7 @@ void CMixer::PushSamples(const short *samples, unsigned int num_samples) if (*PowerPC::GetStatePtr() != PowerPC::CPU_RUNNING || soundStream->IsMuted()) break; // Shortcut key for Throttle Skipping - if (Host_GetKeyState('\t')) + if (Core::GetIsFramelimiterTempDisabled()) break; SLEEP(1); soundStream->Update(); |