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

combine throttle OSD messages into a unified representation

This commit is contained in:
zeromus 2015-08-17 23:49:24 -05:00
parent 2255425fb9
commit 2adb3deac7
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -975,7 +975,7 @@ namespace BizHawk.Client.EmuHawk
}
}
LimitFrameRateMessage();
ThrottleMessage();
}
private void AudioThrottleMenuItem_Click(object sender, EventArgs e)
@ -992,6 +992,8 @@ namespace BizHawk.Client.EmuHawk
PresentationPanel.Resized = true;
}
}
ThrottleMessage();
}
private void VsyncThrottleMenuItem_Click(object sender, EventArgs e)
@ -1009,7 +1011,13 @@ namespace BizHawk.Client.EmuHawk
}
}
VsyncMessage();
if (!Global.Config.VSync)
{
Global.Config.VSync = true;
VsyncMessage();
}
ThrottleMessage();
}
private void VsyncEnabledMenuItem_Click(object sender, EventArgs e)
@ -1019,6 +1027,8 @@ namespace BizHawk.Client.EmuHawk
{
PresentationPanel.Resized = true;
}
VsyncMessage();
}
private void MinimizeSkippingMenuItem_Click(object sender, EventArgs e)

2
BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk
break;
case "Toggle Throttle":
_unthrottled ^= true;
GlobalWin.OSD.AddMessage("Unthrottled: " + _unthrottled);
ThrottleMessage();
break;
case "Soft Reset":
SoftReset();

12
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -1079,6 +1079,18 @@ namespace BizHawk.Client.EmuHawk
}
}
void ThrottleMessage()
{
string ttype = ":(none)";
if(Global.Config.SoundThrottle) { ttype = ":Sound"; }
if(Global.Config.VSyncThrottle) { ttype = String.Format(":Vsync{0}",Global.Config.VSync?"[ena]":"[dis]"); }
if(Global.Config.ClockThrottle) { ttype = ":Clock"; }
string xtype = _unthrottled ? "Unthrottled" : "Throttled";
string msg = string.Format("{0}{1} ",xtype,ttype);
GlobalWin.OSD.AddMessage(msg);
}
public void FrameSkipMessage()
{
GlobalWin.OSD.AddMessage("Frameskipping set to " + Global.Config.FrameSkip);