From 3f1a3907b504de6903b5d8f2dcea81ed0c136018 Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Sat, 24 Oct 2015 12:42:22 +0300
Subject: [PATCH] tastudio: put branch states to a separate greenzone file.
 default scroll speed to 3.

---
 BizHawk.Client.Common/BinarySaveStates.cs     |  2 +
 .../movie/tasproj/TasMovie.IO.cs              |  5 ++
 .../movie/tasproj/TasStateManager.cs          | 48 +++++++++++--------
 .../tools/TAStudio/TAStudio.cs                |  2 +-
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/BizHawk.Client.Common/BinarySaveStates.cs b/BizHawk.Client.Common/BinarySaveStates.cs
index 8d4e2528c3..06a69adcc6 100644
--- a/BizHawk.Client.Common/BinarySaveStates.cs
+++ b/BizHawk.Client.Common/BinarySaveStates.cs
@@ -64,6 +64,8 @@ namespace BizHawk.Client.Common
 		public static BinaryStateLump BranchHeader { get; private set; }
 		[Name("Branches\\Markers", "txt")]
 		public static BinaryStateLump BranchMarkers { get; private set; }
+		[Name("Branches\\GreenZone")]
+		public static BinaryStateLump BranchStateHistory { get; private set; }
 
 		[AttributeUsage(AttributeTargets.Property)]
 		private class NameAttribute : Attribute
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
index ecd20f53de..c0d7e7eb60 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
@@ -99,6 +99,7 @@ namespace BizHawk.Client.Common
 				if (Branches.Any())
 				{
 					Branches.Save(bs);
+					bs.PutLump(BinaryStateLump.BranchStateHistory, (BinaryWriter bw) => StateManager.SaveBranchStates(bw));
 				}
 
 				ReportProgress(PROGRESS_STEP);
@@ -288,6 +289,10 @@ namespace BizHawk.Client.Common
 				}
 
 				Branches.Load(bl, this);
+				bl.GetLump(BinaryStateLump.BranchStateHistory, false, delegate(BinaryReader br, long length)
+				{
+					StateManager.LoadBranchStates(br);
+				});
 			}
 
 			Changes = false;
diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index 062b27ec4d..bbcb401beb 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -562,23 +562,6 @@ namespace BizHawk.Client.Common
 				bw.Write(kvp.Value.Length);
 				bw.Write(kvp.Value.State);
 			}
-
-			bw.Write(currentBranch);
-
-			if (Settings.BranchStatesInTasproj)
-			{
-				bw.Write(BranchStates.Count);
-				foreach (var s in BranchStates)
-				{
-					bw.Write(s.Key);
-					bw.Write(s.Value.Count);
-					foreach (var t in s.Value)
-					{
-						bw.Write(t.Key);
-						t.Value.Write(bw);
-					}
-				}
-			}
 		}
 
 		public void Load(BinaryReader br)
@@ -599,11 +582,33 @@ namespace BizHawk.Client.Common
 				//Used += len;
 			}
 			//}
+		}
 
-			try
+		public void SaveBranchStates(BinaryWriter bw)
+		{
+			bw.Write(currentBranch);
+			if (Settings.BranchStatesInTasproj)
 			{
-				currentBranch = br.ReadInt32();
-				if (Settings.BranchStatesInTasproj)
+				bw.Write(BranchStates.Count);
+				foreach (var s in BranchStates)
+				{
+					bw.Write(s.Key);
+					bw.Write(s.Value.Count);
+					foreach (var t in s.Value)
+					{
+						bw.Write(t.Key);
+						t.Value.Write(bw);
+					}
+				}
+			}
+		}
+
+		public void LoadBranchStates(BinaryReader br)
+		{
+			currentBranch = br.ReadInt32();
+			if (Settings.BranchStatesInTasproj)
+			{
+				try
 				{
 					int c = br.ReadInt32();
 					BranchStates = new SortedList<int, SortedList<int, StateManagerState>>(c);
@@ -623,10 +628,11 @@ namespace BizHawk.Client.Common
 						c--;
 					}
 				}
+				catch (EndOfStreamException) { }
 			}
-			catch (EndOfStreamException) { }
 		}
 
+
 		public KeyValuePair<int, byte[]> GetStateClosestToFrame(int frame)
 		{
 			var s = States.LastOrDefault(state => state.Key < frame);
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 444af2c4fc..c0267b7ee1 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -58,7 +58,7 @@ namespace BizHawk.Client.EmuHawk
 				DrawInput = true;
 				AutoPause = true;
 				FollowCursor = true;
-				ScrollSpeed = 1;
+				ScrollSpeed = 3;
 				FollowCursorAlwaysScroll = false;
 				FollowCursorScrollMethod = "near";
                 // default to taseditor fashion