diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index 028a84ab75..13a27e441c 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -38,13 +38,30 @@ namespace BizHawk.Client.EmuHawk { var prev = Markers.PreviousOrCurrent(Global.Emulator.Frame); - if (prev != null) + if (prev != null && index == Markers.IndexOf(prev)) { - if (index == Markers.IndexOf(prev)) + color = TAStudio.Marker_FrameCol; + } + else if (index < Tastudio.CurrentMovie.InputLogLength) + { + var record = Tastudio.CurrentMovie[index]; + if (record.HasState && record.Lagged.HasValue) { - color = Color.FromArgb(0xE0FBE0); + if (record.Lagged.Value) + { + color = column == 0 ? TAStudio.LagZone_FrameCol : TAStudio.LagZone_InputLog; + } + else + { + color = column == 0 ? TAStudio.GreenZone_FrameCol : TAStudio.GreenZone_InputLog; + } + } + else + { + color = Color.White; } } + } private void MarkerView_QueryItemText(int index, int column, out string text) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 0a58903706..ae57e83ba6 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -16,22 +16,22 @@ namespace BizHawk.Client.EmuHawk private bool _startMarkerDrag; private bool _startFrameDrag; - private readonly Color CurrentFrame_FrameCol = Color.FromArgb(0xCFEDFC); - private readonly Color CurrentFrame_InputLog = Color.FromArgb(0xB5E7F7); + public static Color CurrentFrame_FrameCol = Color.FromArgb(0xCFEDFC); + public static Color CurrentFrame_InputLog = Color.FromArgb(0xB5E7F7); - private readonly Color GreenZone_FrameCol = Color.FromArgb(0xDDFFDD); - private readonly Color GreenZone_InputLog = Color.FromArgb(0xC4F7C8); + public static Color GreenZone_FrameCol = Color.FromArgb(0xDDFFDD); + public static Color GreenZone_InputLog = Color.FromArgb(0xC4F7C8); - private readonly Color LagZone_FrameCol = Color.FromArgb(0xFFDCDD); - private readonly Color LagZone_InputLog = Color.FromArgb(0xF0D0D2); + public static Color LagZone_FrameCol = Color.FromArgb(0xFFDCDD); + public static Color LagZone_InputLog = Color.FromArgb(0xF0D0D2); - private readonly Color NoState_GreenZone_FrameCol = Color.FromArgb(0xF9FFF9); - private readonly Color NoState_GreenZone_InputLog = Color.FromArgb(0xE0FBE0); + public static Color NoState_GreenZone_FrameCol = Color.FromArgb(0xF9FFF9); + public static Color NoState_GreenZone_InputLog = Color.FromArgb(0xE0FBE0); - private readonly Color NoState_LagZone_FrameCol = Color.FromArgb(0xFFE9E9); - private readonly Color NoState_LagZone_InputLog = Color.FromArgb(0xF0D0D2); + public static Color NoState_LagZone_FrameCol = Color.FromArgb(0xFFE9E9); + public static Color NoState_LagZone_InputLog = Color.FromArgb(0xF0D0D2); - private readonly Color Marker_FrameCol = Color.FromArgb(0xF7FFC9); + public static Color Marker_FrameCol = Color.FromArgb(0xF7FFC9); #region Query callbacks diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 6941a81d19..1269415da3 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -67,6 +67,11 @@ namespace BizHawk.Client.EmuHawk } } + public TasMovie CurrentMovie + { + get { return _tas; } + } + public TAStudio() { InitializeComponent();