From c033b26ad00d26e0a3e74bff5d94e2a2a1277f08 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 29 Aug 2014 01:59:08 +0000 Subject: [PATCH] TasMovie - don't create a Bk2MnemonicConstants object everytime a display value is requested, gives a modest speed up to tastudio performance --- BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 7 +++---- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index 70f03f29a2..0c70055c74 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -12,6 +12,7 @@ namespace BizHawk.Client.Common { public sealed partial class TasMovie : Bk2Movie, INotifyPropertyChanged { + private readonly Bk2MnemonicConstants MnemonicConstants = new Bk2MnemonicConstants(); private List LagLog = new List(); private readonly TasStateManager StateManager; public TasMovieMarkerList Markers { get; set; } @@ -137,14 +138,12 @@ namespace BizHawk.Client.Common return CreateDisplayValueForButton(adapter, buttonName); } - public static string CreateDisplayValueForButton(IController adapter, string buttonName) + public string CreateDisplayValueForButton(IController adapter, string buttonName) { - var mnemonics = new Bk2MnemonicConstants(); - if (adapter.Type.BoolButtons.Contains(buttonName)) { return adapter.IsPressed(buttonName) ? - mnemonics[buttonName].ToString() : + MnemonicConstants[buttonName].ToString() : string.Empty; } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 499fc73719..4765947fc6 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -145,7 +145,7 @@ namespace BizHawk.Client.EmuHawk } else if (Global.Emulator.Frame == _currentTasMovie.InputLogLength) // In this situation we have a "pending" frame for the user to click { - text = TasMovie.CreateDisplayValueForButton( + text = _currentTasMovie.CreateDisplayValueForButton( Global.ClickyVirtualPadController, columnName); }