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

Revert "Disable Vsync while holding tab to disable the frame limit." 

This reverts commit 341eb87806.

I'll do it right later.
This commit is contained in:
Rachel Bryk 2013-03-17 12:27:50 -04:00
parent 341eb87806
commit 0c86634101
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,8 +71,6 @@
#include "State.h" #include "State.h"
#include "Movie.h" #include "Movie.h"
#include "VideoConfig.h"
// TODO: ugly, remove // TODO: ugly, remove
bool g_aspect_wide; bool g_aspect_wide;
@ -605,25 +603,6 @@ void VideoThrottle()
u32 TargetVPS = (SConfig::GetInstance().m_Framelimit > 2) ? u32 TargetVPS = (SConfig::GetInstance().m_Framelimit > 2) ?
(SConfig::GetInstance().m_Framelimit - 1) * 5 : VideoInterface::TargetRefreshRate; (SConfig::GetInstance().m_Framelimit - 1) * 5 : VideoInterface::TargetRefreshRate;
static bool isUnthrottling = false;
static bool wasVSync = g_ActiveConfig.bVSync;
// Disable vsync while holding tab to disable the frame limit.
if (Host_GetKeyState('\t'))
{
if (!isUnthrottling)
wasVSync = g_ActiveConfig.bVSync;
if (g_ActiveConfig.bVSync)
g_Config.bVSync = false;
isUnthrottling = true;
}
else if (isUnthrottling)
{
isUnthrottling = false;
if (wasVSync)
g_Config.bVSync = true;
}
// Disable the frame-limiter when the throttle (Tab) key is held down. Audio throttle: m_Framelimit = 2 // Disable the frame-limiter when the throttle (Tab) key is held down. Audio throttle: m_Framelimit = 2
if (SConfig::GetInstance().m_Framelimit && SConfig::GetInstance().m_Framelimit != 2 && !Host_GetKeyState('\t')) if (SConfig::GetInstance().m_Framelimit && SConfig::GetInstance().m_Framelimit != 2 && !Host_GetKeyState('\t'))
{ {
@ -675,6 +654,7 @@ void Callback_VideoCopiedToXFB(bool video_update)
{ {
if(video_update) if(video_update)
Common::AtomicIncrement(DrawnFrame); Common::AtomicIncrement(DrawnFrame);
Movie::FrameUpdate();
} }
// Callback_ISOName: Let the DSP emulator get the game name // Callback_ISOName: Let the DSP emulator get the game name