ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the throttle (Tab) key so that it takes effect when the frame-limiter is used. Hold down Tab to run the emulator unthrottled (Windows only). 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6598 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
skidau 2010-12-17 01:34:40 +00:00
parent 9afb1dab41
commit aecc4f67a1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/AudioCommon/Src/Mixer.cpp
View File

@ -127,9 +127,9 @@ void CMixer::PushSamples(short *samples, unsigned int num_samples)
break; break;
} }
// Shortcut key for Throttle Skipping // Shortcut key for Throttle Skipping
#ifdef _WIN32 #ifdef _WIN32
if (GetAsyncKeyState(VK_TAB)) break;; if (GetAsyncKeyState(VK_TAB)) break;;
#endif #endif
SLEEP(1); SLEEP(1);
soundStream->Update(); soundStream->Update();
} }

6
Source/Core/Core/Src/Core.cpp
View File

@ -599,10 +599,12 @@ void VideoThrottle()
u32 TargetVPS = (SConfig::GetInstance().m_Framelimit > 1) ? u32 TargetVPS = (SConfig::GetInstance().m_Framelimit > 1) ?
SConfig::GetInstance().m_Framelimit * 5 : VideoInterface::TargetRefreshRate; SConfig::GetInstance().m_Framelimit * 5 : VideoInterface::TargetRefreshRate;
// When frame limit is NOT off #ifdef _WIN32
// Disable the frame-limiter when the throttle (Tab) key is held down
if (!GetAsyncKeyState(VK_TAB))
#endif
if (SConfig::GetInstance().m_Framelimit) if (SConfig::GetInstance().m_Framelimit)
{ {
// Make the limiter a bit loose
u32 frametime = ((SConfig::GetInstance().b_UseFPS)? Common::AtomicLoad(DrawnFrame) : DrawnVideo) * 1000 / TargetVPS; u32 frametime = ((SConfig::GetInstance().b_UseFPS)? Common::AtomicLoad(DrawnFrame) : DrawnVideo) * 1000 / TargetVPS;
u32 timeDifference = (u32)Timer.GetTimeDifference(); u32 timeDifference = (u32)Timer.GetTimeDifference();