From ce58f0e803c0edd501135edeb7523f09dcc0720b Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 14 Oct 2014 13:31:14 +0000 Subject: [PATCH] Tastudio/TasMovie - simplify some more code --- .../movie/tasproj/TasMovie.cs | 73 ++++++------------- .../movie/tasproj/TasStateManager.cs | 16 ++++ .../TAStudio/GreenzoneSettings.Designer.cs | 4 +- .../tools/TAStudio/GreenzoneSettings.cs | 4 +- .../tools/TAStudio/TAStudio.cs | 9 +-- 5 files changed, 46 insertions(+), 60 deletions(-) diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index e914d5a255..90d706c005 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -42,6 +42,26 @@ namespace BizHawk.Client.Common get { return Extension; } } + public TasStateManager TasStateManager + { + get { return StateManager; } + } + + public new const string Extension = "tasproj"; + + public TasMovieRecord this[int index] + { + get + { + return new TasMovieRecord + { + State = StateManager[index], + LogEntry = GetInputLogEntry(index), + Lagged = (index < LagLog.Count) ? LagLog[index] : (bool?)null + }; + } + } + public override bool Stop(bool saveChanges = true) { if (Changes) @@ -70,12 +90,12 @@ namespace BizHawk.Client.Common } } - //This event is Raised ony when Changes is TOGGLED. + // This event is Raised ony when Changes is TOGGLED. private void OnPropertyChanged(string propertyName) { if (PropertyChanged != null) { - //Raising the event when FirstName or LastName property value changed + // Raising the event when FirstName or LastName property value changed PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName)); } } @@ -87,21 +107,6 @@ namespace BizHawk.Client.Common #endregion - public new const string Extension = "tasproj"; - - public TasMovieRecord this[int index] - { - get - { - return new TasMovieRecord - { - State = StateManager[index], - LogEntry = GetInputLogEntry(index), - Lagged = (index < LagLog.Count) ? LagLog[index] : (bool?)null - }; - } - } - public void ClearChanges() { Changes = false; @@ -290,32 +295,6 @@ namespace BizHawk.Client.Common return string.Empty; } - public TasStateManager.ManagerSettings GreenzoneSettings - { - get { return StateManager.Settings; } - } - - public int LastEmulatedFrame - { - get - { - if (StateManager.StateCount > 0) - { - return StateManager.LastKey; - } - - return 0; - } - } - - /// - /// For the given frame, returns a savestate that is that frame or before it, as close as possible to it - /// - public byte[] GetStateClosestToFrame(int frame) - { - return StateManager.GetStateClosestToFrame(frame); - } - public void ClearGreenzone() { if (StateManager.Any()) @@ -324,13 +303,5 @@ namespace BizHawk.Client.Common Changes = true; } } - - public TasStateManager TasStateManager - { - get - { - return StateManager; - } - } } } diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs index 5a713d91be..b76dee9914 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs @@ -238,11 +238,27 @@ namespace BizHawk.Client.Common var kk = States.Keys; int index = kk.Count; if (index == 0) + { return 0; + } + return kk[index - 1]; } } + public int LastEmulatedFrame + { + get + { + if (StateCount > 0) + { + return LastKey; + } + + return 0; + } + } + public class ManagerSettings { public ManagerSettings() diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs index bb4ba6c841..5ee290431e 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.Designer.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace BizHawk.Client.EmuHawk { - public partial class GreenzoneSettings + public partial class GreenzoneSettingsForm { /// /// Required designer variable. @@ -35,7 +35,7 @@ namespace BizHawk.Client.EmuHawk /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GreenzoneSettings)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GreenzoneSettingsForm)); this.CancelBtn = new System.Windows.Forms.Button(); this.OkBtn = new System.Windows.Forms.Button(); this.SaveGreenzoneCheckbox = new System.Windows.Forms.CheckBox(); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs index e240ce11a7..256798569a 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/GreenzoneSettings.cs @@ -11,11 +11,11 @@ using BizHawk.Client.Common; namespace BizHawk.Client.EmuHawk { - public partial class GreenzoneSettings : Form + public partial class GreenzoneSettingsForm : Form { private readonly TasStateManager.ManagerSettings Settings; private decimal _stateSizeMb; - public GreenzoneSettings(TasStateManager.ManagerSettings settings) + public GreenzoneSettingsForm(TasStateManager.ManagerSettings settings) { Settings = settings; InitializeComponent(); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 30d1aaaf74..09df53118c 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -287,7 +287,7 @@ namespace BizHawk.Client.EmuHawk private void StartAtNearestFrameAndEmulate(int frame) { _currentTasMovie.SwitchToPlay(); - var closestState = _currentTasMovie.GetStateClosestToFrame(frame); + var closestState = _currentTasMovie.TasStateManager.GetStateClosestToFrame(frame); if (closestState != null) { LoadState(closestState.ToArray()); @@ -373,9 +373,9 @@ namespace BizHawk.Client.EmuHawk shouldLoadstate = false; } - if (_currentTasMovie.LastEmulatedFrame > 0 && shouldLoadstate) + if (_currentTasMovie.TasStateManager.LastEmulatedFrame > 0 && shouldLoadstate) { - LoadState(_currentTasMovie[_currentTasMovie.LastEmulatedFrame].State.ToArray()); + LoadState(_currentTasMovie[_currentTasMovie.TasStateManager.LastEmulatedFrame].State.ToArray()); } if (frame != Global.Emulator.Frame) // If we aren't already at our destination, seek @@ -972,12 +972,11 @@ namespace BizHawk.Client.EmuHawk { new MovieHeaderEditor(_currentTasMovie).Show(); UpdateChangesIndicator(); - } private void GreenzoneSettingsMenuItem_Click(object sender, EventArgs e) { - new GreenzoneSettings(_currentTasMovie.GreenzoneSettings).Show(); + new GreenzoneSettingsForm(_currentTasMovie.TasStateManager.Settings).Show(); UpdateChangesIndicator(); }