Update settings handling ahead of new state manager implementation.

Author: SuuperW

src/BizHawk.Client.Common/movie/interfaces/ITasMovie.cs

@@ -9,7 +9,7 @@ public interface ITasMovie : IMovie, INotifyPropertyChanged, IDisposable
 		bool BindMarkersToInput { get; set; }
 
 		IMovieChangeLog ChangeLog { get; }
-		IStateManager TasStateManager { get; }
+		IStateManager<ZwinderStateManagerSettings> TasStateManager { get; set; }
 		Func<string> InputRollSettingsForSave { get; set; }
 		string InputRollSettings { get; }
 		ITasMovieRecord this[int index] { get; }

src/BizHawk.Client.Common/movie/tasproj/IStateManager.cs

@@ -4,9 +4,9 @@
 
 namespace BizHawk.Client.Common
 {
-	public interface IStateManager : IDisposable
+	public interface IStateManager<SettingsT> : IDisposable
 	{
-		ZwinderStateManagerSettings Settings { get; }
+		SettingsT Settings { get; }
 
 		/// <summary>
 		/// Requests that the current emulator state be captured
@@ -45,7 +45,7 @@ public interface IStateManager : IDisposable
 		/// <summary>
 		/// Updates the internal state saving logic settings
 		/// </summary>
-		void UpdateSettings(ZwinderStateManagerSettings settings, bool keepOldStates = false);
+		IStateManager<SettingsT> UpdateSettings(SettingsT settings, bool keepOldStates = false);
 
 		/// <summary>
 		/// Serializes the current state of the instance for persisting to disk
@@ -58,7 +58,7 @@ public interface IStateManager : IDisposable
 		void LoadStateHistory(BinaryReader br);
 
 		/// <summary>
-		/// Enables the instance to be used. An instance of <see cref="IStateManager"/> should not
+		/// Enables the instance to be used. An instance of <see cref="IStateManager{T}"/> should not
 		/// be useable until this method is called
 		/// </summary>
 		void Engage(byte[] frameZeroState);

src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs

@@ -81,7 +81,7 @@ public override bool StartsFromSavestate
 		public TasLagLog LagLog { get; } = new TasLagLog();
 
 		public override string PreferredExtension => Extension;
-		public IStateManager TasStateManager { get; private set; }
+		public IStateManager<ZwinderStateManagerSettings> TasStateManager { get; set; }
 
 		public Action<int> GreenzoneInvalidated { get; set; }
 

src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs

@@ -8,7 +8,7 @@
 
 namespace BizHawk.Client.Common
 {
-	public class ZwinderStateManager : IStateManager, IDisposable
+	public class ZwinderStateManager : IStateManager<ZwinderStateManagerSettings>, IDisposable
 	{
 		private static readonly byte[] NonState = Array.Empty<byte>();
 
@@ -65,7 +65,7 @@ private ZwinderStateManager(ZwinderBuffer current, ZwinderBuffer recent, Zwinder
 
 		public ZwinderStateManagerSettings Settings { get; private set; }
 
-		public void UpdateSettings(ZwinderStateManagerSettings settings, bool keepOldStates = false)
+		public ZwinderStateManager UpdateSettings(ZwinderStateManagerSettings settings, bool keepOldStates = false)
 		{
 			bool makeNewReserved = Settings?.AncientStoreType != settings.AncientStoreType;
 			Settings = settings;
@@ -115,7 +115,10 @@ public void UpdateSettings(ZwinderStateManagerSettings settings, bool keepOldSta
 
 			_ancientInterval = settings.AncientStateInterval;
 			RebuildStateCache();
+
+			return this;
 		}
+		IStateManager<ZwinderStateManagerSettings> IStateManager<ZwinderStateManagerSettings>.UpdateSettings(ZwinderStateManagerSettings settings, bool keepOldStates) => UpdateSettings(settings, keepOldStates);
 
 		private void RebuildReserved()
 		{

src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs

@@ -916,7 +916,7 @@ private void StateHistorySettingsMenuItem_Click(object sender, EventArgs e)
 			using GreenzoneSettings form = new(
 				DialogController,
 				new ZwinderStateManagerSettings(CurrentTasMovie.TasStateManager.Settings),
-				(s, k) => { CurrentTasMovie.TasStateManager.UpdateSettings(s, k); },
+				(s, k) => { CurrentTasMovie.TasStateManager = CurrentTasMovie.TasStateManager.UpdateSettings(s, k); },
 				false)
 			{
 				Owner = this,