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

1.5x and trunk - fix scrub input hotkey, on trunk a slight refactoring now that more things are in client.common

This commit is contained in:
adelikat 2013-11-03 16:53:05 +00:00
parent 3843acb2d9
commit ed5cfe39a6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -112,7 +112,7 @@ namespace BizHawk.Client.Common
} }
} }
public void HandleMovieOnFrameLoop(bool clearFramePressed) public void HandleMovieOnFrameLoop()
{ {
if (!Movie.IsActive) if (!Movie.IsActive)
{ {
@ -151,7 +151,7 @@ namespace BizHawk.Client.Common
{ {
Movie.CaptureState(); Movie.CaptureState();
LatchInputFromLog(); LatchInputFromLog();
if (clearFramePressed) if (Global.ClientControls["Scrub Input"])
{ {
LatchInputFromPlayer(Global.MovieInputSourceAdapter); LatchInputFromPlayer(Global.MovieInputSourceAdapter);
ClearFrame(); ClearFrame();

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

@ -2646,7 +2646,7 @@ namespace BizHawk.Client.EmuHawk
else if (!Global.Config.MuteFrameAdvance) else if (!Global.Config.MuteFrameAdvance)
genSound = true; genSound = true;
Global.MovieSession.HandleMovieOnFrameLoop(Global.ClientControls["ClearFrame"]); Global.MovieSession.HandleMovieOnFrameLoop();
coreskipaudio = Global.ClientControls["Turbo"] && CurrAviWriter == null; coreskipaudio = Global.ClientControls["Turbo"] && CurrAviWriter == null;
//======================================= //=======================================