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

sound throttle now respects forced throttle off (user hits fastfoward button, etc)

This commit is contained in:
goyuken 2012-10-10 17:19:51 +00:00
parent a5e2c55a68
commit 927fb7070c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.MultiClient/Global.cs
View File

@ -137,9 +137,9 @@ namespace BizHawk.MultiClient
};
/// <summary>
/// whether vsync is force-disabled by use of fast forward
/// whether throttling is force-disabled by use of fast forward
/// </summary>
public static bool ForceNoVsync;
public static bool ForceNoThrottle;
//the movie will be spliced inbetween these if it is present
public static CopyControllerAdapter MovieInputSourceAdapter = new CopyControllerAdapter();

2
BizHawk.MultiClient/MainForm.cs
View File

@ -430,7 +430,7 @@ namespace BizHawk.MultiClient
void SyncThrottle()
{
bool fastforward = Global.ClientControls["Fast Forward"] || FastForward || Global.ClientControls["MaxTurbo"];
Global.ForceNoVsync = unthrottled || fastforward;
Global.ForceNoThrottle = unthrottled || fastforward;
// realtime throttle is never going to be so exact that using a double here is wrong
throttle.SetCoreFps(Global.Emulator.CoreOutputComm.VsyncRate);

2
BizHawk.MultiClient/RenderPanel.cs
View File

@ -374,7 +374,7 @@ namespace BizHawk.MultiClient
{
get
{
if (Global.ForceNoVsync) return false;
if (Global.ForceNoThrottle) return false;
return Global.Config.DisplayVSync;
}
}

2
BizHawk.MultiClient/Sound.cs
View File

@ -132,7 +132,7 @@ namespace BizHawk.MultiClient
int samplesNeeded = SNDDXGetAudioSpace() * 2;
short[] samples;
if (Global.Config.SoundThrottle)
if (Global.Config.SoundThrottle && !Global.ForceNoThrottle)
{
if (DSoundBuffer == null) return; // can cause SNDDXGetAudioSpace() = 0
int samplesWanted = 2 * (int) (0.8 + 44100.0 / Global.Emulator.CoreOutputComm.VsyncRate);