From 817b9d83aaa434f501e594da80254922ed490f4a Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 24 Feb 2015 20:15:43 +0000 Subject: [PATCH] tabs to spaces, whitespace commits are the best --- .../movie/tasproj/TasMovie.IO.cs | 72 +++++++++---------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs index 3f8871b5c1..1ccbeec090 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs @@ -16,25 +16,23 @@ namespace BizHawk.Client.Common { public Func ClientSettingsForSave { get; set; } public Action GetClientSettingsOnLoad { get; set; } - - private const double PROGRESS_STEP = 100 / 12; // TODO hardcoded for now, there might be a better way of doing this - private double _totalProgress = 0; + private const double PROGRESS_STEP = 100 / 12; // TODO hardcoded for now, there might be a better way of doing this - private void ReportProgress(double percent) - { - if (_progressReportWorker != null) - { - _totalProgress += percent; - _progressReportWorker.ReportProgress((int)_totalProgress); - } - } + private double _totalProgress = 0; + + private void ReportProgress(double percent) + { + if (_progressReportWorker != null) + { + _totalProgress += percent; + _progressReportWorker.ReportProgress((int)_totalProgress); + } + } protected override void Write(string fn) { - - - _totalProgress = 0; + _totalProgress = 0; var file = new FileInfo(fn); if (!file.Directory.Exists) @@ -45,29 +43,29 @@ namespace BizHawk.Client.Common using (var bs = new BinaryStateSaver(fn, false)) { bs.PutLump(BinaryStateLump.Movieheader, tw => tw.WriteLine(Header.ToString())); - ReportProgress(PROGRESS_STEP); - bs.PutLump(BinaryStateLump.Comments, tw => tw.WriteLine(CommentsString())); - ReportProgress(PROGRESS_STEP); - bs.PutLump(BinaryStateLump.Subtitles, tw => tw.WriteLine(Subtitles.ToString())); - ReportProgress(PROGRESS_STEP); - bs.PutLump(BinaryStateLump.SyncSettings, tw => tw.WriteLine(SyncSettingsJson)); - ReportProgress(PROGRESS_STEP); - bs.PutLump(BinaryStateLump.Input, tw => tw.WriteLine(RawInputLog())); - ReportProgress(PROGRESS_STEP); + ReportProgress(PROGRESS_STEP); + bs.PutLump(BinaryStateLump.Comments, tw => tw.WriteLine(CommentsString())); + ReportProgress(PROGRESS_STEP); + bs.PutLump(BinaryStateLump.Subtitles, tw => tw.WriteLine(Subtitles.ToString())); + ReportProgress(PROGRESS_STEP); + bs.PutLump(BinaryStateLump.SyncSettings, tw => tw.WriteLine(SyncSettingsJson)); + ReportProgress(PROGRESS_STEP); + bs.PutLump(BinaryStateLump.Input, tw => tw.WriteLine(RawInputLog())); + ReportProgress(PROGRESS_STEP); // TasProj extras - bs.PutLump(BinaryStateLump.GreenzoneSettings, tw => tw.WriteLine(StateManager.Settings.ToString())); - ReportProgress(PROGRESS_STEP); + bs.PutLump(BinaryStateLump.GreenzoneSettings, tw => tw.WriteLine(StateManager.Settings.ToString())); + ReportProgress(PROGRESS_STEP); if (StateManager.Settings.SaveGreenzone) { bs.PutLump(BinaryStateLump.Greenzone, (BinaryWriter bw) => StateManager.Save(bw)); - } - ReportProgress(PROGRESS_STEP); + } + ReportProgress(PROGRESS_STEP); - bs.PutLump(BinaryStateLump.LagLog, (BinaryWriter bw) => LagLog.Save(bw)); - ReportProgress(PROGRESS_STEP); - bs.PutLump(BinaryStateLump.Markers, tw => tw.WriteLine(Markers.ToString())); - ReportProgress(PROGRESS_STEP); + bs.PutLump(BinaryStateLump.LagLog, (BinaryWriter bw) => LagLog.Save(bw)); + ReportProgress(PROGRESS_STEP); + bs.PutLump(BinaryStateLump.Markers, tw => tw.WriteLine(Markers.ToString())); + ReportProgress(PROGRESS_STEP); if (StartsFromSavestate) { @@ -79,20 +77,20 @@ namespace BizHawk.Client.Common { bs.PutLump(BinaryStateLump.Corestate, (BinaryWriter bw) => bw.Write(BinarySavestate)); } - } - ReportProgress(PROGRESS_STEP); + } + ReportProgress(PROGRESS_STEP); if (ClientSettingsForSave != null) { var clientSettingsJson = ClientSettingsForSave(); bs.PutLump(BinaryStateLump.ClientSettings, (TextWriter tw) => tw.Write(clientSettingsJson)); - } - ReportProgress(PROGRESS_STEP); + } + ReportProgress(PROGRESS_STEP); if (VerificationLog.Any()) { bs.PutLump(BinaryStateLump.VerificationLog, tw => tw.WriteLine(InputLogToString(VerificationLog))); - } - ReportProgress(PROGRESS_STEP); + } + ReportProgress(PROGRESS_STEP); } Changes = false;