diff --git a/BizHawk.Client.Common/movie/import/IMovieImport.cs b/BizHawk.Client.Common/movie/import/IMovieImport.cs index 320c067bb5..8f59f6874c 100644 --- a/BizHawk.Client.Common/movie/import/IMovieImport.cs +++ b/BizHawk.Client.Common/movie/import/IMovieImport.cs @@ -84,7 +84,7 @@ namespace BizHawk.Client.Common public IList Warnings { get; } = new List(); public IList Errors { get; } = new List(); - public Bk2Movie Movie { get; set; } + public IMovie Movie { get; set; } } [AttributeUsage(AttributeTargets.Class)] diff --git a/BizHawk.Client.Common/movie/import/MovieImport.cs b/BizHawk.Client.Common/movie/import/MovieImport.cs index 185fce9d55..ed965d79f8 100644 --- a/BizHawk.Client.Common/movie/import/MovieImport.cs +++ b/BizHawk.Client.Common/movie/import/MovieImport.cs @@ -69,7 +69,7 @@ namespace BizHawk.Client.Common return null; } - Bk2Movie movie = null; + IMovie movie = null; try { diff --git a/BizHawk.Client.Common/movie/import/PjmImport.cs b/BizHawk.Client.Common/movie/import/PjmImport.cs index 80d4ff2289..5659eb0bf6 100644 --- a/BizHawk.Client.Common/movie/import/PjmImport.cs +++ b/BizHawk.Client.Common/movie/import/PjmImport.cs @@ -10,31 +10,25 @@ namespace BizHawk.Client.Common { protected override void RunImport() { - Bk2Movie movie = Result.Movie; + Result.Movie.HeaderEntries[HeaderKeys.PLATFORM] = "PSX"; - movie.HeaderEntries[HeaderKeys.PLATFORM] = "PSX"; + using var fs = SourceFile.OpenRead(); + using var br = new BinaryReader(fs); + var info = ParseHeader(Result.Movie, "PJM ", br); - using (var fs = SourceFile.OpenRead()) + fs.Seek(info.ControllerDataOffset, SeekOrigin.Begin); + + if (info.BinaryFormat) { - using var br = new BinaryReader(fs); - var info = ParseHeader(movie, "PJM ", br); - - fs.Seek(info.ControllerDataOffset, SeekOrigin.Begin); - - if (info.BinaryFormat) - { - ParseBinaryInputLog(br, movie, info); - } - else - { - ParseTextInputLog(br, movie, info); - } + ParseBinaryInputLog(br, Result.Movie, info); + } + else + { + ParseTextInputLog(br, Result.Movie, info); } - - movie.Save(); } - protected MiscHeaderInfo ParseHeader(Bk2Movie movie, string expectedMagic, BinaryReader br) + protected MiscHeaderInfo ParseHeader(IMovie movie, string expectedMagic, BinaryReader br) { var info = new MiscHeaderInfo(); @@ -175,7 +169,7 @@ namespace BizHawk.Client.Common return info; } - protected void ParseBinaryInputLog(BinaryReader br, Bk2Movie movie, MiscHeaderInfo info) + protected void ParseBinaryInputLog(BinaryReader br, IMovie movie, MiscHeaderInfo info) { var settings = new Octoshock.SyncSettings(); var controllers = new SimpleController(); @@ -286,7 +280,7 @@ namespace BizHawk.Client.Common } } - protected void ParseTextInputLog(BinaryReader br, Bk2Movie movie, MiscHeaderInfo info) + protected void ParseTextInputLog(BinaryReader br, IMovie movie, MiscHeaderInfo info) { Octoshock.SyncSettings settings = new Octoshock.SyncSettings(); SimpleController controllers = new SimpleController(); diff --git a/BizHawk.Client.Common/movie/import/PxmImport.cs b/BizHawk.Client.Common/movie/import/PxmImport.cs index 98b099a35f..68e163abb6 100644 --- a/BizHawk.Client.Common/movie/import/PxmImport.cs +++ b/BizHawk.Client.Common/movie/import/PxmImport.cs @@ -14,28 +14,23 @@ namespace BizHawk.Client.Common.Movie.Import { protected override void RunImport() { - Bk2Movie movie = Result.Movie; - + var movie = Result.Movie; movie.HeaderEntries[HeaderKeys.PLATFORM] = "PSX"; - using (var fs = SourceFile.OpenRead()) + using var fs = SourceFile.OpenRead(); + using var br = new BinaryReader(fs); + var info = ParseHeader(movie, "PXM ", br); + + fs.Seek(info.ControllerDataOffset, SeekOrigin.Begin); + + if (info.BinaryFormat) { - using var br = new BinaryReader(fs); - var info = ParseHeader(movie, "PXM ", br); - - fs.Seek(info.ControllerDataOffset, SeekOrigin.Begin); - - if (info.BinaryFormat) - { - ParseBinaryInputLog(br, movie, info); - } - else - { - ParseTextInputLog(br, movie, info); - } + ParseBinaryInputLog(br, movie, info); + } + else + { + ParseTextInputLog(br, movie, info); } - - movie.Save(); } } }