From ab7225c955f4e2b2dc57efbd8a197e1b5b1ccc4a Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 14 Apr 2020 20:58:02 -0500 Subject: [PATCH] remove MovieSession convenience property that isn't that convenient anyway --- BizHawk.Client.Common/Api/Classes/MovieApi.cs | 2 +- BizHawk.Client.Common/movie/MovieSession.cs | 8 -------- BizHawk.Client.Common/movie/interfaces/IMovieSession.cs | 2 -- BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs | 2 +- BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs | 2 +- .../tools/Macros/MacroInput.ButtonSelect.cs | 2 +- BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs | 8 ++++---- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 2 +- 8 files changed, 9 insertions(+), 19 deletions(-) diff --git a/BizHawk.Client.Common/Api/Classes/MovieApi.cs b/BizHawk.Client.Common/Api/Classes/MovieApi.cs index 7042dbcf05..a4a6c27f9a 100644 --- a/BizHawk.Client.Common/Api/Classes/MovieApi.cs +++ b/BizHawk.Client.Common/Api/Classes/MovieApi.cs @@ -45,7 +45,7 @@ namespace BizHawk.Client.Common return string.Empty; } - var lg = Global.MovieSession.LogGeneratorInstance( + var lg = Global.MovieSession.Movie.LogGeneratorInstance( Global.MovieSession.Movie.GetInputState(frame)); return lg.GenerateLogEntry(); } diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs index 2e8fd51f80..47f82931b7 100644 --- a/BizHawk.Client.Common/movie/MovieSession.cs +++ b/BizHawk.Client.Common/movie/MovieSession.cs @@ -58,14 +58,6 @@ namespace BizHawk.Client.Common return new Bk2Controller("", definition); } - /// - /// Simply shortens the verbosity necessary otherwise - /// - public ILogEntryGenerator LogGeneratorInstance(IController source) - { - return Movie.LogGeneratorInstance(source); - } - // Convenience property that gets the controller state from the movie for the most recent frame public IController CurrentInput { diff --git a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs index 5d010104b2..0383ef8a1d 100644 --- a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs +++ b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs @@ -33,8 +33,6 @@ namespace BizHawk.Client.Common bool CheckSavestateTimeline(TextReader reader); bool HandleMovieLoadState(TextReader reader); - ILogEntryGenerator LogGeneratorInstance(IController source); - void QueueNewMovie(IMovie movie, bool record, IEmulator emulator); void RunQueuedMovie(bool recordMode); diff --git a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs index e03763772f..ae6fdb3f67 100644 --- a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs +++ b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs @@ -224,7 +224,7 @@ namespace BizHawk.Client.EmuHawk private string MakeStringFor(IController controller) { - return Global.MovieSession.LogGeneratorInstance(controller).GenerateInputDisplay(); + return Global.MovieSession.Movie.LogGeneratorInstance(controller).GenerateInputDisplay(); } public string MakeIntersectImmediatePrevious() diff --git a/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs index f62a5bcd73..691b863133 100644 --- a/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs +++ b/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs @@ -976,7 +976,7 @@ namespace BizHawk.Client.EmuHawk UpdateBotStatusIcon(); MessageLabel.Text = "Running..."; _cachedControlProbabilities = ControlProbabilities; - _logGenerator = Global.MovieSession.LogGeneratorInstance(Global.InputManager.ClickyVirtualPadController); + _logGenerator = Global.MovieSession.Movie.LogGeneratorInstance(Global.InputManager.ClickyVirtualPadController); } private string CanStart() diff --git a/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.ButtonSelect.cs b/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.ButtonSelect.cs index 3acc6598e0..e558f4a918 100644 --- a/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.ButtonSelect.cs +++ b/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.ButtonSelect.cs @@ -48,7 +48,7 @@ namespace BizHawk.Client.EmuHawk s.Refresh(); // Update the selected zone's key - var lg = Global.MovieSession.LogGeneratorInstance(Global.MovieSession.MovieController); + var lg = Global.MovieSession.Movie.LogGeneratorInstance(Global.MovieSession.MovieController); string key = lg.GenerateLogKey(); key = key.Replace("LogKey:", "").Replace("#", ""); diff --git a/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs b/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs index 1d4a40a80b..5b5f0297e5 100644 --- a/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs +++ b/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs @@ -54,7 +54,7 @@ namespace BizHawk.Client.EmuHawk } _controller = new Bk2Controller(d); - var logGenerator = Global.MovieSession.LogGeneratorInstance(_controller); + var logGenerator = Global.MovieSession.Movie.LogGeneratorInstance(_controller); logGenerator.GenerateLogEntry(); // Reference and create all buttons. string movieKey = logGenerator.GenerateLogKey().Replace("LogKey:", "").Replace("#", ""); @@ -107,11 +107,11 @@ namespace BizHawk.Client.EmuHawk } var newController = new Bk2Controller(d); - var logGenerator = Global.MovieSession.LogGeneratorInstance(newController); + var logGenerator = Global.MovieSession.Movie.LogGeneratorInstance(newController); logGenerator.GenerateLogEntry(); // Reference and create all buttons. // Reset all buttons in targetController (it may still have buttons that aren't being set here set true) - var tC = Global.MovieSession.LogGeneratorInstance(_targetController); + var tC = Global.MovieSession.Movie.LogGeneratorInstance(_targetController); _targetController.SetFromMnemonic(tC.EmptyEntry); for (int i = 0; i < Length; i++) { @@ -224,7 +224,7 @@ namespace BizHawk.Client.EmuHawk // If the LogKey contains buttons/controls not accepted by the emulator, // tell the user and display the macro's controller name and player count _inputKey = readText[0]; - var lg = Global.MovieSession.LogGeneratorInstance(Global.MovieSession.MovieController); + var lg = Global.MovieSession.Movie.LogGeneratorInstance(Global.MovieSession.MovieController); string key = lg.GenerateLogKey(); key = key.Replace("LogKey:", "").Replace("#", ""); key = key.Substring(0, key.Length - 1); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 62ad1ba3e9..b037da47e9 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -413,7 +413,7 @@ namespace BizHawk.Client.EmuHawk Rotatable = true }); - var columnNames = Global.MovieSession + var columnNames = Global.MovieSession.Movie .LogGeneratorInstance(Global.MovieSession.MovieController) .Map();