From d71ec20df775ccbd19014973510de89e5870893d Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 3 Dec 2013 15:22:13 +0000 Subject: [PATCH] IMovie - more usage of MnemonicsGenerator to communicate input --- BizHawk.Client.Common/movie/IMovie.cs | 2 +- BizHawk.Client.Common/movie/Movie.cs | 4 ++-- BizHawk.Client.Common/movie/MovieSession.cs | 2 +- BizHawk.Client.Common/movie/TasMovie.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BizHawk.Client.Common/movie/IMovie.cs b/BizHawk.Client.Common/movie/IMovie.cs index 10a3c1ffc1..a65a9901a2 100644 --- a/BizHawk.Client.Common/movie/IMovie.cs +++ b/BizHawk.Client.Common/movie/IMovie.cs @@ -92,7 +92,7 @@ namespace BizHawk.Client.Common #region Dubious, should reconsider void CommitFrame(int frameNum, MnemonicsGenerator mg); // Why pass in frameNum? Calling api - void PokeFrame(int frameNum, string input); // Why does this exist as something different than Commit Frame? + void PokeFrame(int frameNum, MnemonicsGenerator mg); // Why does this exist as something different than Commit Frame? LoadStateResult CheckTimeLines(TextReader reader, bool onlyGuid, bool ignoreGuidMismatch, out string errorMessage); // No need to return a status, no reason to have hacky flags, no need to pass a textreader void ExtractInputLog(TextReader reader, bool isMultitracking); // how about the movie know if it is multi-tracking rather than having to pass it in diff --git a/BizHawk.Client.Common/movie/Movie.cs b/BizHawk.Client.Common/movie/Movie.cs index 94e8c76ef0..6fd7c5d791 100644 --- a/BizHawk.Client.Common/movie/Movie.cs +++ b/BizHawk.Client.Common/movie/Movie.cs @@ -366,10 +366,10 @@ namespace BizHawk.Client.Common #region Public Misc Methods - public void PokeFrame(int frameNum, string input) + public void PokeFrame(int frameNum, MnemonicsGenerator mg) { _changes = true; - _log.SetFrameAt(frameNum, input); + _log.SetFrameAt(frameNum, mg.GetControllersAsMnemonic()); } public void CommitFrame(int frameNum, MnemonicsGenerator mg) diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs index 2b5d254c6a..8934f8b08b 100644 --- a/BizHawk.Client.Common/movie/MovieSession.cs +++ b/BizHawk.Client.Common/movie/MovieSession.cs @@ -160,7 +160,7 @@ namespace BizHawk.Client.Common if (!mg.IsEmpty) { LatchInputFromPlayer(Global.MovieInputSourceAdapter); - Movie.PokeFrame(Global.Emulator.Frame, mg.GetControllersAsMnemonic()); + Movie.PokeFrame(Global.Emulator.Frame, mg); } else { diff --git a/BizHawk.Client.Common/movie/TasMovie.cs b/BizHawk.Client.Common/movie/TasMovie.cs index a48a5b1aab..4d70f70910 100644 --- a/BizHawk.Client.Common/movie/TasMovie.cs +++ b/BizHawk.Client.Common/movie/TasMovie.cs @@ -185,7 +185,7 @@ namespace BizHawk.Client.Common throw new NotImplementedException(); } - public void PokeFrame(int frameNum, string input) + public void PokeFrame(int frameNum, MnemonicsGenerator mg) { throw new NotImplementedException(); }