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

Cleanup IMovieSession method names to be a bit more conscise

This commit is contained in:
adelikat 2020-04-16 10:19:02 -05:00
parent 3f1ef8dd4d
commit eb3ddab060
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/SavestateManager.cs
View File

@ -71,7 +71,7 @@ namespace BizHawk.Client.Common
{
// this never should have been a core's responsibility
tw.WriteLine("Frame {0}", emulator.Frame);
Global.MovieSession.HandleMovieSaveState(tw);
Global.MovieSession.HandleSaveState(tw);
});
}
@ -156,7 +156,7 @@ namespace BizHawk.Client.Common
// We must handle movie input AFTER the core is loaded to properly handle mode changes, and input latching
if (Global.MovieSession.Movie.IsActive())
{
bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState(tr));
bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleLoadState(tr));
if (!succeed)
{
return false;

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

@ -91,7 +91,7 @@ namespace BizHawk.Client.Common
return new Bk2Controller("", definition ?? MovieController.Definition);
}
public void HandleMovieOnFrameLoop()
public void HandleFrameBefore()
{
if (!Movie.IsActive())
{
@ -151,7 +151,7 @@ namespace BizHawk.Client.Common
}
}
public void HandleMovieAfterFrameLoop()
public void HandleFrameAfter()
{
if (Movie is TasMovie tasMovie)
{
@ -167,7 +167,7 @@ namespace BizHawk.Client.Common
}
}
public void HandleMovieSaveState(TextWriter writer)
public void HandleSaveState(TextWriter writer)
{
if (Movie.IsActive())
{
@ -190,7 +190,7 @@ namespace BizHawk.Client.Common
return true;
}
public bool HandleMovieLoadState(TextReader reader)
public bool HandleLoadState(TextReader reader)
{
if (Movie.NotActive())
{
@ -452,12 +452,12 @@ namespace BizHawk.Client.Common
// adelikat: TODO: this is likely the source of frame 0 TAStudio bugs, I think the intent is to check if the movie is 0 length?
if (Global.Emulator.Frame == 0) // Hacky
{
HandleMovieAfterFrameLoop(); // Frame 0 needs to be handled.
HandleFrameAfter(); // Frame 0 needs to be handled.
}
if (input == null)
{
HandleMovieAfterFrameLoop();
HandleFrameAfter();
return;
}

8
BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
View File

@ -48,12 +48,12 @@ namespace BizHawk.Client.Common
/// </summary>
IMovieController GenerateMovieController(ControllerDefinition definition = null);
void HandleMovieOnFrameLoop();
void HandleMovieAfterFrameLoop();
void HandleMovieSaveState(TextWriter writer);
void HandleFrameBefore();
void HandleFrameAfter();
void HandleSaveState(TextWriter writer);
bool CheckSavestateTimeline(TextReader reader);
bool HandleMovieLoadState(TextReader reader);
bool HandleLoadState(TextReader reader);
void QueueNewMovie(IMovie movie, bool record, IEmulator emulator);

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

@ -2942,7 +2942,7 @@ namespace BizHawk.Client.EmuHawk
}
}
MovieSession.HandleMovieOnFrameLoop();
MovieSession.HandleFrameBefore();
if (Config.AutosaveSaveRAM)
{
@ -2962,7 +2962,7 @@ namespace BizHawk.Client.EmuHawk
bool render = !InvisibleEmulation && (!_throttle.skipNextFrame || (_currAviWriter?.UsesVideo ?? false));
bool newFrame = Emulator.FrameAdvance(Global.InputManager.ControllerOutput, render, renderSound);
MovieSession.HandleMovieAfterFrameLoop();
MovieSession.HandleFrameAfter();
if (returnToRecording)
{
@ -2971,7 +2971,7 @@ namespace BizHawk.Client.EmuHawk
if (isRewinding && !IsRewindSlave && MovieSession.Movie.IsRecording())
{
MovieSession.Movie.Truncate(Global.Emulator.Frame);
MovieSession.Movie.Truncate(Emulator.Frame);
}
CheatList.Pulse();