Editing Markers now is managed by TasMovie as a change to the movie file. Fixed bugs to do with adding and deleting markers.

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

@@ -14,6 +14,7 @@ namespace BizHawk.Client.Common
 	{
 		private List<bool> LagLog = new List<bool>();
 		private readonly TasStateManager StateManager;
+		public TasMovieMarkerList Markers { get; set; }
 
 		public TasMovie(string path) : base(path) { }
 
@@ -23,6 +24,7 @@ namespace BizHawk.Client.Common
 			StateManager = new TasStateManager(this);
 			Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0 Tasproj v1.0";
 			Markers = new TasMovieMarkerList(this);
+			Markers.CollectionChanged += Markers_CollectionChanged;
 			Markers.Add(0, StartsFromSavestate ? "Savestate" : "Power on");
 		}
 
@@ -31,7 +33,7 @@ namespace BizHawk.Client.Common
 			get { return Extension; }
 		}
 
-		#region OnPropertyChanged Event
+		#region Events and Handlers 
 
 		public event PropertyChangedEventHandler PropertyChanged;
 
@@ -49,8 +51,6 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		#endregion
-
 		//This event is Raised ony when Changes is TOGGLED.
 		private void OnPropertyChanged(string propertyName)
 		{
@@ -61,9 +61,14 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public new const string Extension = "tasproj";
+		void Markers_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+		{
+			Changes = true;
+		}
 
-		public TasMovieMarkerList Markers { get; set; }
+		#endregion
+
+		public new const string Extension = "tasproj";
 
 		public TasMovieRecord this[int index]
 		{

BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Text;
 
@@ -72,7 +74,6 @@ namespace BizHawk.Client.Common
 		}
 	}
 
-	//Add functions as needed
 	public class TasMovieMarkerList : List<TasMovieMarker>
 	{
 		private readonly TasMovie _movie;
@@ -82,6 +83,17 @@ namespace BizHawk.Client.Common
 			_movie = movie;
 		}
 
+		public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+		private void OnListChanged(NotifyCollectionChangedAction action)
+		{
+			if (CollectionChanged != null)
+			{
+				//TODO Allow different types
+				CollectionChanged.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+			}
+		}
+
 		public override string ToString()
 		{
 			var sb = new StringBuilder();
@@ -98,12 +110,17 @@ namespace BizHawk.Client.Common
 			var existingItem = this.FirstOrDefault(m => m.Frame == item.Frame);
 			if (existingItem != null)
 			{
-				existingItem.Message = item.Message;
+				if (existingItem.Message != item.Message)
+				{
+					existingItem.Message = item.Message;
+					OnListChanged(NotifyCollectionChangedAction.Replace);
+				}
 			}
 			else
 			{
 				base.Add(item);
 				this.Sort((m1, m2) => m1.Frame.CompareTo(m2.Frame));
+				OnListChanged(NotifyCollectionChangedAction.Add);
 			}
 		}
 
@@ -114,19 +131,39 @@ namespace BizHawk.Client.Common
 
 		public new void AddRange(IEnumerable<TasMovieMarker> collection)
 		{
-			base.AddRange(collection);
+			foreach(TasMovieMarker m in collection){
+				Add(m);
+			}
 		}
 
 		public new void Insert(int index, TasMovieMarker item)
 		{
 			base.Insert(index, item);
 			this.Sort((m1, m2) => m1.Frame.CompareTo(m2.Frame));
+			OnListChanged(NotifyCollectionChangedAction.Add);
 		}
 
 		public new void InsertRange(int index, IEnumerable<TasMovieMarker> collection)
 		{
 			base.InsertRange(index, collection);
 			this.Sort((m1, m2) => m1.Frame.CompareTo(m2.Frame));
+			OnListChanged(NotifyCollectionChangedAction.Add);
+		}
+
+		public new void Remove(TasMovieMarker item)
+		{
+			base.Remove(item);
+			OnListChanged(NotifyCollectionChangedAction.Remove);
+		}
+
+		public new int RemoveAll(Predicate<TasMovieMarker> match)
+		{
+			int removeCount = base.RemoveAll(match);
+			if (removeCount > 0)
+			{
+				OnListChanged(NotifyCollectionChangedAction.Remove);
+			}
+			return removeCount;
 		}
 
 		/// <summary>
@@ -144,6 +181,10 @@ namespace BizHawk.Client.Common
 					deletedCount++;
 				}
 			}
+			if (deletedCount > 0)
+			{
+				OnListChanged(NotifyCollectionChangedAction.Remove);
+			}
 			return deletedCount;
 		}
 

BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs

@@ -97,6 +97,7 @@ namespace BizHawk.Client.EmuHawk
 		private void AddBtn_Click(object sender, EventArgs e)
 		{
 			Tastudio.CallAddMarkerPopUp();
+			MarkerView_SelectedIndexChanged(sender, e);
 		}
 
 		public new void Refresh()
@@ -111,13 +112,14 @@ namespace BizHawk.Client.EmuHawk
 
 		private void MarkerView_SelectedIndexChanged(object sender, EventArgs e)
 		{
-			RemoveBtn.Enabled = SelectedIndices.Any();
+			RemoveBtn.Enabled = SelectedIndices.Any(i => i < Markers.Count);
 		}
 
 		private void RemoveBtn_Click(object sender, EventArgs e)
 		{
 			SelectedMarkers.ForEach(i => Markers.Remove(i));
 			Tastudio.RefreshDialog();
+			MarkerView_SelectedIndexChanged(sender, e);
 		}
 
 		private IEnumerable<int> SelectedIndices

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

@@ -797,7 +797,6 @@ namespace BizHawk.Client.EmuHawk
 
 		private void RemoveMarkersMenuItem_Click(object sender, EventArgs e)
 		{
-
 			_currentTasMovie.Markers.RemoveAll(m => TasView.SelectedIndices.Contains(m.Frame));
 			RefreshDialog();
 		}