From 16ab9dc0b0e06c807b50d0f3371a7d3b34e4331a Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 31 May 2020 10:16:27 -0500 Subject: [PATCH] BinaryStateSaver - pass in compression level instead of hitting Global.Config, now we just use Global.Config more in other places, but it's a step in the right direction --- src/BizHawk.Client.Common/BinarySaveStates.cs | 4 ++-- src/BizHawk.Client.Common/SavestateManager.cs | 2 +- src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs | 2 +- src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BizHawk.Client.Common/BinarySaveStates.cs b/src/BizHawk.Client.Common/BinarySaveStates.cs index b0ab79a9f6..58ba531f8b 100644 --- a/src/BizHawk.Client.Common/BinarySaveStates.cs +++ b/src/BizHawk.Client.Common/BinarySaveStates.cs @@ -328,9 +328,9 @@ namespace BizHawk.Client.Common sw.Flush(); } - public BinaryStateSaver(string path, bool notamovie) // notamovie is hack, really should have separate something + public BinaryStateSaver(string path, int compressionLevel) { - _zip = new FrameworkZipWriter(path, notamovie ? Global.Config.SaveStateCompressionLevelNormal : Global.Config.MovieCompressionLevel); + _zip = new FrameworkZipWriter(path, compressionLevel); } public void PutVersionLumps() diff --git a/src/BizHawk.Client.Common/SavestateManager.cs b/src/BizHawk.Client.Common/SavestateManager.cs index d4d3068592..f085077347 100644 --- a/src/BizHawk.Client.Common/SavestateManager.cs +++ b/src/BizHawk.Client.Common/SavestateManager.cs @@ -15,7 +15,7 @@ namespace BizHawk.Client.Common // the old method of text savestate save is now gone. // a text savestate is just like a binary savestate, but with a different core lump - using var bs = new BinaryStateSaver(filename, true); + using var bs = new BinaryStateSaver(filename, Global.Config.SaveStateCompressionLevelNormal); bs.PutVersionLumps(); if (Global.Config.SaveStateType == SaveStateTypeE.Text) { diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs index 3263154778..64e48f8804 100644 --- a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs +++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs @@ -184,7 +184,7 @@ namespace BizHawk.Client.Common Directory.CreateDirectory(file.Directory.ToString()); } - using var bs = new BinaryStateSaver(fn, false); + using var bs = new BinaryStateSaver(fn, Global.Config.MovieCompressionLevel); bs.PutLump(BinaryStateLump.Movieheader, tw => tw.WriteLine(Header.ToString())); bs.PutLump(BinaryStateLump.Comments, tw => tw.WriteLine(CommentsString())); bs.PutLump(BinaryStateLump.Subtitles, tw => tw.WriteLine(Subtitles.ToString())); diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs index 5c36156039..69275dc9da 100644 --- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs +++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs @@ -18,7 +18,7 @@ namespace BizHawk.Client.Common Directory.CreateDirectory(file.Directory.ToString()); } - using var bs = new BinaryStateSaver(fn, false); + using var bs = new BinaryStateSaver(fn, Global.Config.MovieCompressionLevel); bs.PutLump(BinaryStateLump.Movieheader, tw => tw.WriteLine(Header.ToString())); bs.PutLump(BinaryStateLump.Comments, tw => tw.WriteLine(CommentsString())); bs.PutLump(BinaryStateLump.Subtitles, tw => tw.WriteLine(Subtitles.ToString()));