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

deduplicate TasMovie property setting in TAStudio

This commit is contained in:
Morilli 2024-09-14 14:25:02 +02:00
parent 362ffd147e
commit 1b3e7d45f2
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -202,7 +202,6 @@ namespace BizHawk.Client.EmuHawk
_defaultBranchMarkerSplitDistance); _defaultBranchMarkerSplitDistance);
TasView.Font = TasViewFont; TasView.Font = TasViewFont;
CurrentTasMovie.BindMarkersToInput = Settings.BindMarkersToInput;
RefreshDialog(); RefreshDialog();
_initialized = true; _initialized = true;
} }
@ -284,7 +283,6 @@ namespace BizHawk.Client.EmuHawk
} }
MainForm.AddOnScreenMessage("TAStudio engaged"); MainForm.AddOnScreenMessage("TAStudio engaged");
SetTasMovieCallbacks(CurrentTasMovie);
_originalEndAction = Config.Movies.MovieEndAction; _originalEndAction = Config.Movies.MovieEndAction;
MainForm.DisableRewind(); MainForm.DisableRewind();
Config.Movies.MovieEndAction = MovieEndAction.Record; Config.Movies.MovieEndAction = MovieEndAction.Record;
@ -498,17 +496,13 @@ namespace BizHawk.Client.EmuHawk
private void ConvertCurrentMovieToTasproj() private void ConvertCurrentMovieToTasproj()
{ {
MovieSession.ConvertToTasProj(); MovieSession.ConvertToTasProj();
CurrentTasMovie.GreenzoneInvalidated = GreenzoneInvalidated;
Settings.RecentTas.Add(MovieSession.Movie.Filename); Settings.RecentTas.Add(MovieSession.Movie.Filename);
MainForm.SetMainformMovieInfo(); MainForm.SetMainformMovieInfo();
CurrentTasMovie.PropertyChanged += TasMovie_OnPropertyChanged;
} }
private bool LoadMovie(ITasMovie tasMovie, bool startsFromSavestate = false, int gotoFrame = 0) private bool LoadMovie(ITasMovie tasMovie, bool startsFromSavestate = false, int gotoFrame = 0)
{ {
_engaged = false; _engaged = false;
tasMovie.BindMarkersToInput = Settings.BindMarkersToInput;
tasMovie.GreenzoneInvalidated = GreenzoneInvalidated;
if (!StartNewMovieWrapper(tasMovie, isNew: false)) if (!StartNewMovieWrapper(tasMovie, isNew: false))
{ {
@ -541,7 +535,6 @@ namespace BizHawk.Client.EmuHawk
SetUpToolStripColumns(); SetUpToolStripColumns();
CurrentTasMovie.PropertyChanged += TasMovie_OnPropertyChanged;
BookMarkControl.UpdateTextColumnWidth(); BookMarkControl.UpdateTextColumnWidth();
MarkerControl.UpdateTextColumnWidth(); MarkerControl.UpdateTextColumnWidth();
// clear all selections // clear all selections
@ -565,10 +558,6 @@ namespace BizHawk.Client.EmuHawk
var filename = DefaultTasProjName(); // TODO don't do this, take over any mainform actions that can crash without a filename var filename = DefaultTasProjName(); // TODO don't do this, take over any mainform actions that can crash without a filename
var tasMovie = (ITasMovie)MovieSession.Get(filename); var tasMovie = (ITasMovie)MovieSession.Get(filename);
tasMovie.Author = Config.DefaultAuthor; tasMovie.Author = Config.DefaultAuthor;
tasMovie.BindMarkersToInput = Settings.BindMarkersToInput;
tasMovie.GreenzoneInvalidated = GreenzoneInvalidated;
tasMovie.PropertyChanged += TasMovie_OnPropertyChanged;
_ = StartNewMovieWrapper(tasMovie, isNew: true); _ = StartNewMovieWrapper(tasMovie, isNew: true);
@ -586,6 +575,9 @@ namespace BizHawk.Client.EmuHawk
_initializing = true; _initializing = true;
SetTasMovieCallbacks(movie); SetTasMovieCallbacks(movie);
movie.BindMarkersToInput = Settings.BindMarkersToInput;
movie.GreenzoneInvalidated = GreenzoneInvalidated;
movie.PropertyChanged += TasMovie_OnPropertyChanged;
SuspendLayout(); SuspendLayout();
WantsToControlStopMovie = false; WantsToControlStopMovie = false;