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

When rewinding show << and <<<< symbols (not sure when those ever got removed). Tastudio - disable rewind on load, and restore it (if it was on) when closed

This commit is contained in:
adelikat 2014-07-11 17:14:45 +00:00
parent ac931f27f2
commit 7e768eacb1
3 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2501,6 +2501,7 @@ namespace BizHawk.Client.EmuHawk
runFrame = true; runFrame = true;
} }
bool isRewinding = false;
if (Global.Rewinder.RewindActive && (Global.ClientControls["Rewind"] || PressRewind) if (Global.Rewinder.RewindActive && (Global.ClientControls["Rewind"] || PressRewind)
&& !Global.MovieSession.Movie.IsRecording) // Rewind isn't "bulletproof" and can desync a recoridng movie! && !Global.MovieSession.Movie.IsRecording) // Rewind isn't "bulletproof" and can desync a recoridng movie!
{ {
@ -2508,6 +2509,7 @@ namespace BizHawk.Client.EmuHawk
suppressCaptureRewind = true; suppressCaptureRewind = true;
runFrame = Global.Rewinder.Count != 0; runFrame = Global.Rewinder.Count != 0;
isRewinding = true;
} }
if (UpdateFrame) if (UpdateFrame)
@ -2556,7 +2558,18 @@ namespace BizHawk.Client.EmuHawk
if (updateFpsString) if (updateFpsString)
{ {
var fps_string = _runloopLastFps + " fps"; var fps_string = _runloopLastFps + " fps";
if (isTurboing) if (isRewinding)
{
if (isTurboing || isFastForwarding)
{
fps_string += " <<<<";
}
else
{
fps_string += " <<";
}
}
else if (isTurboing)
{ {
fps_string += " >>>>"; fps_string += " >>>>";
} }
@ -3258,6 +3271,20 @@ namespace BizHawk.Client.EmuHawk
MovieImport.ProcessMovieImport(fn, ShowConversionError, GlobalWin.OSD.AddMessage); MovieImport.ProcessMovieImport(fn, ShowConversionError, GlobalWin.OSD.AddMessage);
} }
public void EnableRewind(bool enabled)
{
if (enabled)
{
Global.Rewinder.RewindActive = true;
GlobalWin.OSD.AddMessage("Rewind enabled");
}
else
{
Global.Rewinder.RewindActive = false;
GlobalWin.OSD.AddMessage("Rewind suspended");
}
}
#endregion #endregion
private void GBcoreSettingsToolStripMenuItem_Click(object sender, EventArgs e) private void GBcoreSettingsToolStripMenuItem_Click(object sender, EventArgs e)

13
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
View File

@ -49,18 +49,9 @@ namespace BizHawk.Client.EmuHawk
"enablerewind", "enablerewind",
"Sets whether or not the rewind feature is enabled" "Sets whether or not the rewind feature is enabled"
)] )]
public static void EnableRewind(bool enabled) public void EnableRewind(bool enabled)
{ {
if (enabled) GlobalWin.MainForm.EnableRewind(enabled);
{
Global.Rewinder.RewindActive = true;
GlobalWin.OSD.AddMessage("Rewind enabled");
}
else
{
Global.Rewinder.RewindActive = false;
GlobalWin.OSD.AddMessage("Rewind suspended");
}
} }
[LuaMethodAttributes( [LuaMethodAttributes(

4
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -21,6 +21,7 @@ namespace BizHawk.Client.EmuHawk
private int _defaultWidth; private int _defaultWidth;
private int _defaultHeight; private int _defaultHeight;
private TasMovie _tas; private TasMovie _tas;
private bool _originalRewindStatus; // The client rewind status before TAStudio was engaged (used to restore when disengaged)
private Dictionary<string, string> GenerateColumnNames() private Dictionary<string, string> GenerateColumnNames()
{ {
@ -108,6 +109,8 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.OSD.AddMessage("TAStudio engaged"); GlobalWin.OSD.AddMessage("TAStudio engaged");
_tas = Global.MovieSession.Movie as TasMovie; _tas = Global.MovieSession.Movie as TasMovie;
GlobalWin.MainForm.RelinquishControl(this); GlobalWin.MainForm.RelinquishControl(this);
_originalRewindStatus = Global.Rewinder.RewindActive;
GlobalWin.MainForm.EnableRewind(false);
} }
private void DisengageTastudio() private void DisengageTastudio()
@ -115,6 +118,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.OSD.AddMessage("TAStudio disengaged"); GlobalWin.OSD.AddMessage("TAStudio disengaged");
Global.MovieSession.Movie = MovieService.DefaultInstance; Global.MovieSession.Movie = MovieService.DefaultInstance;
GlobalWin.MainForm.TakeControl(); GlobalWin.MainForm.TakeControl();
GlobalWin.MainForm.EnableRewind(_originalRewindStatus);
} }
private void NewTasMovie() private void NewTasMovie()