diff --git a/BizHawk.Client.Common/BinarySaveStates.cs b/BizHawk.Client.Common/BinarySaveStates.cs index d2fd35e270..d66beaed24 100644 --- a/BizHawk.Client.Common/BinarySaveStates.cs +++ b/BizHawk.Client.Common/BinarySaveStates.cs @@ -62,8 +62,6 @@ namespace BizHawk.Client.Common public static BinaryStateLump BranchFrameBuffer { get; private set; } [Name("Branches\\CoreFrameBuffer", "bmp")] public static BinaryStateLump BranchCoreFrameBuffer { get; private set; } - [Name("Branches\\LagLog", "bin")] - public static BinaryStateLump BranchLagLog { get; private set; } [Name("Branches\\Header", "json")] public static BinaryStateLump BranchHeader { get; private set; } [Name("Branches\\Markers", "txt")] diff --git a/BizHawk.Client.Common/movie/tasproj/TasBranch.cs b/BizHawk.Client.Common/movie/tasproj/TasBranch.cs index 9e8d9e31a7..a79a3beec2 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasBranch.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasBranch.cs @@ -14,7 +14,6 @@ namespace BizHawk.Client.Common public IStringLog InputLog { get; set; } public BitmapBuffer CoreFrameBuffer { get; set; } public BitmapBuffer OSDFrameBuffer { get; set; } - public TasLagLog LagLog { get; set; } public TasMovieChangeLog ChangeLog { get; set; } public DateTime TimeStamp { get; set; } public TasMovieMarkerList Markers { get; set; } @@ -52,7 +51,6 @@ namespace BizHawk.Client.Common var ninput = new IndexedStateLump(BinaryStateLump.BranchInputLog); var nframebuffer = new IndexedStateLump(BinaryStateLump.BranchFrameBuffer); var ncoreframebuffer = new IndexedStateLump(BinaryStateLump.BranchCoreFrameBuffer); - var nlaglog = new IndexedStateLump(BinaryStateLump.BranchLagLog); var nmarkers = new IndexedStateLump(BinaryStateLump.BranchMarkers); var nusertext = new IndexedStateLump(BinaryStateLump.BranchUserText); foreach (var b in this) @@ -94,11 +92,6 @@ namespace BizHawk.Client.Common QuickBmpFile.Save(vp, s, b.CoreFrameBuffer.Width, b.CoreFrameBuffer.Height); }); - bs.PutLump(nlaglog, delegate(BinaryWriter bw) - { - b.LagLog.Save(bw); - }); - bs.PutLump(nmarkers, delegate(TextWriter tw) { tw.WriteLine(b.Markers.ToString()); @@ -114,7 +107,6 @@ namespace BizHawk.Client.Common ninput.Increment(); nframebuffer.Increment(); ncoreframebuffer.Increment(); - nlaglog.Increment(); nmarkers.Increment(); nusertext.Increment(); } @@ -127,7 +119,6 @@ namespace BizHawk.Client.Common var ninput = new IndexedStateLump(BinaryStateLump.BranchInputLog); var nframebuffer = new IndexedStateLump(BinaryStateLump.BranchFrameBuffer); var ncoreframebuffer = new IndexedStateLump(BinaryStateLump.BranchCoreFrameBuffer); - var nlaglog = new IndexedStateLump(BinaryStateLump.BranchLagLog); var nmarkers = new IndexedStateLump(BinaryStateLump.BranchMarkers); var nusertext = new IndexedStateLump(BinaryStateLump.BranchUserText); @@ -197,12 +188,6 @@ namespace BizHawk.Client.Common b.CoreFrameBuffer = new BitmapBuffer(vp.BufferWidth, vp.BufferHeight, vp.VideoBuffer); }); - bl.GetLump(nlaglog, false, delegate(BinaryReader br) - { - b.LagLog = new TasLagLog(); - b.LagLog.Load(br); - }); - b.Markers = new TasMovieMarkerList(movie); bl.GetLump(nmarkers, false, delegate(TextReader tr) { @@ -235,7 +220,6 @@ namespace BizHawk.Client.Common ninput.Increment(); nframebuffer.Increment(); ncoreframebuffer.Increment(); - nlaglog.Increment(); nmarkers.Increment(); nusertext.Increment(); } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index 15602c210f..ac2116bb94 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -184,7 +184,6 @@ namespace BizHawk.Client.EmuHawk InputLog = Movie.InputLog.Clone(), CoreFrameBuffer = GlobalWin.MainForm.MakeScreenshotImage(), OSDFrameBuffer = GlobalWin.MainForm.CaptureOSD(), - LagLog = Movie.TasLagLog.Clone(), ChangeLog = new TasMovieChangeLog(Movie), TimeStamp = DateTime.Now, Markers = Movie.Markers.DeepClone(),