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

tastudio: refactor restore logic again, fixes some more bugs 

(_autoRestoreFrame completely replaced by LastPositionFrame)
This commit is contained in:
feos 2016-11-21 23:59:12 +03:00
parent 0e9e4cc034
commit f59ebfe126
4 changed files with 19 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -56,7 +56,6 @@ namespace BizHawk.Client.EmuHawk
}
private bool _triggerAutoRestore; // If true, autorestore will be called on mouse up
private int? _autoRestoreFrame; // The frame auto-restore will restore to, if set
private bool? _autoRestorePaused = null;
private int? _seekStartFrame = null;
private bool _wasRecording = false;
@ -71,13 +70,6 @@ namespace BizHawk.Client.EmuHawk
{
if (Global.Emulator.Frame > CurrentTasMovie.LastValidFrame)
{
if (_autoRestorePaused == null)
{
_autoRestorePaused = Mainform.EmulatorPaused;
if (Mainform.IsSeeking) // If seeking, do not shorten seek.
_autoRestoreFrame = Mainform.PauseOnFrame;
}
GoToLastEmulatedFrameIfNecessary(CurrentTasMovie.LastValidFrame);
}
}
@ -105,7 +97,7 @@ namespace BizHawk.Client.EmuHawk
TastudioRecordMode();
_wasRecording = false;
}
Mainform.PauseOnFrame = null;
if (CurrentTasMovie != null)
RefreshDialog();
}
@ -494,15 +486,6 @@ namespace BizHawk.Client.EmuHawk
{
bool wasPaused = Mainform.EmulatorPaused;
if (Emulator.Frame > frame || CurrentTasMovie.LastValidFrame > frame)
{
if (wasPaused && !Mainform.IsSeeking && !CurrentTasMovie.LastPositionStable)
{
LastPositionFrame = Emulator.Frame;
CurrentTasMovie.LastPositionStable = true; // until new frame is emulated
}
}
if (Global.MovieSession.MovieControllerAdapter.Type.BoolButtons.Contains(buttonName))
{
CurrentTasMovie.ChangeLog.BeginNewBatch("Paint Bool " + buttonName + " from frame " + frame);

72
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -415,14 +415,7 @@ namespace BizHawk.Client.EmuHawk
if (needsToRollback)
{
GoToLastEmulatedFrameIfNecessary(TasView.FirstSelectedIndex.Value);
if (wasPaused)
{
DoAutoRestore();
}
else
{
Mainform.UnpauseEmulator();
}
DoAutoRestore();
}
else
{
@ -462,14 +455,7 @@ namespace BizHawk.Client.EmuHawk
if (needsToRollback)
{
GoToLastEmulatedFrameIfNecessary(TasView.FirstSelectedIndex.Value);
if (wasPaused)
{
DoAutoRestore();
}
else
{
Mainform.UnpauseEmulator();
}
DoAutoRestore();
}
else
{
@ -511,14 +497,7 @@ namespace BizHawk.Client.EmuHawk
if (needsToRollback)
{
GoToLastEmulatedFrameIfNecessary(rollBackFrame);
if (wasPaused)
{
DoAutoRestore();
}
else
{
Mainform.UnpauseEmulator();
}
DoAutoRestore();
}
else
{
@ -545,14 +524,7 @@ namespace BizHawk.Client.EmuHawk
if (needsToRollback)
{
GoToLastEmulatedFrameIfNecessary(rollBackFrame);
if (wasPaused)
{
DoAutoRestore();
}
else
{
Mainform.UnpauseEmulator();
}
DoAutoRestore();
}
else
{
@ -580,14 +552,7 @@ namespace BizHawk.Client.EmuHawk
if (needsToRollback)
{
GoToLastEmulatedFrameIfNecessary(rollBackFrame);
if (wasPaused)
{
DoAutoRestore();
}
else
{
Mainform.UnpauseEmulator();
}
DoAutoRestore();
}
else
{
@ -614,14 +579,7 @@ namespace BizHawk.Client.EmuHawk
if (needsToRollback)
{
GoToLastEmulatedFrameIfNecessary(insertionFrame);
if (wasPaused)
{
DoAutoRestore();
}
else
{
Mainform.UnpauseEmulator();
}
DoAutoRestore();
}
else
{
@ -641,14 +599,7 @@ namespace BizHawk.Client.EmuHawk
if (needsToRollback)
{
GoToLastEmulatedFrameIfNecessary(insertionFrame);
if (wasPaused)
{
DoAutoRestore();
}
else
{
Mainform.UnpauseEmulator();
}
DoAutoRestore();
}
else
{
@ -672,14 +623,7 @@ namespace BizHawk.Client.EmuHawk
if (needsToRollback)
{
GoToLastEmulatedFrameIfNecessary(insertionFrame);
if (wasPaused)
{
DoAutoRestore();
}
else
{
Mainform.UnpauseEmulator();
}
DoAutoRestore();
}
else
{

9
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs
View File

@ -18,11 +18,14 @@ namespace BizHawk.Client.EmuHawk
if (frame <= Emulator.Frame)
{
if ((Mainform.EmulatorPaused || !Mainform.IsSeeking) &&
!CurrentTasMovie.LastPositionStable)
{
LastPositionFrame = Emulator.Frame;
CurrentTasMovie.LastPositionStable = true; // until new frame is emulated
}
GoToFrame(frame);
}
if (!_autoRestoreFrame.HasValue || _autoRestoreFrame.Value < restoreFrame)
_autoRestoreFrame = restoreFrame;
}
}

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

@ -792,11 +792,11 @@ namespace BizHawk.Client.EmuHawk
private void DoAutoRestore()
{
if (Settings.AutoRestoreLastPosition && _autoRestoreFrame.HasValue)
if (Settings.AutoRestoreLastPosition && LastPositionFrame != -1)
{
if (_autoRestoreFrame > Emulator.Frame) // Don't unpause if we are already on the desired frame, else runaway seek
if (LastPositionFrame > Emulator.Frame) // Don't unpause if we are already on the desired frame, else runaway seek
{
StartSeeking(_autoRestoreFrame);
StartSeeking(LastPositionFrame);
}
}
else
@ -808,7 +808,7 @@ namespace BizHawk.Client.EmuHawk
}
_autoRestorePaused = null;
}
_autoRestoreFrame = null;
//_autoRestoreFrame = null;
}
private void StartAtNearestFrameAndEmulate(int frame)