From c019ec3bf0b592662596a320db7a77fa49b32cba Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 7 Jul 2014 18:03:02 +0000 Subject: [PATCH] More reorg --- BizHawk.Client.Common/BizHawk.Client.Common.csproj | 4 ++-- BizHawk.Client.Common/movie/bk2/Bk2Movie.HeaderApi.cs | 2 +- BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs | 6 +++--- BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs | 2 +- BizHawk.Client.Common/movie/bk2/Bk2Movie.cs | 2 +- BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 4 ++-- .../movie/tasproj/{MovieRecord.cs => TasMovieRecord.cs} | 2 +- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename BizHawk.Client.Common/movie/tasproj/{MovieRecord.cs => TasMovieRecord.cs} (85%) diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj index 6045d2f843..a180a24049 100644 --- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj +++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj @@ -166,9 +166,9 @@ - - + + diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.HeaderApi.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.HeaderApi.cs index 2ad28efbee..041f1a26e3 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.HeaderApi.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.HeaderApi.cs @@ -169,7 +169,7 @@ namespace BizHawk.Client.Common } } - private string CommentsString() + protected string CommentsString() { var sb = new StringBuilder(); diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs index fc20e0be56..59e740004d 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs @@ -32,7 +32,7 @@ namespace BizHawk.Client.Common Write(backupName); } - public bool Load() + public virtual bool Load() { var file = new FileInfo(Filename); if (!file.Exists) @@ -137,7 +137,7 @@ namespace BizHawk.Client.Common return Load(); } - private void Write(string fn) + protected virtual void Write(string fn) { var file = new FileInfo(fn); if (!file.Directory.Exists) @@ -171,7 +171,7 @@ namespace BizHawk.Client.Common Changes = false; } - private void ClearBeforeLoad() + protected void ClearBeforeLoad() { Header.Clear(); _log.Clear(); diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs index 2557540b52..8448f08eaf 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs @@ -263,7 +263,7 @@ namespace BizHawk.Client.Common return true; } - private StringBuilder RawInputLog() + protected StringBuilder RawInputLog() { var lg = new Bk2LogEntryGenerator(_logKey); lg.SetSource(Global.MovieOutputHardpoint); diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs index 900540530c..e511a7b62c 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs @@ -34,7 +34,7 @@ namespace BizHawk.Client.Common public virtual string PreferredExtension { get { return Extension; } } public const string Extension = "bk2"; - public bool Changes { get; private set; } + public bool Changes { get; protected set; } public bool IsCountingRerecords { get; set; } public ILogEntryGenerator LogGeneratorInstance() diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index 87e1c5f313..22fda21b20 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -28,11 +28,11 @@ namespace BizHawk.Client.Common public new const string Extension = "tasproj"; - public MovieRecord this[int index] + public TasMovieRecord this[int index] { get { - return new MovieRecord // TODO + return new TasMovieRecord // TODO { State = null, LogEntry = "", diff --git a/BizHawk.Client.Common/movie/tasproj/MovieRecord.cs b/BizHawk.Client.Common/movie/tasproj/TasMovieRecord.cs similarity index 85% rename from BizHawk.Client.Common/movie/tasproj/MovieRecord.cs rename to BizHawk.Client.Common/movie/tasproj/TasMovieRecord.cs index ea3e29808a..9f474d59c0 100644 --- a/BizHawk.Client.Common/movie/tasproj/MovieRecord.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovieRecord.cs @@ -3,7 +3,7 @@ using System.Linq; namespace BizHawk.Client.Common { - public class MovieRecord + public class TasMovieRecord { public byte[] State { get; set; } public bool Lagged { get; set; } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 84bde70b28..d1a280ff14 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -575,7 +575,7 @@ namespace BizHawk.Client.EmuHawk } else if (TasView.IsPaintDown && e.NewCell.Row.HasValue && !string.IsNullOrEmpty(_startDrawColumn)) { - _tas.SetBoolButton(e.NewCell.Row.Value, _startDrawColumn, /*_startOn*/ false); // Notice it uses new row, old column, you can only paint across a single column + //_tas.SetBoolButton(e.NewCell.Row.Value, _startDrawColumn, /*_startOn*/ false); // Notice it uses new row, old column, you can only paint across a single column TasView.Refresh(); } }