diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index f6373517c8..6d1df0167e 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -57,6 +57,7 @@
+
diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs
index 3acf490b47..91de5f80a6 100644
--- a/BizHawk.Client.Common/Global.cs
+++ b/BizHawk.Client.Common/Global.cs
@@ -6,5 +6,13 @@
public static Config Config;
public static GameInfo Game;
public static CheatList CheatList;
+
+ //Movie
+
+ ///
+ /// the global MovieSession can use this to deal with multitrack player remapping (should this be here? maybe it should be in MovieSession)
+ ///
+ public static MultitrackRewiringControllerAdapter MultitrackRewiringControllerAdapter = new MultitrackRewiringControllerAdapter();
+ public static MovieSession MovieSession = new MovieSession();
}
}
diff --git a/BizHawk.MultiClient/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
similarity index 91%
rename from BizHawk.MultiClient/movie/MovieSession.cs
rename to BizHawk.Client.Common/movie/MovieSession.cs
index c320f219ac..83695879ca 100644
--- a/BizHawk.MultiClient/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -1,6 +1,4 @@
-using BizHawk.Client.Common;
-
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
{
public class MovieSession
{
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 3d089cff31..5d261649a1 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -363,7 +363,6 @@
EditSubtitlesForm.cs
-
Form
diff --git a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs
index 5b6a272bec..d97ca491d9 100644
--- a/BizHawk.MultiClient/DisplayManager/DisplayManager.cs
+++ b/BizHawk.MultiClient/DisplayManager/DisplayManager.cs
@@ -342,14 +342,14 @@ namespace BizHawk.MultiClient
private string MakeFrameCounter()
{
- if (GlobalWinF.MovieSession.Movie.IsFinished)
+ if (Global.MovieSession.Movie.IsFinished)
{
StringBuilder s = new StringBuilder();
s.Append(Global.Emulator.Frame);
s.Append('/');
- if (GlobalWinF.MovieSession.Movie.Frames.HasValue)
+ if (Global.MovieSession.Movie.Frames.HasValue)
{
- s.Append(GlobalWinF.MovieSession.Movie.Frames);
+ s.Append(Global.MovieSession.Movie.Frames);
}
else
{
@@ -358,14 +358,14 @@ namespace BizHawk.MultiClient
s.Append(" (Finished)");
return s.ToString();
}
- else if (GlobalWinF.MovieSession.Movie.IsPlaying)
+ else if (Global.MovieSession.Movie.IsPlaying)
{
StringBuilder s = new StringBuilder();
s.Append(Global.Emulator.Frame);
s.Append('/');
- if (GlobalWinF.MovieSession.Movie.Frames.HasValue)
+ if (Global.MovieSession.Movie.Frames.HasValue)
{
- s.Append(GlobalWinF.MovieSession.Movie.Frames);
+ s.Append(Global.MovieSession.Movie.Frames);
}
else
{
@@ -373,7 +373,7 @@ namespace BizHawk.MultiClient
}
return s.ToString();
}
- else if (GlobalWinF.MovieSession.Movie.IsRecording)
+ else if (Global.MovieSession.Movie.IsRecording)
{
return Global.Emulator.Frame.ToString();
}
@@ -483,13 +483,13 @@ namespace BizHawk.MultiClient
public string MakeInputDisplay()
{
StringBuilder s;
- if (!GlobalWinF.MovieSession.Movie.IsActive || GlobalWinF.MovieSession.Movie.IsFinished)
+ if (!Global.MovieSession.Movie.IsActive || Global.MovieSession.Movie.IsFinished)
{
s = new StringBuilder(GlobalWinF.GetOutputControllersAsMnemonic());
}
else
{
- s = new StringBuilder(GlobalWinF.MovieSession.Movie.GetInput(Global.Emulator.Frame - 1));
+ s = new StringBuilder(Global.MovieSession.Movie.GetInput(Global.Emulator.Frame - 1));
}
s.Replace(".", " ").Replace("|", "").Replace(" 000, 000", " ");
@@ -499,9 +499,9 @@ namespace BizHawk.MultiClient
public string MakeRerecordCount()
{
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
- return "Rerecord Count: " + GlobalWinF.MovieSession.Movie.Rerecords.ToString();
+ return "Rerecord Count: " + Global.MovieSession.Movie.Rerecords.ToString();
}
else
{
@@ -528,7 +528,7 @@ namespace BizHawk.MultiClient
Color c;
float x = GetX(g, Global.Config.DispInpx, Global.Config.DispInpanchor, MessageFont, input);
float y = GetY(g, Global.Config.DispInpy, Global.Config.DispInpanchor, MessageFont, input);
- if (GlobalWinF.MovieSession.Movie.IsPlaying && !GlobalWinF.MovieSession.Movie.IsRecording)
+ if (Global.MovieSession.Movie.IsPlaying && !Global.MovieSession.Movie.IsRecording)
{
c = Color.FromArgb(Global.Config.MovieInput);
}
@@ -540,7 +540,7 @@ namespace BizHawk.MultiClient
g.DrawString(input, MessageFont, Color.Black, x+1,y+1);
g.DrawString(input, MessageFont, c, x,y);
}
- if (GlobalWinF.MovieSession.MultiTrack.IsActive)
+ if (Global.MovieSession.MultiTrack.IsActive)
{
float x = GetX(g, Global.Config.DispMultix, Global.Config.DispMultianchor, MessageFont, MT);
float y = GetY(g, Global.Config.DispMultiy, Global.Config.DispMultianchor, MessageFont, MT);
@@ -624,9 +624,9 @@ namespace BizHawk.MultiClient
// //g.DrawEllipse(new Pen(new SolidBrush(Color.Pink)), new Rectangle((int)g.ClipBounds.Width - 22, 2, 20, 20));
//}
- if (GlobalWinF.MovieSession.Movie.IsActive && Global.Config.DisplaySubtitles)
+ if (Global.MovieSession.Movie.IsActive && Global.Config.DisplaySubtitles)
{
- List s = GlobalWinF.MovieSession.Movie.Subtitles.GetSubtitles(Global.Emulator.Frame);
+ List s = Global.MovieSession.Movie.Subtitles.GetSubtitles(Global.Emulator.Frame);
if (s == null)
{
return;
diff --git a/BizHawk.MultiClient/GlobalWinF.cs b/BizHawk.MultiClient/GlobalWinF.cs
index 8816b63d7f..ce1b5ef693 100644
--- a/BizHawk.MultiClient/GlobalWinF.cs
+++ b/BizHawk.MultiClient/GlobalWinF.cs
@@ -31,13 +31,6 @@ namespace BizHawk.MultiClient
public static CopyControllerAdapter MovieInputSourceAdapter = new CopyControllerAdapter();
public static CopyControllerAdapter MovieOutputHardpoint = new CopyControllerAdapter();
- ///
- /// the global MovieSession can use this to deal with multitrack player remapping (should this be here? maybe it should be in MovieSession)
- ///
- public static MultitrackRewiringControllerAdapter MultitrackRewiringControllerAdapter = new MultitrackRewiringControllerAdapter();
-
- public static MovieSession MovieSession = new MovieSession();
-
//dont take my word for it, since the final word is actually in RewireInputChain, but here is a guide...
//user -> Input -> ActiveController -> UDLR -> StickyXORPlayerInputAdapter -> TurboAdapter(TBD) -> Lua(?TBD?) -> ..
//.. -> MultitrackRewiringControllerAdapter -> MovieInputSourceAdapter -> (MovieSession) -> MovieOutputAdapter -> ControllerOutput(1) -> Game
diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index 7bd96b557b..5bf2f5e6f5 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -858,9 +858,9 @@ namespace BizHawk.MultiClient
s.DisableFrame();
int index = -1;
Subtitle sub = new Subtitle();
- for (int x = 0; x < GlobalWinF.MovieSession.Movie.Subtitles.Count; x++)
+ for (int x = 0; x < Global.MovieSession.Movie.Subtitles.Count; x++)
{
- sub = GlobalWinF.MovieSession.Movie.Subtitles[x];
+ sub = Global.MovieSession.Movie.Subtitles[x];
if (Global.Emulator.Frame == sub.Frame)
{
index = x;
@@ -876,8 +876,8 @@ namespace BizHawk.MultiClient
if (s.ShowDialog() == DialogResult.OK)
{
if (index >= 0)
- GlobalWinF.MovieSession.Movie.Subtitles.RemoveAt(index);
- GlobalWinF.MovieSession.Movie.Subtitles.AddSubtitle(s.sub);
+ Global.MovieSession.Movie.Subtitles.RemoveAt(index);
+ Global.MovieSession.Movie.Subtitles.AddSubtitle(s.sub);
}
}
@@ -943,7 +943,7 @@ namespace BizHawk.MultiClient
cmiLoadLastRom.Visible = false;
toolStripSeparator_afterRomLoading.Visible = false;
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
cmiRecordMovie.Visible = false;
cmiPlayMovie.Visible = false;
@@ -1030,7 +1030,7 @@ namespace BizHawk.MultiClient
ShowMenuContextMenuSeparator.Visible = cmiShowMenu.Visible = false;
}
- ContextMenuStopMovieNoSaving.Visible = GlobalWinF.MovieSession.Movie.IsActive && GlobalWinF.MovieSession.Movie.HasChanges;
+ ContextMenuStopMovieNoSaving.Visible = Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie.HasChanges;
}
@@ -1045,7 +1045,7 @@ namespace BizHawk.MultiClient
private void makeMovieBackupToolStripMenuItem_Click(object sender, EventArgs e)
{
GlobalWinF.OSD.AddMessage("Backup movie saved.");
- GlobalWinF.MovieSession.Movie.WriteBackup();
+ Global.MovieSession.Movie.WriteBackup();
}
private void automaticallyBackupMoviesToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1099,20 +1099,20 @@ namespace BizHawk.MultiClient
private void viewCommentsToolStripMenuItem_Click(object sender, EventArgs e)
{
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
EditCommentsForm c = new EditCommentsForm { ReadOnly = ReadOnly };
- c.GetMovie(GlobalWinF.MovieSession.Movie);
+ c.GetMovie(Global.MovieSession.Movie);
c.ShowDialog();
}
}
private void viewSubtitlesToolStripMenuItem_Click(object sender, EventArgs e)
{
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
EditSubtitlesForm s = new EditSubtitlesForm { ReadOnly = ReadOnly };
- s.GetMovie(GlobalWinF.MovieSession.Movie);
+ s.GetMovie(Global.MovieSession.Movie);
s.ShowDialog();
}
}
@@ -1161,12 +1161,12 @@ namespace BizHawk.MultiClient
private void movieToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{
- fullMovieLoadstatesToolStripMenuItem.Enabled = !GlobalWinF.MovieSession.MultiTrack.IsActive;
- stopMovieWithoutSavingToolStripMenuItem.Enabled = GlobalWinF.MovieSession.Movie.IsActive && GlobalWinF.MovieSession.Movie.HasChanges;
+ fullMovieLoadstatesToolStripMenuItem.Enabled = !Global.MovieSession.MultiTrack.IsActive;
+ stopMovieWithoutSavingToolStripMenuItem.Enabled = Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie.HasChanges;
stopMovieToolStripMenuItem.Enabled
= playFromBeginningToolStripMenuItem.Enabled
= saveMovieToolStripMenuItem.Enabled
- = GlobalWinF.MovieSession.Movie.IsActive;
+ = Global.MovieSession.Movie.IsActive;
readonlyToolStripMenuItem.Checked = ReadOnly;
bindSavestatesToMoviesToolStripMenuItem.Checked = Global.Config.BindSavestatesToMovies;
@@ -1435,11 +1435,11 @@ namespace BizHawk.MultiClient
rebootCoreToolStripMenuItem.Enabled = !IsNullEmulator();
resetToolStripMenuItem.Enabled = Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset") &&
- (!GlobalWinF.MovieSession.Movie.IsPlaying || GlobalWinF.MovieSession.Movie.IsFinished);
+ (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished);
hardResetToolStripMenuItem.Enabled = Global.Emulator.ControllerDefinition.BoolButtons.Contains("Power") &&
- (!GlobalWinF.MovieSession.Movie.IsPlaying || GlobalWinF.MovieSession.Movie.IsFinished);
+ (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished);
pauseToolStripMenuItem.Checked = EmulatorPaused;
if (didMenuPause)
@@ -2215,7 +2215,7 @@ namespace BizHawk.MultiClient
string errorMsg;
string warningMsg;
- Movie m = MovieImport.ImportFile(filePaths[0], out errorMsg, out warningMsg);
+ Movie m = MovieImport.ImportFile(filePaths[0], GlobalWinF.MainForm.GetEmuVersion(), out errorMsg, out warningMsg);
if (errorMsg.Length > 0)
{
MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
diff --git a/BizHawk.MultiClient/MainForm.Movie.cs b/BizHawk.MultiClient/MainForm.Movie.cs
index 0d7bae3cd5..d189b54941 100644
--- a/BizHawk.MultiClient/MainForm.Movie.cs
+++ b/BizHawk.MultiClient/MainForm.Movie.cs
@@ -12,9 +12,9 @@ namespace BizHawk.MultiClient
public void ClearFrame()
{
- if (GlobalWinF.MovieSession.Movie.IsPlaying)
+ if (Global.MovieSession.Movie.IsPlaying)
{
- GlobalWinF.MovieSession.Movie.ClearFrame(Global.Emulator.Frame);
+ Global.MovieSession.Movie.ClearFrame(Global.Emulator.Frame);
GlobalWinF.OSD.AddMessage("Scrubbed input at frame " + Global.Emulator.Frame.ToString());
}
}
@@ -22,38 +22,38 @@ namespace BizHawk.MultiClient
public void StartNewMovie(Movie m, bool record)
{
//If a movie is already loaded, save it before starting a new movie
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
- GlobalWinF.MovieSession.Movie.WriteMovie();
+ Global.MovieSession.Movie.WriteMovie();
}
- GlobalWinF.MovieSession = new MovieSession {Movie = m};
+ Global.MovieSession = new MovieSession { Movie = m };
RewireInputChain();
if (!record)
{
- GlobalWinF.MovieSession.Movie.LoadMovie();
+ Global.MovieSession.Movie.LoadMovie();
SetSyncDependentSettings();
}
LoadRom(GlobalWinF.MainForm.CurrentlyOpenRom, true, !record);
Global.Config.RecentMovies.Add(m.Filename);
- if (GlobalWinF.MovieSession.Movie.StartsFromSavestate)
+ if (Global.MovieSession.Movie.StartsFromSavestate)
{
- LoadStateFile(GlobalWinF.MovieSession.Movie.Filename, Path.GetFileName(GlobalWinF.MovieSession.Movie.Filename));
+ LoadStateFile(Global.MovieSession.Movie.Filename, Path.GetFileName(Global.MovieSession.Movie.Filename));
Global.Emulator.ResetFrameCounter();
}
if (record)
{
GlobalWinF.MainForm.ClearSaveRAM();
- GlobalWinF.MovieSession.Movie.StartRecording();
+ Global.MovieSession.Movie.StartRecording();
ReadOnly = false;
}
else
{
GlobalWinF.MainForm.ClearSaveRAM();
- GlobalWinF.MovieSession.Movie.StartPlayback();
+ Global.MovieSession.Movie.StartPlayback();
}
SetMainformMovieInfo();
TAStudio1.Restart();
@@ -63,21 +63,21 @@ namespace BizHawk.MultiClient
public void SetMainformMovieInfo()
{
- if (GlobalWinF.MovieSession.Movie.IsPlaying)
+ if (Global.MovieSession.Movie.IsPlaying)
{
- Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(GlobalWinF.MovieSession.Movie.Filename);
+ Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
PlayRecordStatus.Image = Properties.Resources.Play;
PlayRecordStatus.ToolTipText = "Movie is in playback mode";
PlayRecordStatus.Visible = true;
}
- else if (GlobalWinF.MovieSession.Movie.IsRecording)
+ else if (Global.MovieSession.Movie.IsRecording)
{
- Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(GlobalWinF.MovieSession.Movie.Filename);
+ Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
PlayRecordStatus.Image = Properties.Resources.RecordHS;
PlayRecordStatus.ToolTipText = "Movie is in record mode";
PlayRecordStatus.Visible = true;
}
- else if (!GlobalWinF.MovieSession.Movie.IsActive)
+ else if (!Global.MovieSession.Movie.IsActive)
{
Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name;
PlayRecordStatus.Image = Properties.Resources.Blank;
@@ -112,16 +112,16 @@ namespace BizHawk.MultiClient
public void PlayMovieFromBeginning()
{
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
LoadRom(CurrentlyOpenRom, true, true);
- if (GlobalWinF.MovieSession.Movie.StartsFromSavestate)
+ if (Global.MovieSession.Movie.StartsFromSavestate)
{
- LoadStateFile(GlobalWinF.MovieSession.Movie.Filename, Path.GetFileName(GlobalWinF.MovieSession.Movie.Filename));
+ LoadStateFile(Global.MovieSession.Movie.Filename, Path.GetFileName(Global.MovieSession.Movie.Filename));
Global.Emulator.ResetFrameCounter();
}
GlobalWinF.MainForm.ClearSaveRAM();
- GlobalWinF.MovieSession.Movie.StartPlayback();
+ Global.MovieSession.Movie.StartPlayback();
SetMainformMovieInfo();
GlobalWinF.OSD.AddMessage("Replaying movie file in read-only mode");
GlobalWinF.MainForm.ReadOnly = true;
@@ -131,23 +131,23 @@ namespace BizHawk.MultiClient
public void StopMovie(bool abortchanges = false)
{
string message = "Movie ";
- if (GlobalWinF.MovieSession.Movie.IsRecording)
+ if (Global.MovieSession.Movie.IsRecording)
{
message += "recording ";
}
- else if (GlobalWinF.MovieSession.Movie.IsPlaying)
+ else if (Global.MovieSession.Movie.IsPlaying)
{
message += "playback ";
}
message += "stopped.";
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
- GlobalWinF.MovieSession.Movie.Stop(abortchanges);
+ Global.MovieSession.Movie.Stop(abortchanges);
if (!abortchanges)
{
- GlobalWinF.OSD.AddMessage(Path.GetFileName(GlobalWinF.MovieSession.Movie.Filename) + " written to disk.");
+ GlobalWinF.OSD.AddMessage(Path.GetFileName(Global.MovieSession.Movie.Filename) + " written to disk.");
}
GlobalWinF.OSD.AddMessage(message);
GlobalWinF.MainForm.ReadOnly = true;
@@ -176,20 +176,20 @@ namespace BizHawk.MultiClient
{
string ErrorMSG = String.Empty;
//Note, some of the situations in these IF's may be identical and could be combined but I intentionally separated it out for clarity
- if (!GlobalWinF.MovieSession.Movie.IsActive)
+ if (!Global.MovieSession.Movie.IsActive)
{
return true;
}
- else if (GlobalWinF.MovieSession.Movie.IsRecording)
+ else if (Global.MovieSession.Movie.IsRecording)
{
if (ReadOnly)
{
- var result = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: false, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
+ var result = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: false, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
if (result == Movie.LoadStateResult.Pass)
{
- GlobalWinF.MovieSession.Movie.WriteMovie();
- GlobalWinF.MovieSession.Movie.SwitchToPlay();
+ Global.MovieSession.Movie.WriteMovie();
+ Global.MovieSession.Movie.SwitchToPlay();
SetMainformMovieInfo();
return true;
}
@@ -202,11 +202,11 @@ namespace BizHawk.MultiClient
MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (dresult == DialogResult.Yes)
{
- var newresult = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: false, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
+ var newresult = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: false, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
if (newresult == Movie.LoadStateResult.Pass)
{
- GlobalWinF.MovieSession.Movie.WriteMovie();
- GlobalWinF.MovieSession.Movie.SwitchToPlay();
+ Global.MovieSession.Movie.WriteMovie();
+ Global.MovieSession.Movie.SwitchToPlay();
SetMainformMovieInfo();
return true;
}
@@ -230,12 +230,12 @@ namespace BizHawk.MultiClient
}
else
{
- var result = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: true, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
+ var result = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: true, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
if (result == Movie.LoadStateResult.Pass)
{
reader.BaseStream.Position = 0;
reader.DiscardBufferedData();
- GlobalWinF.MovieSession.Movie.LoadLogFromSavestateText(reader, GlobalWinF.MovieSession.MultiTrack.IsActive);
+ Global.MovieSession.Movie.LoadLogFromSavestateText(reader, Global.MovieSession.MultiTrack.IsActive);
}
else
{
@@ -246,12 +246,12 @@ namespace BizHawk.MultiClient
MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (dresult == DialogResult.Yes)
{
- var newresult = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: false, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
+ var newresult = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: false, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
if (newresult == Movie.LoadStateResult.Pass)
{
reader.BaseStream.Position = 0;
reader.DiscardBufferedData();
- GlobalWinF.MovieSession.Movie.LoadLogFromSavestateText(reader, GlobalWinF.MovieSession.MultiTrack.IsActive);
+ Global.MovieSession.Movie.LoadLogFromSavestateText(reader, Global.MovieSession.MultiTrack.IsActive);
return true;
}
else
@@ -274,11 +274,11 @@ namespace BizHawk.MultiClient
}
}
- else if (GlobalWinF.MovieSession.Movie.IsPlaying && !GlobalWinF.MovieSession.Movie.IsFinished)
+ else if (Global.MovieSession.Movie.IsPlaying && !Global.MovieSession.Movie.IsFinished)
{
if (ReadOnly)
{
- var result = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
+ var result = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
if (result == Movie.LoadStateResult.Pass)
{
//Frame loop automatically handles the rewinding effect based on Global.Emulator.Frame so nothing else is needed here
@@ -293,7 +293,7 @@ namespace BizHawk.MultiClient
MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (dresult == DialogResult.Yes)
{
- var newresult = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
+ var newresult = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
if (newresult == Movie.LoadStateResult.Pass)
{
return true;
@@ -318,14 +318,14 @@ namespace BizHawk.MultiClient
}
else
{
- var result = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
+ var result = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
if (result == Movie.LoadStateResult.Pass)
{
- GlobalWinF.MovieSession.Movie.SwitchToRecord();
+ Global.MovieSession.Movie.SwitchToRecord();
SetMainformMovieInfo();
reader.BaseStream.Position = 0;
reader.DiscardBufferedData();
- GlobalWinF.MovieSession.Movie.LoadLogFromSavestateText(reader, GlobalWinF.MovieSession.MultiTrack.IsActive);
+ Global.MovieSession.Movie.LoadLogFromSavestateText(reader, Global.MovieSession.MultiTrack.IsActive);
return true;
}
else
@@ -337,14 +337,14 @@ namespace BizHawk.MultiClient
MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (dresult == DialogResult.Yes)
{
- var newresult = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
+ var newresult = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
if (newresult == Movie.LoadStateResult.Pass)
{
- GlobalWinF.MovieSession.Movie.SwitchToRecord();
+ Global.MovieSession.Movie.SwitchToRecord();
SetMainformMovieInfo();
reader.BaseStream.Position = 0;
reader.DiscardBufferedData();
- GlobalWinF.MovieSession.Movie.LoadLogFromSavestateText(reader, GlobalWinF.MovieSession.MultiTrack.IsActive);
+ Global.MovieSession.Movie.LoadLogFromSavestateText(reader, Global.MovieSession.MultiTrack.IsActive);
return true;
}
else
@@ -366,11 +366,11 @@ namespace BizHawk.MultiClient
}
}
}
- else if (GlobalWinF.MovieSession.Movie.IsFinished)
+ else if (Global.MovieSession.Movie.IsFinished)
{
if (ReadOnly)
{
- var result = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
+ var result = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
if (result != Movie.LoadStateResult.Pass)
{
if (result == Movie.LoadStateResult.GuidMismatch)
@@ -380,10 +380,10 @@ namespace BizHawk.MultiClient
MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (dresult == DialogResult.Yes)
{
- var newresult = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
+ var newresult = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
if (newresult == Movie.LoadStateResult.Pass)
{
- GlobalWinF.MovieSession.Movie.SwitchToPlay();
+ Global.MovieSession.Movie.SwitchToPlay();
SetMainformMovieInfo();
return true;
}
@@ -404,27 +404,27 @@ namespace BizHawk.MultiClient
return false;
}
}
- else if (GlobalWinF.MovieSession.Movie.IsFinished) //TimeLine check can change a movie to finished, hence the check here (not a good design)
+ else if (Global.MovieSession.Movie.IsFinished) //TimeLine check can change a movie to finished, hence the check here (not a good design)
{
- GlobalWinF.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
+ Global.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
}
else
{
- GlobalWinF.MovieSession.Movie.SwitchToPlay();
+ Global.MovieSession.Movie.SwitchToPlay();
SetMainformMovieInfo();
}
}
else
{
- var result = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
+ var result = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: false, ErrorMessage: out ErrorMSG);
if (result == Movie.LoadStateResult.Pass)
{
GlobalWinF.MainForm.ClearSaveRAM();
- GlobalWinF.MovieSession.Movie.StartRecording();
+ Global.MovieSession.Movie.StartRecording();
SetMainformMovieInfo();
reader.BaseStream.Position = 0;
reader.DiscardBufferedData();
- GlobalWinF.MovieSession.Movie.LoadLogFromSavestateText(reader, GlobalWinF.MovieSession.MultiTrack.IsActive);
+ Global.MovieSession.Movie.LoadLogFromSavestateText(reader, Global.MovieSession.MultiTrack.IsActive);
return true;
}
else
@@ -436,15 +436,15 @@ namespace BizHawk.MultiClient
MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (dresult == DialogResult.Yes)
{
- var newresult = GlobalWinF.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
+ var newresult = Global.MovieSession.Movie.CheckTimeLines(reader, OnlyGUID: !ReadOnly, IgnoreGuidMismatch: true, ErrorMessage: out ErrorMSG);
if (newresult == Movie.LoadStateResult.Pass)
{
GlobalWinF.MainForm.ClearSaveRAM();
- GlobalWinF.MovieSession.Movie.StartRecording();
+ Global.MovieSession.Movie.StartRecording();
SetMainformMovieInfo();
reader.BaseStream.Position = 0;
reader.DiscardBufferedData();
- GlobalWinF.MovieSession.Movie.LoadLogFromSavestateText(reader, GlobalWinF.MovieSession.MultiTrack.IsActive);
+ Global.MovieSession.Movie.LoadLogFromSavestateText(reader, Global.MovieSession.MultiTrack.IsActive);
return true;
}
else
@@ -472,88 +472,88 @@ namespace BizHawk.MultiClient
private void HandleMovieSaveState(StreamWriter writer)
{
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
- GlobalWinF.MovieSession.Movie.DumpLogIntoSavestateText(writer);
+ Global.MovieSession.Movie.DumpLogIntoSavestateText(writer);
}
}
private void HandleMovieOnFrameLoop()
{
- if (!GlobalWinF.MovieSession.Movie.IsActive)
+ if (!Global.MovieSession.Movie.IsActive)
{
- GlobalWinF.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
+ Global.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
}
- else if (GlobalWinF.MovieSession.Movie.IsFinished)
+ else if (Global.MovieSession.Movie.IsFinished)
{
- if (Global.Emulator.Frame < GlobalWinF.MovieSession.Movie.Frames) //This scenario can happen from rewinding (suddenly we are back in the movie, so hook back up to the movie
+ if (Global.Emulator.Frame < Global.MovieSession.Movie.Frames) //This scenario can happen from rewinding (suddenly we are back in the movie, so hook back up to the movie
{
- GlobalWinF.MovieSession.Movie.SwitchToPlay();
- GlobalWinF.MovieSession.LatchInputFromLog();
+ Global.MovieSession.Movie.SwitchToPlay();
+ Global.MovieSession.LatchInputFromLog();
}
else
{
- GlobalWinF.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
+ Global.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
}
}
- else if (GlobalWinF.MovieSession.Movie.IsPlaying)
+ else if (Global.MovieSession.Movie.IsPlaying)
{
- if (Global.Emulator.Frame >= GlobalWinF.MovieSession.Movie.Frames)
+ if (Global.Emulator.Frame >= Global.MovieSession.Movie.Frames)
{
if (TAStudio1.IsHandleCreated && !TAStudio1.IsDisposed)
{
- GlobalWinF.MovieSession.Movie.CaptureState();
- GlobalWinF.MovieSession.LatchInputFromLog();
- GlobalWinF.MovieSession.Movie.CommitFrame(Global.Emulator.Frame, GlobalWinF.MovieOutputHardpoint);
+ Global.MovieSession.Movie.CaptureState();
+ Global.MovieSession.LatchInputFromLog();
+ Global.MovieSession.Movie.CommitFrame(Global.Emulator.Frame, GlobalWinF.MovieOutputHardpoint);
}
else
{
- GlobalWinF.MovieSession.Movie.Finish();
+ Global.MovieSession.Movie.Finish();
}
}
else
{
- GlobalWinF.MovieSession.Movie.CaptureState();
- GlobalWinF.MovieSession.LatchInputFromLog();
+ Global.MovieSession.Movie.CaptureState();
+ Global.MovieSession.LatchInputFromLog();
if (GlobalWinF.ClientControls["ClearFrame"])
{
- GlobalWinF.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
+ Global.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
ClearFrame();
}
else if (TAStudio1.IsHandleCreated && !TAStudio1.IsDisposed || Global.Config.MoviePlaybackPokeMode)
{
- GlobalWinF.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
+ Global.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
MnemonicsGenerator mg = new MnemonicsGenerator();
mg.SetSource( GlobalWinF.MovieOutputHardpoint);
if (!mg.IsEmpty)
{
- GlobalWinF.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
- GlobalWinF.MovieSession.Movie.PokeFrame(Global.Emulator.Frame, mg.GetControllersAsMnemonic());
+ Global.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
+ Global.MovieSession.Movie.PokeFrame(Global.Emulator.Frame, mg.GetControllersAsMnemonic());
}
else
{
- GlobalWinF.MovieSession.LatchInputFromLog();
+ Global.MovieSession.LatchInputFromLog();
}
}
}
}
- else if (GlobalWinF.MovieSession.Movie.IsRecording)
+ else if (Global.MovieSession.Movie.IsRecording)
{
- GlobalWinF.MovieSession.Movie.CaptureState();
- if (GlobalWinF.MovieSession.MultiTrack.IsActive)
+ Global.MovieSession.Movie.CaptureState();
+ if (Global.MovieSession.MultiTrack.IsActive)
{
- GlobalWinF.MovieSession.LatchMultitrackPlayerInput(GlobalWinF.MovieInputSourceAdapter, GlobalWinF.MultitrackRewiringControllerAdapter);
+ Global.MovieSession.LatchMultitrackPlayerInput(GlobalWinF.MovieInputSourceAdapter, Global.MultitrackRewiringControllerAdapter);
}
else
{
- GlobalWinF.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
+ Global.MovieSession.LatchInputFromPlayer(GlobalWinF.MovieInputSourceAdapter);
}
//the movie session makes sure that the correct input has been read and merged to its MovieControllerAdapter;
//this has been wired to Global.MovieOutputHardpoint in RewireInputChain
- GlobalWinF.MovieSession.Movie.CommitFrame(Global.Emulator.Frame, GlobalWinF.MovieOutputHardpoint);
+ Global.MovieSession.Movie.CommitFrame(Global.Emulator.Frame, GlobalWinF.MovieOutputHardpoint);
}
}
@@ -563,7 +563,7 @@ namespace BizHawk.MultiClient
switch (Global.Emulator.SystemId)
{
case "Coleco":
- string str = GlobalWinF.MovieSession.Movie.Header.GetHeaderLine(MovieHeader.SKIPBIOS);
+ string str = Global.MovieSession.Movie.Header.GetHeaderLine(MovieHeader.SKIPBIOS);
if (!String.IsNullOrWhiteSpace(str))
{
if (str.ToLower() == "true")
diff --git a/BizHawk.MultiClient/MainForm.Rewind.cs b/BizHawk.MultiClient/MainForm.Rewind.cs
index 97a040f033..d34d61023e 100644
--- a/BizHawk.MultiClient/MainForm.Rewind.cs
+++ b/BizHawk.MultiClient/MainForm.Rewind.cs
@@ -603,7 +603,7 @@ namespace BizHawk.MultiClient
{
for (int i = 0; i < frames; i++)
{
- if (RewindBuf.Count == 0 || (GlobalWinF.MovieSession.Movie.Loaded && 0 == GlobalWinF.MovieSession.Movie.Frames))
+ if (RewindBuf.Count == 0 || (Global.MovieSession.Movie.Loaded && 0 == Global.MovieSession.Movie.Frames))
return;
if (LastState.Length < 0x10000)
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index fddad293ab..445826a724 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -180,7 +180,7 @@ namespace BizHawk.MultiClient
public MainForm(string[] args)
{
GlobalWinF.MainForm = this;
- GlobalWinF.MovieSession = new MovieSession { Movie = new Movie(GlobalWinF.MainForm.GetEmuVersion()) };
+ Global.MovieSession = new MovieSession { Movie = new Movie(GlobalWinF.MainForm.GetEmuVersion()) };
MainWait = new AutoResetEvent(false);
Icon = Properties.Resources.logo;
InitializeComponent();
@@ -226,7 +226,7 @@ namespace BizHawk.MultiClient
{
Global.CheatList.SaveOnClose();
CloseGame();
- GlobalWinF.MovieSession.Movie.Stop();
+ Global.MovieSession.Movie.Stop();
CloseTools();
SaveConfig();
};
@@ -938,7 +938,7 @@ namespace BizHawk.MultiClient
{
if (Global.Emulator.ControllerDefinition.BoolButtons.Contains(button))
{
- if (!GlobalWinF.MovieSession.Movie.IsPlaying || GlobalWinF.MovieSession.Movie.IsFinished)
+ if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{
GlobalWinF.ClickyVirtualPadController.Click(button);
GlobalWinF.OSD.AddMessage(msg);
@@ -1057,19 +1057,19 @@ namespace BizHawk.MultiClient
GlobalWinF.StickyXORAdapter.Source = GlobalWinF.UD_LR_ControllerAdapter;
GlobalWinF.AutofireStickyXORAdapter.Source = GlobalWinF.StickyXORAdapter;
- GlobalWinF.MultitrackRewiringControllerAdapter.Source = GlobalWinF.AutofireStickyXORAdapter;
- GlobalWinF.ForceOffAdaptor.Source = GlobalWinF.MultitrackRewiringControllerAdapter;
+ Global.MultitrackRewiringControllerAdapter.Source = GlobalWinF.AutofireStickyXORAdapter;
+ GlobalWinF.ForceOffAdaptor.Source = Global.MultitrackRewiringControllerAdapter;
GlobalWinF.MovieInputSourceAdapter.Source = GlobalWinF.ForceOffAdaptor;
GlobalWinF.ControllerOutput.Source = GlobalWinF.MovieOutputHardpoint;
Global.Emulator.Controller = GlobalWinF.ControllerOutput;
- GlobalWinF.MovieSession.MovieControllerAdapter.Type = GlobalWinF.MovieInputSourceAdapter.Type;
+ Global.MovieSession.MovieControllerAdapter.Type = GlobalWinF.MovieInputSourceAdapter.Type;
//connect the movie session before MovieOutputHardpoint if it is doing anything
//otherwise connect the MovieInputSourceAdapter to it, effectively bypassing the movie session
- if (GlobalWinF.MovieSession.Movie != null)
- GlobalWinF.MovieOutputHardpoint.Source = GlobalWinF.MovieSession.MovieControllerAdapter;
+ if (Global.MovieSession.Movie != null)
+ GlobalWinF.MovieOutputHardpoint.Source = Global.MovieSession.MovieControllerAdapter;
else
GlobalWinF.MovieOutputHardpoint.Source = GlobalWinF.MovieInputSourceAdapter;
}
@@ -1343,7 +1343,7 @@ namespace BizHawk.MultiClient
}
}
- NES nes = new NES(nextComm, game, rom.FileData, bios, GlobalWinF.MovieSession.Movie.Header.BoardProperties)
+ NES nes = new NES(nextComm, game, rom.FileData, bios, Global.MovieSession.Movie.Header.BoardProperties)
{
SoundOn = Global.Config.SoundEnabled,
NTSC_FirstDrawLine = Global.Config.NTSC_NESTopLine,
@@ -2046,7 +2046,7 @@ namespace BizHawk.MultiClient
case "Play from beginning": PlayMovieFromBeginning(); break;
case "Save Movie": SaveMovie(); break;
case "Toggle MultiTrack":
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
if (Global.Config.VBAStyleMovieLoadState)
@@ -2055,8 +2055,8 @@ namespace BizHawk.MultiClient
}
else
{
- GlobalWinF.MovieSession.MultiTrack.IsActive = !GlobalWinF.MovieSession.MultiTrack.IsActive;
- if (GlobalWinF.MovieSession.MultiTrack.IsActive)
+ Global.MovieSession.MultiTrack.IsActive = !Global.MovieSession.MultiTrack.IsActive;
+ if (Global.MovieSession.MultiTrack.IsActive)
{
GlobalWinF.OSD.AddMessage("MultiTrack Enabled");
GlobalWinF.OSD.MT = "Recording None";
@@ -2065,8 +2065,8 @@ namespace BizHawk.MultiClient
{
GlobalWinF.OSD.AddMessage("MultiTrack Disabled");
}
- GlobalWinF.MovieSession.MultiTrack.RecordAll = false;
- GlobalWinF.MovieSession.MultiTrack.CurrentPlayer = 0;
+ Global.MovieSession.MultiTrack.RecordAll = false;
+ Global.MovieSession.MultiTrack.CurrentPlayer = 0;
}
}
else
@@ -2076,35 +2076,35 @@ namespace BizHawk.MultiClient
GlobalWinF.DisplayManager.NeedsToPaint = true;
break;
case "MT Select All":
- GlobalWinF.MovieSession.MultiTrack.CurrentPlayer = 0;
- GlobalWinF.MovieSession.MultiTrack.RecordAll = true;
+ Global.MovieSession.MultiTrack.CurrentPlayer = 0;
+ Global.MovieSession.MultiTrack.RecordAll = true;
GlobalWinF.OSD.MT = "Recording All";
GlobalWinF.DisplayManager.NeedsToPaint = true;
break;
case "MT Select None":
- GlobalWinF.MovieSession.MultiTrack.CurrentPlayer = 0;
- GlobalWinF.MovieSession.MultiTrack.RecordAll = false;
+ Global.MovieSession.MultiTrack.CurrentPlayer = 0;
+ Global.MovieSession.MultiTrack.RecordAll = false;
GlobalWinF.OSD.MT = "Recording None";
GlobalWinF.DisplayManager.NeedsToPaint = true;
break;
case "MT Increment Player":
- GlobalWinF.MovieSession.MultiTrack.CurrentPlayer++;
- GlobalWinF.MovieSession.MultiTrack.RecordAll = false;
- if (GlobalWinF.MovieSession.MultiTrack.CurrentPlayer > 5) //TODO: Replace with console's maximum or current maximum players??!
+ Global.MovieSession.MultiTrack.CurrentPlayer++;
+ Global.MovieSession.MultiTrack.RecordAll = false;
+ if (Global.MovieSession.MultiTrack.CurrentPlayer > 5) //TODO: Replace with console's maximum or current maximum players??!
{
- GlobalWinF.MovieSession.MultiTrack.CurrentPlayer = 1;
+ Global.MovieSession.MultiTrack.CurrentPlayer = 1;
}
- GlobalWinF.OSD.MT = "Recording Player " + GlobalWinF.MovieSession.MultiTrack.CurrentPlayer.ToString();
+ GlobalWinF.OSD.MT = "Recording Player " + Global.MovieSession.MultiTrack.CurrentPlayer.ToString();
GlobalWinF.DisplayManager.NeedsToPaint = true;
break;
case "MT Decrement Player":
- GlobalWinF.MovieSession.MultiTrack.CurrentPlayer--;
- GlobalWinF.MovieSession.MultiTrack.RecordAll = false;
- if (GlobalWinF.MovieSession.MultiTrack.CurrentPlayer < 1)
+ Global.MovieSession.MultiTrack.CurrentPlayer--;
+ Global.MovieSession.MultiTrack.RecordAll = false;
+ if (Global.MovieSession.MultiTrack.CurrentPlayer < 1)
{
- GlobalWinF.MovieSession.MultiTrack.CurrentPlayer = 5;//TODO: Replace with console's maximum or current maximum players??!
+ Global.MovieSession.MultiTrack.CurrentPlayer = 5;//TODO: Replace with console's maximum or current maximum players??!
}
- GlobalWinF.OSD.MT = "Recording Player " + GlobalWinF.MovieSession.MultiTrack.CurrentPlayer.ToString();
+ GlobalWinF.OSD.MT = "Recording Player " + Global.MovieSession.MultiTrack.CurrentPlayer.ToString();
GlobalWinF.DisplayManager.NeedsToPaint = true;
break;
case "Movie Poke": ToggleModePokeMode(); break;
@@ -2211,7 +2211,7 @@ namespace BizHawk.MultiClient
runFrame = true;
}
- bool ReturnToRecording = GlobalWinF.MovieSession.Movie.IsRecording;
+ bool ReturnToRecording = Global.MovieSession.Movie.IsRecording;
if (RewindActive && (GlobalWinF.ClientControls["Rewind"] || PressRewind))
{
Rewind(1);
@@ -2225,17 +2225,17 @@ namespace BizHawk.MultiClient
runFrame = true;
}
//we don't want to capture input when rewinding, even in record mode
- if (GlobalWinF.MovieSession.Movie.IsRecording)
+ if (Global.MovieSession.Movie.IsRecording)
{
- GlobalWinF.MovieSession.Movie.SwitchToPlay();
+ Global.MovieSession.Movie.SwitchToPlay();
}
}
if (UpdateFrame)
{
runFrame = true;
- if (GlobalWinF.MovieSession.Movie.IsRecording)
+ if (Global.MovieSession.Movie.IsRecording)
{
- GlobalWinF.MovieSession.Movie.SwitchToPlay();
+ Global.MovieSession.Movie.SwitchToPlay();
}
}
@@ -2319,7 +2319,7 @@ namespace BizHawk.MultiClient
UpdateToolsAfter();
if (ReturnToRecording)
{
- GlobalWinF.MovieSession.Movie.SwitchToRecord();
+ Global.MovieSession.Movie.SwitchToRecord();
}
PressRewind = false;
}
@@ -2327,7 +2327,7 @@ namespace BizHawk.MultiClient
{
if (ReturnToRecording)
{
- GlobalWinF.MovieSession.Movie.SwitchToRecord();
+ Global.MovieSession.Movie.SwitchToRecord();
}
UpdateFrame = false;
}
@@ -2535,7 +2535,7 @@ namespace BizHawk.MultiClient
bw.Flush();
});
}
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
bs.PutInputLog(
delegate(Stream s)
@@ -2589,7 +2589,7 @@ namespace BizHawk.MultiClient
{
bool succeed = false;
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
bw.GetInputLogRequired(
delegate(Stream s)
@@ -3011,9 +3011,9 @@ namespace BizHawk.MultiClient
{
string PluginToUse = "";
- if (hasmovie && GlobalWinF.MovieSession.Movie.Header.HeaderParams[MovieHeader.PLATFORM] == "N64" && GlobalWinF.MovieSession.Movie.Header.HeaderParams.ContainsKey(MovieHeader.VIDEOPLUGIN))
+ if (hasmovie && Global.MovieSession.Movie.Header.HeaderParams[MovieHeader.PLATFORM] == "N64" && Global.MovieSession.Movie.Header.HeaderParams.ContainsKey(MovieHeader.VIDEOPLUGIN))
{
- PluginToUse = GlobalWinF.MovieSession.Movie.Header.HeaderParams[MovieHeader.VIDEOPLUGIN];
+ PluginToUse = Global.MovieSession.Movie.Header.HeaderParams[MovieHeader.VIDEOPLUGIN];
}
if (PluginToUse == "" || (PluginToUse != "Rice" && PluginToUse != "Glide64"))
@@ -3039,14 +3039,14 @@ namespace BizHawk.MultiClient
video_settings.Parameters = Global.Config.Glide64mk2Plugin.GetPluginSettings();
}
- if (hasmovie && GlobalWinF.MovieSession.Movie.Header.HeaderParams[MovieHeader.PLATFORM] == "N64" && GlobalWinF.MovieSession.Movie.Header.HeaderParams.ContainsKey(MovieHeader.VIDEOPLUGIN))
+ if (hasmovie && Global.MovieSession.Movie.Header.HeaderParams[MovieHeader.PLATFORM] == "N64" && Global.MovieSession.Movie.Header.HeaderParams.ContainsKey(MovieHeader.VIDEOPLUGIN))
{
List settings = new List(video_settings.Parameters.Keys);
foreach (string setting in settings)
{
- if (GlobalWinF.MovieSession.Movie.Header.HeaderParams.ContainsKey(setting))
+ if (Global.MovieSession.Movie.Header.HeaderParams.ContainsKey(setting))
{
- string Value = GlobalWinF.MovieSession.Movie.Header.HeaderParams[setting];
+ string Value = Global.MovieSession.Movie.Header.HeaderParams[setting];
if (video_settings.Parameters[setting] is bool)
{
try
@@ -3325,7 +3325,7 @@ namespace BizHawk.MultiClient
Global.Emulator = new NullEmulator(GlobalWinF.CoreComm);
GlobalWinF.ActiveController = GlobalWinF.NullControls;
GlobalWinF.AutoFireController = GlobalWinF.AutofireNullControls;
- GlobalWinF.MovieSession.Movie.Stop();
+ Global.MovieSession.Movie.Stop();
NeedsReboot = false;
SetRebootIconStatus();
}
@@ -3450,7 +3450,7 @@ namespace BizHawk.MultiClient
public void ToggleReadOnly()
{
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
ReadOnly ^= true;
if (ReadOnly)
@@ -3527,7 +3527,7 @@ namespace BizHawk.MultiClient
//is it enough to run this for one frame? maybe..
if (Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset"))
{
- if (!GlobalWinF.MovieSession.Movie.IsPlaying || GlobalWinF.MovieSession.Movie.IsFinished)
+ if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{
GlobalWinF.ClickyVirtualPadController.Click("Reset");
GlobalWinF.OSD.AddMessage("Reset button pressed.");
@@ -3540,7 +3540,7 @@ namespace BizHawk.MultiClient
//is it enough to run this for one frame? maybe..
if (Global.Emulator.ControllerDefinition.BoolButtons.Contains("Power"))
{
- if (!GlobalWinF.MovieSession.Movie.IsPlaying || GlobalWinF.MovieSession.Movie.IsFinished)
+ if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{
GlobalWinF.ClickyVirtualPadController.Click("Power");
GlobalWinF.OSD.AddMessage("Power button pressed.");
@@ -3982,7 +3982,7 @@ namespace BizHawk.MultiClient
string d = PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPath, null);
string errorMsg;
string warningMsg;
- Movie m = MovieImport.ImportFile(fn, out errorMsg, out warningMsg);
+ Movie m = MovieImport.ImportFile(fn, GlobalWinF.MainForm.GetEmuVersion(), out errorMsg, out warningMsg);
if (errorMsg.Length > 0)
MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
if (warningMsg.Length > 0)
@@ -4202,10 +4202,10 @@ namespace BizHawk.MultiClient
private void SaveMovie()
{
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
- GlobalWinF.MovieSession.Movie.WriteMovie();
- GlobalWinF.OSD.AddMessage(GlobalWinF.MovieSession.Movie.Filename + " saved.");
+ Global.MovieSession.Movie.WriteMovie();
+ GlobalWinF.OSD.AddMessage(Global.MovieSession.Movie.Filename + " saved.");
}
}
diff --git a/BizHawk.MultiClient/config/PathManager.cs b/BizHawk.MultiClient/config/PathManager.cs
index 31daf6cb6e..16c47670bf 100644
--- a/BizHawk.MultiClient/config/PathManager.cs
+++ b/BizHawk.MultiClient/config/PathManager.cs
@@ -230,9 +230,9 @@ namespace BizHawk.MultiClient
public static string SaveRamPath(GameInfo game)
{
string name = FilesystemSafeName(game);
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
- name += "." + Path.GetFileNameWithoutExtension(GlobalWinF.MovieSession.Movie.Filename);
+ name += "." + Path.GetFileNameWithoutExtension(Global.MovieSession.Movie.Filename);
}
PathEntry pathEntry = Global.Config.PathEntries[game.System, "Save RAM"];
@@ -261,9 +261,9 @@ namespace BizHawk.MultiClient
{
string name = FilesystemSafeName(game);
- if (Global.Config.BindSavestatesToMovies && GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.Config.BindSavestatesToMovies && Global.MovieSession.Movie.IsActive)
{
- name += "." + Path.GetFileNameWithoutExtension(GlobalWinF.MovieSession.Movie.Filename);
+ name += "." + Path.GetFileNameWithoutExtension(Global.MovieSession.Movie.Filename);
}
PathEntry pathEntry = Global.Config.PathEntries[game.System, "Savestates"];
diff --git a/BizHawk.MultiClient/movie/MovieImport.cs b/BizHawk.MultiClient/movie/MovieImport.cs
index d3d2fe3ddd..cd4f4a8424 100644
--- a/BizHawk.MultiClient/movie/MovieImport.cs
+++ b/BizHawk.MultiClient/movie/MovieImport.cs
@@ -33,9 +33,9 @@ namespace BizHawk.MultiClient
public const string UNITCODE = "UnitCode";
// Attempt to import another type of movie file into a movie object.
- public static Movie ImportFile(string path, out string errorMsg, out string warningMsg)
+ public static Movie ImportFile(string path, string bizVersion, out string errorMsg, out string warningMsg)
{
- Movie m = new Movie(GlobalWinF.MainForm.GetEmuVersion());
+ Movie m = new Movie(bizVersion);
errorMsg = String.Empty;
warningMsg = String.Empty;
diff --git a/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs b/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs
index 485831fc12..e8c887a42a 100644
--- a/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs
+++ b/BizHawk.MultiClient/tools/Lua/LuaImplementation.cs
@@ -2935,15 +2935,15 @@ namespace BizHawk.MultiClient
public string movie_filename()
{
- return GlobalWinF.MovieSession.Movie.Filename;
+ return Global.MovieSession.Movie.Filename;
}
public LuaTable movie_getinput(object frame)
{
LuaTable input = _lua.NewTable();
- string s = GlobalWinF.MovieSession.Movie.GetInput(LuaInt(frame));
- MovieControllerAdapter m = new MovieControllerAdapter { Type = GlobalWinF.MovieSession.MovieControllerAdapter.Type };
+ string s = Global.MovieSession.Movie.GetInput(LuaInt(frame));
+ MovieControllerAdapter m = new MovieControllerAdapter { Type = Global.MovieSession.MovieControllerAdapter.Type };
m.SetControllersAsMnemonic(s);
foreach (string button in m.Type.BoolButtons)
input[button] = m[button];
@@ -2958,12 +2958,12 @@ namespace BizHawk.MultiClient
public bool movie_getrerecordcounting()
{
- return GlobalWinF.MovieSession.Movie.IsCountingRerecords;
+ return Global.MovieSession.Movie.IsCountingRerecords;
}
public bool movie_isloaded()
{
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
return true;
}
@@ -2975,9 +2975,9 @@ namespace BizHawk.MultiClient
public int movie_length()
{
- if (GlobalWinF.MovieSession.Movie.Frames.HasValue)
+ if (Global.MovieSession.Movie.Frames.HasValue)
{
- return GlobalWinF.MovieSession.Movie.Frames.Value;
+ return Global.MovieSession.Movie.Frames.Value;
}
else
{
@@ -2987,15 +2987,15 @@ namespace BizHawk.MultiClient
public string movie_mode()
{
- if (GlobalWinF.MovieSession.Movie.IsFinished)
+ if (Global.MovieSession.Movie.IsFinished)
{
return "FINISHED";
}
- else if (GlobalWinF.MovieSession.Movie.IsPlaying)
+ else if (Global.MovieSession.Movie.IsPlaying)
{
return "PLAY";
}
- else if (GlobalWinF.MovieSession.Movie.IsRecording)
+ else if (Global.MovieSession.Movie.IsRecording)
{
return "RECORD";
}
@@ -3007,7 +3007,7 @@ namespace BizHawk.MultiClient
public string movie_rerecordcount()
{
- return GlobalWinF.MovieSession.Movie.Rerecords.ToString();
+ return Global.MovieSession.Movie.Rerecords.ToString();
}
public void movie_setreadonly(object lua_input)
@@ -3021,14 +3021,14 @@ namespace BizHawk.MultiClient
public void movie_setrerecordcounting(object lua_input)
{
if (lua_input.ToString().ToUpper() == "TRUE" || lua_input.ToString() == "1")
- GlobalWinF.MovieSession.Movie.IsCountingRerecords = true;
+ Global.MovieSession.Movie.IsCountingRerecords = true;
else
- GlobalWinF.MovieSession.Movie.IsCountingRerecords = false;
+ Global.MovieSession.Movie.IsCountingRerecords = false;
}
public void movie_stop()
{
- GlobalWinF.MovieSession.Movie.Stop();
+ Global.MovieSession.Movie.Stop();
}
#endregion
diff --git a/BizHawk.MultiClient/tools/StateVisualizer.cs b/BizHawk.MultiClient/tools/StateVisualizer.cs
index 58fe1f86dc..07694371fe 100644
--- a/BizHawk.MultiClient/tools/StateVisualizer.cs
+++ b/BizHawk.MultiClient/tools/StateVisualizer.cs
@@ -10,7 +10,7 @@ namespace BizHawk.MultiClient
{
public StateVisualizer()
{
- TimeLine movietimeline = new TimeLine(GlobalWinF.MovieSession.Movie.LogDump);
+ TimeLine movietimeline = new TimeLine(Global.MovieSession.Movie.LogDump);
Timelines = new List {movietimeline};
@@ -32,7 +32,7 @@ namespace BizHawk.MultiClient
{
using (var reader = new StreamReader(path))
{
- movie.LoadLogFromSavestateText(reader, GlobalWinF.MovieSession.MultiTrack.IsActive);
+ movie.LoadLogFromSavestateText(reader, Global.MovieSession.MultiTrack.IsActive);
}
}
diff --git a/BizHawk.MultiClient/tools/TAStudio.Designer.cs b/BizHawk.MultiClient/tools/TAStudio.Designer.cs
index 619e99c133..88152ad8b0 100644
--- a/BizHawk.MultiClient/tools/TAStudio.Designer.cs
+++ b/BizHawk.MultiClient/tools/TAStudio.Designer.cs
@@ -1,128 +1,130 @@
-namespace BizHawk.MultiClient
+using BizHawk.Client.Common;
+
+namespace BizHawk.MultiClient
{
- partial class TAStudio
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
+ partial class TAStudio
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
- GlobalWinF.MovieSession.Movie.StateCapturing = false;
+ Global.MovieSession.Movie.StateCapturing = false; //TODO: This doesn't go here, extend this method in the .cs file
base.Dispose(disposing);
- }
+ }
- #region Windows Form Designer generated code
+ #region Windows Form Designer generated code
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TAStudio));
- this.menuStrip1 = new MenuStripEx();
- this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.newProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.openProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.saveProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.saveProjectAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.nToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
- this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.importTASFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
- this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.clearToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
- this.deleteFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.cloneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.insertFrameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.insertNumFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
- this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.pasteInsertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
- this.truncateMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.clearVirtualPadsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.updatePadsOnMovePlaybackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
- this.restoreWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.ReadOnlyCheckBox = new System.Windows.Forms.CheckBox();
- this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
- this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.clearToolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
- this.ContextMenu_Delete = new System.Windows.Forms.ToolStripMenuItem();
- this.cloneToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
- this.ContextMenu_Insert = new System.Windows.Forms.ToolStripMenuItem();
- this.insertFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
- this.toolStripItem_SelectAll = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
- this.truncateMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.ClipboardDisplay = new System.Windows.Forms.Label();
- this.SelectionDisplay = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.toolStrip1 = new ToolStripEx();
- this.RewindToBeginning = new System.Windows.Forms.ToolStripButton();
- this.RewindButton = new System.Windows.Forms.ToolStripButton();
- this.PauseButton = new System.Windows.Forms.ToolStripButton();
- this.FrameAdvanceButton = new System.Windows.Forms.ToolStripButton();
- this.FastForward = new System.Windows.Forms.ToolStripButton();
- this.TurboFastForward = new System.Windows.Forms.ToolStripButton();
- this.FastFowardToEnd = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
- this.StopButton = new System.Windows.Forms.ToolStripButton();
- this.TASView = new BizHawk.VirtualListView();
- this.Frame = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
- this.Log = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
- this.VisualizerBox = new System.Windows.Forms.GroupBox();
- this.button1 = new System.Windows.Forms.Button();
- this.alwaysOnTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.menuStrip1.SuspendLayout();
- this.contextMenuStrip1.SuspendLayout();
- this.groupBox1.SuspendLayout();
- this.toolStrip1.SuspendLayout();
- this.VisualizerBox.SuspendLayout();
- this.SuspendLayout();
- //
- // menuStrip1
- //
- this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TAStudio));
+ this.menuStrip1 = new MenuStripEx();
+ this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.newProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.openProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.saveProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.saveProjectAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.nToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.importTASFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.clearToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+ this.deleteFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.cloneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.insertFrameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.insertNumFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.pasteInsertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.truncateMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.clearVirtualPadsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.updatePadsOnMovePlaybackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+ this.restoreWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.ReadOnlyCheckBox = new System.Windows.Forms.CheckBox();
+ this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+ this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.clearToolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+ this.ContextMenu_Delete = new System.Windows.Forms.ToolStripMenuItem();
+ this.cloneToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+ this.ContextMenu_Insert = new System.Windows.Forms.ToolStripMenuItem();
+ this.insertFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripItem_SelectAll = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.truncateMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.ClipboardDisplay = new System.Windows.Forms.Label();
+ this.SelectionDisplay = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.toolStrip1 = new ToolStripEx();
+ this.RewindToBeginning = new System.Windows.Forms.ToolStripButton();
+ this.RewindButton = new System.Windows.Forms.ToolStripButton();
+ this.PauseButton = new System.Windows.Forms.ToolStripButton();
+ this.FrameAdvanceButton = new System.Windows.Forms.ToolStripButton();
+ this.FastForward = new System.Windows.Forms.ToolStripButton();
+ this.TurboFastForward = new System.Windows.Forms.ToolStripButton();
+ this.FastFowardToEnd = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.StopButton = new System.Windows.Forms.ToolStripButton();
+ this.TASView = new BizHawk.VirtualListView();
+ this.Frame = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.Log = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.VisualizerBox = new System.Windows.Forms.GroupBox();
+ this.button1 = new System.Windows.Forms.Button();
+ this.alwaysOnTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.menuStrip1.SuspendLayout();
+ this.contextMenuStrip1.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.toolStrip1.SuspendLayout();
+ this.VisualizerBox.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // menuStrip1
+ //
+ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem,
this.editToolStripMenuItem,
this.settingsToolStripMenuItem});
- this.menuStrip1.Location = new System.Drawing.Point(0, 0);
- this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Size = new System.Drawing.Size(586, 24);
- this.menuStrip1.TabIndex = 0;
- this.menuStrip1.Text = "menuStrip1";
- //
- // fileToolStripMenuItem
- //
- this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip1.Name = "menuStrip1";
+ this.menuStrip1.Size = new System.Drawing.Size(586, 24);
+ this.menuStrip1.TabIndex = 0;
+ this.menuStrip1.Text = "menuStrip1";
+ //
+ // fileToolStripMenuItem
+ //
+ this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.newProjectToolStripMenuItem,
this.openProjectToolStripMenuItem,
this.saveProjectToolStripMenuItem,
@@ -132,95 +134,95 @@
this.importTASFileToolStripMenuItem,
this.toolStripSeparator2,
this.exitToolStripMenuItem});
- this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
- this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
- this.fileToolStripMenuItem.Text = "&File";
- //
- // newProjectToolStripMenuItem
- //
- this.newProjectToolStripMenuItem.Name = "newProjectToolStripMenuItem";
- this.newProjectToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
- this.newProjectToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
- this.newProjectToolStripMenuItem.Text = "New Project";
- this.newProjectToolStripMenuItem.Click += new System.EventHandler(this.newProjectToolStripMenuItem_Click);
- //
- // openProjectToolStripMenuItem
- //
- this.openProjectToolStripMenuItem.Name = "openProjectToolStripMenuItem";
- this.openProjectToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
- this.openProjectToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
- this.openProjectToolStripMenuItem.Text = "&Open Project";
- this.openProjectToolStripMenuItem.Click += new System.EventHandler(this.openProjectToolStripMenuItem_Click);
- //
- // saveProjectToolStripMenuItem
- //
- this.saveProjectToolStripMenuItem.Name = "saveProjectToolStripMenuItem";
- this.saveProjectToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
- this.saveProjectToolStripMenuItem.Text = "&Save Project";
- this.saveProjectToolStripMenuItem.Click += new System.EventHandler(this.saveProjectToolStripMenuItem_Click);
- //
- // saveProjectAsToolStripMenuItem
- //
- this.saveProjectAsToolStripMenuItem.Name = "saveProjectAsToolStripMenuItem";
- this.saveProjectAsToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
- this.saveProjectAsToolStripMenuItem.Text = "Save Project As";
- this.saveProjectAsToolStripMenuItem.Click += new System.EventHandler(this.saveProjectAsToolStripMenuItem_Click);
- //
- // recentToolStripMenuItem
- //
- this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+ this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+ this.fileToolStripMenuItem.Text = "&File";
+ //
+ // newProjectToolStripMenuItem
+ //
+ this.newProjectToolStripMenuItem.Name = "newProjectToolStripMenuItem";
+ this.newProjectToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
+ this.newProjectToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+ this.newProjectToolStripMenuItem.Text = "New Project";
+ this.newProjectToolStripMenuItem.Click += new System.EventHandler(this.newProjectToolStripMenuItem_Click);
+ //
+ // openProjectToolStripMenuItem
+ //
+ this.openProjectToolStripMenuItem.Name = "openProjectToolStripMenuItem";
+ this.openProjectToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
+ this.openProjectToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+ this.openProjectToolStripMenuItem.Text = "&Open Project";
+ this.openProjectToolStripMenuItem.Click += new System.EventHandler(this.openProjectToolStripMenuItem_Click);
+ //
+ // saveProjectToolStripMenuItem
+ //
+ this.saveProjectToolStripMenuItem.Name = "saveProjectToolStripMenuItem";
+ this.saveProjectToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+ this.saveProjectToolStripMenuItem.Text = "&Save Project";
+ this.saveProjectToolStripMenuItem.Click += new System.EventHandler(this.saveProjectToolStripMenuItem_Click);
+ //
+ // saveProjectAsToolStripMenuItem
+ //
+ this.saveProjectAsToolStripMenuItem.Name = "saveProjectAsToolStripMenuItem";
+ this.saveProjectAsToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+ this.saveProjectAsToolStripMenuItem.Text = "Save Project As";
+ this.saveProjectAsToolStripMenuItem.Click += new System.EventHandler(this.saveProjectAsToolStripMenuItem_Click);
+ //
+ // recentToolStripMenuItem
+ //
+ this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.nToolStripMenuItem,
this.toolStripSeparator3,
this.clearToolStripMenuItem});
- this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
- this.recentToolStripMenuItem.Name = "recentToolStripMenuItem";
- this.recentToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
- this.recentToolStripMenuItem.Text = "Recent";
- //
- // nToolStripMenuItem
- //
- this.nToolStripMenuItem.Name = "nToolStripMenuItem";
- this.nToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.nToolStripMenuItem.Text = "None";
- //
- // toolStripSeparator3
- //
- this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(100, 6);
- //
- // clearToolStripMenuItem
- //
- this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
- this.clearToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.clearToolStripMenuItem.Text = "Clear";
- //
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(183, 6);
- //
- // importTASFileToolStripMenuItem
- //
- this.importTASFileToolStripMenuItem.Name = "importTASFileToolStripMenuItem";
- this.importTASFileToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
- this.importTASFileToolStripMenuItem.Text = "Import TAS file";
- //
- // toolStripSeparator2
- //
- this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(183, 6);
- //
- // exitToolStripMenuItem
- //
- this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
- this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
- this.exitToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
- this.exitToolStripMenuItem.Text = "E&xit";
- this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
- //
- // editToolStripMenuItem
- //
- this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
+ this.recentToolStripMenuItem.Name = "recentToolStripMenuItem";
+ this.recentToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+ this.recentToolStripMenuItem.Text = "Recent";
+ //
+ // nToolStripMenuItem
+ //
+ this.nToolStripMenuItem.Name = "nToolStripMenuItem";
+ this.nToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.nToolStripMenuItem.Text = "None";
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(100, 6);
+ //
+ // clearToolStripMenuItem
+ //
+ this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
+ this.clearToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+ this.clearToolStripMenuItem.Text = "Clear";
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(183, 6);
+ //
+ // importTASFileToolStripMenuItem
+ //
+ this.importTASFileToolStripMenuItem.Name = "importTASFileToolStripMenuItem";
+ this.importTASFileToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+ this.importTASFileToolStripMenuItem.Text = "Import TAS file";
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(183, 6);
+ //
+ // exitToolStripMenuItem
+ //
+ this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
+ this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
+ this.exitToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+ this.exitToolStripMenuItem.Text = "E&xit";
+ this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
+ //
+ // editToolStripMenuItem
+ //
+ this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.clearToolStripMenuItem2,
this.deleteFramesToolStripMenuItem,
this.cloneToolStripMenuItem,
@@ -235,181 +237,181 @@
this.toolStripSeparator8,
this.truncateMovieToolStripMenuItem,
this.clearVirtualPadsToolStripMenuItem});
- this.editToolStripMenuItem.Name = "editToolStripMenuItem";
- this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
- this.editToolStripMenuItem.Text = "&Edit";
- this.editToolStripMenuItem.DropDownOpened += new System.EventHandler(this.editToolStripMenuItem_DropDownOpened);
- //
- // clearToolStripMenuItem2
- //
- this.clearToolStripMenuItem2.Name = "clearToolStripMenuItem2";
- this.clearToolStripMenuItem2.ShortcutKeyDisplayString = "Del";
- this.clearToolStripMenuItem2.Size = new System.Drawing.Size(207, 22);
- this.clearToolStripMenuItem2.Text = "Clear";
- this.clearToolStripMenuItem2.Click += new System.EventHandler(this.clearToolStripMenuItem2_Click);
- //
- // deleteFramesToolStripMenuItem
- //
- this.deleteFramesToolStripMenuItem.Name = "deleteFramesToolStripMenuItem";
- this.deleteFramesToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete)));
- this.deleteFramesToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
- this.deleteFramesToolStripMenuItem.Text = "&Delete";
- this.deleteFramesToolStripMenuItem.Click += new System.EventHandler(this.deleteFramesToolStripMenuItem_Click);
- //
- // cloneToolStripMenuItem
- //
- this.cloneToolStripMenuItem.Name = "cloneToolStripMenuItem";
- this.cloneToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert)));
- this.cloneToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
- this.cloneToolStripMenuItem.Text = "&Clone";
- this.cloneToolStripMenuItem.Click += new System.EventHandler(this.cloneToolStripMenuItem_Click);
- //
- // insertFrameToolStripMenuItem
- //
- this.insertFrameToolStripMenuItem.Name = "insertFrameToolStripMenuItem";
- this.insertFrameToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
- | System.Windows.Forms.Keys.Insert)));
- this.insertFrameToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
- this.insertFrameToolStripMenuItem.Text = "&Insert";
- this.insertFrameToolStripMenuItem.Click += new System.EventHandler(this.insertFrameToolStripMenuItem_Click);
- //
- // insertNumFramesToolStripMenuItem
- //
- this.insertNumFramesToolStripMenuItem.Name = "insertNumFramesToolStripMenuItem";
- this.insertNumFramesToolStripMenuItem.ShortcutKeyDisplayString = "Ins";
- this.insertNumFramesToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
- this.insertNumFramesToolStripMenuItem.Text = "Insert # of Frames";
- this.insertNumFramesToolStripMenuItem.Click += new System.EventHandler(this.insertNumFramesToolStripMenuItem_Click);
- //
- // toolStripSeparator7
- //
- this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(204, 6);
- //
- // copyToolStripMenuItem
- //
- this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
- this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
- this.copyToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
- this.copyToolStripMenuItem.Text = "Copy";
- this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
- //
- // pasteToolStripMenuItem
- //
- this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
- this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
- this.pasteToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
- this.pasteToolStripMenuItem.Text = "&Paste";
- this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
- //
- // pasteInsertToolStripMenuItem
- //
- this.pasteInsertToolStripMenuItem.Name = "pasteInsertToolStripMenuItem";
- this.pasteInsertToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
- | System.Windows.Forms.Keys.V)));
- this.pasteInsertToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
- this.pasteInsertToolStripMenuItem.Text = "&Paste Insert";
- this.pasteInsertToolStripMenuItem.Click += new System.EventHandler(this.pasteInsertToolStripMenuItem_Click);
- //
- // cutToolStripMenuItem
- //
- this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
- this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X)));
- this.cutToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
- this.cutToolStripMenuItem.Text = "&Cut";
- this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click);
- //
- // selectAllToolStripMenuItem
- //
- this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
- this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
- this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
- this.selectAllToolStripMenuItem.Text = "Select &All";
- this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
- //
- // toolStripSeparator8
- //
- this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(204, 6);
- //
- // truncateMovieToolStripMenuItem
- //
- this.truncateMovieToolStripMenuItem.Name = "truncateMovieToolStripMenuItem";
- this.truncateMovieToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
- this.truncateMovieToolStripMenuItem.Text = "&Truncate Movie";
- this.truncateMovieToolStripMenuItem.Click += new System.EventHandler(this.truncateMovieToolStripMenuItem_Click);
- //
- // clearVirtualPadsToolStripMenuItem
- //
- this.clearVirtualPadsToolStripMenuItem.Name = "clearVirtualPadsToolStripMenuItem";
- this.clearVirtualPadsToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
- this.clearVirtualPadsToolStripMenuItem.Text = "Clear controller &holds";
- //
- // settingsToolStripMenuItem
- //
- this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.editToolStripMenuItem.Name = "editToolStripMenuItem";
+ this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
+ this.editToolStripMenuItem.Text = "&Edit";
+ this.editToolStripMenuItem.DropDownOpened += new System.EventHandler(this.editToolStripMenuItem_DropDownOpened);
+ //
+ // clearToolStripMenuItem2
+ //
+ this.clearToolStripMenuItem2.Name = "clearToolStripMenuItem2";
+ this.clearToolStripMenuItem2.ShortcutKeyDisplayString = "Del";
+ this.clearToolStripMenuItem2.Size = new System.Drawing.Size(207, 22);
+ this.clearToolStripMenuItem2.Text = "Clear";
+ this.clearToolStripMenuItem2.Click += new System.EventHandler(this.clearToolStripMenuItem2_Click);
+ //
+ // deleteFramesToolStripMenuItem
+ //
+ this.deleteFramesToolStripMenuItem.Name = "deleteFramesToolStripMenuItem";
+ this.deleteFramesToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete)));
+ this.deleteFramesToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+ this.deleteFramesToolStripMenuItem.Text = "&Delete";
+ this.deleteFramesToolStripMenuItem.Click += new System.EventHandler(this.deleteFramesToolStripMenuItem_Click);
+ //
+ // cloneToolStripMenuItem
+ //
+ this.cloneToolStripMenuItem.Name = "cloneToolStripMenuItem";
+ this.cloneToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert)));
+ this.cloneToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+ this.cloneToolStripMenuItem.Text = "&Clone";
+ this.cloneToolStripMenuItem.Click += new System.EventHandler(this.cloneToolStripMenuItem_Click);
+ //
+ // insertFrameToolStripMenuItem
+ //
+ this.insertFrameToolStripMenuItem.Name = "insertFrameToolStripMenuItem";
+ this.insertFrameToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
+ | System.Windows.Forms.Keys.Insert)));
+ this.insertFrameToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+ this.insertFrameToolStripMenuItem.Text = "&Insert";
+ this.insertFrameToolStripMenuItem.Click += new System.EventHandler(this.insertFrameToolStripMenuItem_Click);
+ //
+ // insertNumFramesToolStripMenuItem
+ //
+ this.insertNumFramesToolStripMenuItem.Name = "insertNumFramesToolStripMenuItem";
+ this.insertNumFramesToolStripMenuItem.ShortcutKeyDisplayString = "Ins";
+ this.insertNumFramesToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+ this.insertNumFramesToolStripMenuItem.Text = "Insert # of Frames";
+ this.insertNumFramesToolStripMenuItem.Click += new System.EventHandler(this.insertNumFramesToolStripMenuItem_Click);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(204, 6);
+ //
+ // copyToolStripMenuItem
+ //
+ this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
+ this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
+ this.copyToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+ this.copyToolStripMenuItem.Text = "Copy";
+ this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
+ //
+ // pasteToolStripMenuItem
+ //
+ this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
+ this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
+ this.pasteToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+ this.pasteToolStripMenuItem.Text = "&Paste";
+ this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
+ //
+ // pasteInsertToolStripMenuItem
+ //
+ this.pasteInsertToolStripMenuItem.Name = "pasteInsertToolStripMenuItem";
+ this.pasteInsertToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
+ | System.Windows.Forms.Keys.V)));
+ this.pasteInsertToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+ this.pasteInsertToolStripMenuItem.Text = "&Paste Insert";
+ this.pasteInsertToolStripMenuItem.Click += new System.EventHandler(this.pasteInsertToolStripMenuItem_Click);
+ //
+ // cutToolStripMenuItem
+ //
+ this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
+ this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X)));
+ this.cutToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+ this.cutToolStripMenuItem.Text = "&Cut";
+ this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click);
+ //
+ // selectAllToolStripMenuItem
+ //
+ this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
+ this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
+ this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+ this.selectAllToolStripMenuItem.Text = "Select &All";
+ this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
+ //
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(204, 6);
+ //
+ // truncateMovieToolStripMenuItem
+ //
+ this.truncateMovieToolStripMenuItem.Name = "truncateMovieToolStripMenuItem";
+ this.truncateMovieToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+ this.truncateMovieToolStripMenuItem.Text = "&Truncate Movie";
+ this.truncateMovieToolStripMenuItem.Click += new System.EventHandler(this.truncateMovieToolStripMenuItem_Click);
+ //
+ // clearVirtualPadsToolStripMenuItem
+ //
+ this.clearVirtualPadsToolStripMenuItem.Name = "clearVirtualPadsToolStripMenuItem";
+ this.clearVirtualPadsToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+ this.clearVirtualPadsToolStripMenuItem.Text = "Clear controller &holds";
+ //
+ // settingsToolStripMenuItem
+ //
+ this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.saveWindowPositionToolStripMenuItem,
this.autoloadToolStripMenuItem,
this.updatePadsOnMovePlaybackToolStripMenuItem,
this.toolStripSeparator4,
this.alwaysOnTopToolStripMenuItem,
this.restoreWindowToolStripMenuItem});
- this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
- this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
- this.settingsToolStripMenuItem.Text = "&Settings";
- this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_DropDownOpened);
- //
- // saveWindowPositionToolStripMenuItem
- //
- this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem";
- this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
- this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position";
- this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click);
- //
- // autoloadToolStripMenuItem
- //
- this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem";
- this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
- this.autoloadToolStripMenuItem.Text = "Autoload";
- this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click);
- //
- // updatePadsOnMovePlaybackToolStripMenuItem
- //
- this.updatePadsOnMovePlaybackToolStripMenuItem.Name = "updatePadsOnMovePlaybackToolStripMenuItem";
- this.updatePadsOnMovePlaybackToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
- this.updatePadsOnMovePlaybackToolStripMenuItem.Text = "Update Pads on Move playback";
- this.updatePadsOnMovePlaybackToolStripMenuItem.Click += new System.EventHandler(this.updatePadsOnMovePlaybackToolStripMenuItem_Click);
- //
- // toolStripSeparator4
- //
- this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(237, 6);
- //
- // restoreWindowToolStripMenuItem
- //
- this.restoreWindowToolStripMenuItem.Name = "restoreWindowToolStripMenuItem";
- this.restoreWindowToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
- this.restoreWindowToolStripMenuItem.Text = "Restore Default Settings";
- this.restoreWindowToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowToolStripMenuItem_Click);
- //
- // ReadOnlyCheckBox
- //
- this.ReadOnlyCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
- this.ReadOnlyCheckBox.AutoSize = true;
- this.ReadOnlyCheckBox.BackColor = System.Drawing.SystemColors.Control;
- this.ReadOnlyCheckBox.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly;
- this.ReadOnlyCheckBox.ImageAlign = System.Drawing.ContentAlignment.BottomRight;
- this.ReadOnlyCheckBox.Location = new System.Drawing.Point(12, 27);
- this.ReadOnlyCheckBox.Name = "ReadOnlyCheckBox";
- this.ReadOnlyCheckBox.Size = new System.Drawing.Size(22, 22);
- this.ReadOnlyCheckBox.TabIndex = 3;
- this.toolTip1.SetToolTip(this.ReadOnlyCheckBox, "Read-only");
- this.ReadOnlyCheckBox.UseVisualStyleBackColor = false;
- this.ReadOnlyCheckBox.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
- //
- // contextMenuStrip1
- //
- this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
+ this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
+ this.settingsToolStripMenuItem.Text = "&Settings";
+ this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_DropDownOpened);
+ //
+ // saveWindowPositionToolStripMenuItem
+ //
+ this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem";
+ this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
+ this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position";
+ this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click);
+ //
+ // autoloadToolStripMenuItem
+ //
+ this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem";
+ this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
+ this.autoloadToolStripMenuItem.Text = "Autoload";
+ this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click);
+ //
+ // updatePadsOnMovePlaybackToolStripMenuItem
+ //
+ this.updatePadsOnMovePlaybackToolStripMenuItem.Name = "updatePadsOnMovePlaybackToolStripMenuItem";
+ this.updatePadsOnMovePlaybackToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
+ this.updatePadsOnMovePlaybackToolStripMenuItem.Text = "Update Pads on Move playback";
+ this.updatePadsOnMovePlaybackToolStripMenuItem.Click += new System.EventHandler(this.updatePadsOnMovePlaybackToolStripMenuItem_Click);
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(237, 6);
+ //
+ // restoreWindowToolStripMenuItem
+ //
+ this.restoreWindowToolStripMenuItem.Name = "restoreWindowToolStripMenuItem";
+ this.restoreWindowToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
+ this.restoreWindowToolStripMenuItem.Text = "Restore Default Settings";
+ this.restoreWindowToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowToolStripMenuItem_Click);
+ //
+ // ReadOnlyCheckBox
+ //
+ this.ReadOnlyCheckBox.Appearance = System.Windows.Forms.Appearance.Button;
+ this.ReadOnlyCheckBox.AutoSize = true;
+ this.ReadOnlyCheckBox.BackColor = System.Drawing.SystemColors.Control;
+ this.ReadOnlyCheckBox.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly;
+ this.ReadOnlyCheckBox.ImageAlign = System.Drawing.ContentAlignment.BottomRight;
+ this.ReadOnlyCheckBox.Location = new System.Drawing.Point(12, 27);
+ this.ReadOnlyCheckBox.Name = "ReadOnlyCheckBox";
+ this.ReadOnlyCheckBox.Size = new System.Drawing.Size(22, 22);
+ this.ReadOnlyCheckBox.TabIndex = 3;
+ this.toolTip1.SetToolTip(this.ReadOnlyCheckBox, "Read-only");
+ this.ReadOnlyCheckBox.UseVisualStyleBackColor = false;
+ this.ReadOnlyCheckBox.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
+ //
+ // contextMenuStrip1
+ //
+ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.clearToolStripMenuItem3,
this.ContextMenu_Delete,
this.cloneToolStripMenuItem1,
@@ -419,126 +421,126 @@
this.toolStripItem_SelectAll,
this.toolStripSeparator9,
this.truncateMovieToolStripMenuItem1});
- this.contextMenuStrip1.Name = "contextMenuStrip1";
- this.contextMenuStrip1.Size = new System.Drawing.Size(185, 170);
- this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
- //
- // clearToolStripMenuItem3
- //
- this.clearToolStripMenuItem3.Name = "clearToolStripMenuItem3";
- this.clearToolStripMenuItem3.Size = new System.Drawing.Size(184, 22);
- this.clearToolStripMenuItem3.Text = "Clear";
- //
- // ContextMenu_Delete
- //
- this.ContextMenu_Delete.Name = "ContextMenu_Delete";
- this.ContextMenu_Delete.ShortcutKeyDisplayString = "Ctrl+Del";
- this.ContextMenu_Delete.Size = new System.Drawing.Size(184, 22);
- this.ContextMenu_Delete.Text = "Delete";
- this.ContextMenu_Delete.Click += new System.EventHandler(this.Delete_Click);
- //
- // cloneToolStripMenuItem1
- //
- this.cloneToolStripMenuItem1.Name = "cloneToolStripMenuItem1";
- this.cloneToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+Ins";
- this.cloneToolStripMenuItem1.Size = new System.Drawing.Size(184, 22);
- this.cloneToolStripMenuItem1.Text = "Clone";
- this.cloneToolStripMenuItem1.Click += new System.EventHandler(this.cloneToolStripMenuItem1_Click);
- //
- // ContextMenu_Insert
- //
- this.ContextMenu_Insert.Name = "ContextMenu_Insert";
- this.ContextMenu_Insert.ShortcutKeyDisplayString = "Ctrl+Shift+Ins";
- this.ContextMenu_Insert.Size = new System.Drawing.Size(184, 22);
- this.ContextMenu_Insert.Text = "Insert";
- this.ContextMenu_Insert.Click += new System.EventHandler(this.Insert_Click);
- //
- // insertFramesToolStripMenuItem
- //
- this.insertFramesToolStripMenuItem.Name = "insertFramesToolStripMenuItem";
- this.insertFramesToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
- this.insertFramesToolStripMenuItem.Text = "Insert # Frames";
- this.insertFramesToolStripMenuItem.Click += new System.EventHandler(this.insertFramesToolStripMenuItem_Click);
- //
- // toolStripSeparator5
- //
- this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(181, 6);
- //
- // toolStripItem_SelectAll
- //
- this.toolStripItem_SelectAll.Name = "toolStripItem_SelectAll";
- this.toolStripItem_SelectAll.Size = new System.Drawing.Size(184, 22);
- this.toolStripItem_SelectAll.Text = "Select All";
- this.toolStripItem_SelectAll.Click += new System.EventHandler(this.SelectAll_Click);
- //
- // toolStripSeparator9
- //
- this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(181, 6);
- //
- // truncateMovieToolStripMenuItem1
- //
- this.truncateMovieToolStripMenuItem1.Name = "truncateMovieToolStripMenuItem1";
- this.truncateMovieToolStripMenuItem1.Size = new System.Drawing.Size(184, 22);
- this.truncateMovieToolStripMenuItem1.Text = "&Truncate Movie";
- this.truncateMovieToolStripMenuItem1.Click += new System.EventHandler(this.truncateMovieToolStripMenuItem1_Click);
- //
- // groupBox1
- //
- this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.groupBox1.Controls.Add(this.ClipboardDisplay);
- this.groupBox1.Controls.Add(this.SelectionDisplay);
- this.groupBox1.Controls.Add(this.label2);
- this.groupBox1.Controls.Add(this.label1);
- this.groupBox1.Location = new System.Drawing.Point(300, 55);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(274, 83);
- this.groupBox1.TabIndex = 5;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Slicer";
- //
- // ClipboardDisplay
- //
- this.ClipboardDisplay.AutoSize = true;
- this.ClipboardDisplay.Location = new System.Drawing.Point(68, 36);
- this.ClipboardDisplay.Name = "ClipboardDisplay";
- this.ClipboardDisplay.Size = new System.Drawing.Size(31, 13);
- this.ClipboardDisplay.TabIndex = 3;
- this.ClipboardDisplay.Text = "none";
- //
- // SelectionDisplay
- //
- this.SelectionDisplay.AutoSize = true;
- this.SelectionDisplay.Location = new System.Drawing.Point(68, 19);
- this.SelectionDisplay.Name = "SelectionDisplay";
- this.SelectionDisplay.Size = new System.Drawing.Size(31, 13);
- this.SelectionDisplay.TabIndex = 2;
- this.SelectionDisplay.Text = "none";
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(8, 36);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(54, 13);
- this.label2.TabIndex = 1;
- this.label2.Text = "Clipboard:";
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(8, 19);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(54, 13);
- this.label1.TabIndex = 0;
- this.label1.Text = "Selection:";
- //
- // toolStrip1
- //
- this.toolStrip1.ClickThrough = true;
- this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None;
- this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.contextMenuStrip1.Name = "contextMenuStrip1";
+ this.contextMenuStrip1.Size = new System.Drawing.Size(185, 170);
+ this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
+ //
+ // clearToolStripMenuItem3
+ //
+ this.clearToolStripMenuItem3.Name = "clearToolStripMenuItem3";
+ this.clearToolStripMenuItem3.Size = new System.Drawing.Size(184, 22);
+ this.clearToolStripMenuItem3.Text = "Clear";
+ //
+ // ContextMenu_Delete
+ //
+ this.ContextMenu_Delete.Name = "ContextMenu_Delete";
+ this.ContextMenu_Delete.ShortcutKeyDisplayString = "Ctrl+Del";
+ this.ContextMenu_Delete.Size = new System.Drawing.Size(184, 22);
+ this.ContextMenu_Delete.Text = "Delete";
+ this.ContextMenu_Delete.Click += new System.EventHandler(this.Delete_Click);
+ //
+ // cloneToolStripMenuItem1
+ //
+ this.cloneToolStripMenuItem1.Name = "cloneToolStripMenuItem1";
+ this.cloneToolStripMenuItem1.ShortcutKeyDisplayString = "Ctrl+Ins";
+ this.cloneToolStripMenuItem1.Size = new System.Drawing.Size(184, 22);
+ this.cloneToolStripMenuItem1.Text = "Clone";
+ this.cloneToolStripMenuItem1.Click += new System.EventHandler(this.cloneToolStripMenuItem1_Click);
+ //
+ // ContextMenu_Insert
+ //
+ this.ContextMenu_Insert.Name = "ContextMenu_Insert";
+ this.ContextMenu_Insert.ShortcutKeyDisplayString = "Ctrl+Shift+Ins";
+ this.ContextMenu_Insert.Size = new System.Drawing.Size(184, 22);
+ this.ContextMenu_Insert.Text = "Insert";
+ this.ContextMenu_Insert.Click += new System.EventHandler(this.Insert_Click);
+ //
+ // insertFramesToolStripMenuItem
+ //
+ this.insertFramesToolStripMenuItem.Name = "insertFramesToolStripMenuItem";
+ this.insertFramesToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+ this.insertFramesToolStripMenuItem.Text = "Insert # Frames";
+ this.insertFramesToolStripMenuItem.Click += new System.EventHandler(this.insertFramesToolStripMenuItem_Click);
+ //
+ // toolStripSeparator5
+ //
+ this.toolStripSeparator5.Name = "toolStripSeparator5";
+ this.toolStripSeparator5.Size = new System.Drawing.Size(181, 6);
+ //
+ // toolStripItem_SelectAll
+ //
+ this.toolStripItem_SelectAll.Name = "toolStripItem_SelectAll";
+ this.toolStripItem_SelectAll.Size = new System.Drawing.Size(184, 22);
+ this.toolStripItem_SelectAll.Text = "Select All";
+ this.toolStripItem_SelectAll.Click += new System.EventHandler(this.SelectAll_Click);
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(181, 6);
+ //
+ // truncateMovieToolStripMenuItem1
+ //
+ this.truncateMovieToolStripMenuItem1.Name = "truncateMovieToolStripMenuItem1";
+ this.truncateMovieToolStripMenuItem1.Size = new System.Drawing.Size(184, 22);
+ this.truncateMovieToolStripMenuItem1.Text = "&Truncate Movie";
+ this.truncateMovieToolStripMenuItem1.Click += new System.EventHandler(this.truncateMovieToolStripMenuItem1_Click);
+ //
+ // groupBox1
+ //
+ this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBox1.Controls.Add(this.ClipboardDisplay);
+ this.groupBox1.Controls.Add(this.SelectionDisplay);
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.label1);
+ this.groupBox1.Location = new System.Drawing.Point(300, 55);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(274, 83);
+ this.groupBox1.TabIndex = 5;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Slicer";
+ //
+ // ClipboardDisplay
+ //
+ this.ClipboardDisplay.AutoSize = true;
+ this.ClipboardDisplay.Location = new System.Drawing.Point(68, 36);
+ this.ClipboardDisplay.Name = "ClipboardDisplay";
+ this.ClipboardDisplay.Size = new System.Drawing.Size(31, 13);
+ this.ClipboardDisplay.TabIndex = 3;
+ this.ClipboardDisplay.Text = "none";
+ //
+ // SelectionDisplay
+ //
+ this.SelectionDisplay.AutoSize = true;
+ this.SelectionDisplay.Location = new System.Drawing.Point(68, 19);
+ this.SelectionDisplay.Name = "SelectionDisplay";
+ this.SelectionDisplay.Size = new System.Drawing.Size(31, 13);
+ this.SelectionDisplay.TabIndex = 2;
+ this.SelectionDisplay.Text = "none";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(8, 36);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(54, 13);
+ this.label2.TabIndex = 1;
+ this.label2.Text = "Clipboard:";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(8, 19);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(54, 13);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Selection:";
+ //
+ // toolStrip1
+ //
+ this.toolStrip1.ClickThrough = true;
+ this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None;
+ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.RewindToBeginning,
this.RewindButton,
this.PauseButton,
@@ -548,225 +550,225 @@
this.FastFowardToEnd,
this.toolStripSeparator6,
this.StopButton});
- this.toolStrip1.Location = new System.Drawing.Point(37, 27);
- this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(202, 25);
- this.toolStrip1.TabIndex = 0;
- //
- // RewindToBeginning
- //
- this.RewindToBeginning.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.RewindToBeginning.Image = global::BizHawk.MultiClient.Properties.Resources.BackMore;
- this.RewindToBeginning.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.RewindToBeginning.Name = "RewindToBeginning";
- this.RewindToBeginning.Size = new System.Drawing.Size(23, 22);
- this.RewindToBeginning.Text = "<<";
- this.RewindToBeginning.ToolTipText = "Rewind to Beginning";
- this.RewindToBeginning.Click += new System.EventHandler(this.RewindToBeginning_Click);
- //
- // RewindButton
- //
- this.RewindButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.RewindButton.Image = global::BizHawk.MultiClient.Properties.Resources.Back;
- this.RewindButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.RewindButton.Name = "RewindButton";
- this.RewindButton.Size = new System.Drawing.Size(23, 22);
- this.RewindButton.Text = "<";
- this.RewindButton.ToolTipText = "Rewind";
- this.RewindButton.Click += new System.EventHandler(this.RewindButton_Click);
- //
- // PauseButton
- //
- this.PauseButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.PauseButton.Image = global::BizHawk.MultiClient.Properties.Resources.Pause;
- this.PauseButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.PauseButton.Name = "PauseButton";
- this.PauseButton.Size = new System.Drawing.Size(23, 22);
- this.PauseButton.Text = "Pause Button";
- this.PauseButton.ToolTipText = "Pause";
- this.PauseButton.Click += new System.EventHandler(this.PauseButton_Click);
- //
- // FrameAdvanceButton
- //
- this.FrameAdvanceButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.FrameAdvanceButton.Image = global::BizHawk.MultiClient.Properties.Resources.Forward;
- this.FrameAdvanceButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.FrameAdvanceButton.Name = "FrameAdvanceButton";
- this.FrameAdvanceButton.Size = new System.Drawing.Size(23, 22);
- this.FrameAdvanceButton.Text = ">";
- this.FrameAdvanceButton.ToolTipText = "Frame Advance";
- this.FrameAdvanceButton.Click += new System.EventHandler(this.FrameAdvanceButton_Click);
- //
- // FastForward
- //
- this.FastForward.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.FastForward.Image = global::BizHawk.MultiClient.Properties.Resources.FastForward;
- this.FastForward.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.FastForward.Name = "FastForward";
- this.FastForward.Size = new System.Drawing.Size(23, 22);
- this.FastForward.Text = ">>";
- this.FastForward.ToolTipText = "Fast Forward";
- this.FastForward.Click += new System.EventHandler(this.FastForward_Click);
- //
- // TurboFastForward
- //
- this.TurboFastForward.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.TurboFastForward.Enabled = false;
- this.TurboFastForward.Image = global::BizHawk.MultiClient.Properties.Resources.TurboFastForward;
- this.TurboFastForward.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.TurboFastForward.Name = "TurboFastForward";
- this.TurboFastForward.Size = new System.Drawing.Size(23, 22);
- this.TurboFastForward.Text = ">>>";
- this.TurboFastForward.ToolTipText = "Turbo Fast Forward";
- this.TurboFastForward.Click += new System.EventHandler(this.TurboFastForward_Click);
- //
- // FastFowardToEnd
- //
- this.FastFowardToEnd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.FastFowardToEnd.Image = global::BizHawk.MultiClient.Properties.Resources.ForwardMore;
- this.FastFowardToEnd.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.FastFowardToEnd.Name = "FastFowardToEnd";
- this.FastFowardToEnd.Size = new System.Drawing.Size(23, 22);
- this.FastFowardToEnd.Text = ">>";
- this.FastFowardToEnd.ToolTipText = "Fast Foward To End";
- this.FastFowardToEnd.Click += new System.EventHandler(this.FastForwardToEnd_Click);
- //
- // toolStripSeparator6
- //
- this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25);
- //
- // StopButton
- //
- this.StopButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.StopButton.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
- this.StopButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.StopButton.Name = "StopButton";
- this.StopButton.Size = new System.Drawing.Size(23, 22);
- this.StopButton.Text = "Stop Movie";
- this.StopButton.Click += new System.EventHandler(this.StopButton_Click);
- //
- // TASView
- //
- this.TASView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)));
- this.TASView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.toolStrip1.Location = new System.Drawing.Point(37, 27);
+ this.toolStrip1.Name = "toolStrip1";
+ this.toolStrip1.Size = new System.Drawing.Size(202, 25);
+ this.toolStrip1.TabIndex = 0;
+ //
+ // RewindToBeginning
+ //
+ this.RewindToBeginning.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.RewindToBeginning.Image = global::BizHawk.MultiClient.Properties.Resources.BackMore;
+ this.RewindToBeginning.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.RewindToBeginning.Name = "RewindToBeginning";
+ this.RewindToBeginning.Size = new System.Drawing.Size(23, 22);
+ this.RewindToBeginning.Text = "<<";
+ this.RewindToBeginning.ToolTipText = "Rewind to Beginning";
+ this.RewindToBeginning.Click += new System.EventHandler(this.RewindToBeginning_Click);
+ //
+ // RewindButton
+ //
+ this.RewindButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.RewindButton.Image = global::BizHawk.MultiClient.Properties.Resources.Back;
+ this.RewindButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.RewindButton.Name = "RewindButton";
+ this.RewindButton.Size = new System.Drawing.Size(23, 22);
+ this.RewindButton.Text = "<";
+ this.RewindButton.ToolTipText = "Rewind";
+ this.RewindButton.Click += new System.EventHandler(this.RewindButton_Click);
+ //
+ // PauseButton
+ //
+ this.PauseButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.PauseButton.Image = global::BizHawk.MultiClient.Properties.Resources.Pause;
+ this.PauseButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.PauseButton.Name = "PauseButton";
+ this.PauseButton.Size = new System.Drawing.Size(23, 22);
+ this.PauseButton.Text = "Pause Button";
+ this.PauseButton.ToolTipText = "Pause";
+ this.PauseButton.Click += new System.EventHandler(this.PauseButton_Click);
+ //
+ // FrameAdvanceButton
+ //
+ this.FrameAdvanceButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.FrameAdvanceButton.Image = global::BizHawk.MultiClient.Properties.Resources.Forward;
+ this.FrameAdvanceButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.FrameAdvanceButton.Name = "FrameAdvanceButton";
+ this.FrameAdvanceButton.Size = new System.Drawing.Size(23, 22);
+ this.FrameAdvanceButton.Text = ">";
+ this.FrameAdvanceButton.ToolTipText = "Frame Advance";
+ this.FrameAdvanceButton.Click += new System.EventHandler(this.FrameAdvanceButton_Click);
+ //
+ // FastForward
+ //
+ this.FastForward.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.FastForward.Image = global::BizHawk.MultiClient.Properties.Resources.FastForward;
+ this.FastForward.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.FastForward.Name = "FastForward";
+ this.FastForward.Size = new System.Drawing.Size(23, 22);
+ this.FastForward.Text = ">>";
+ this.FastForward.ToolTipText = "Fast Forward";
+ this.FastForward.Click += new System.EventHandler(this.FastForward_Click);
+ //
+ // TurboFastForward
+ //
+ this.TurboFastForward.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.TurboFastForward.Enabled = false;
+ this.TurboFastForward.Image = global::BizHawk.MultiClient.Properties.Resources.TurboFastForward;
+ this.TurboFastForward.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.TurboFastForward.Name = "TurboFastForward";
+ this.TurboFastForward.Size = new System.Drawing.Size(23, 22);
+ this.TurboFastForward.Text = ">>>";
+ this.TurboFastForward.ToolTipText = "Turbo Fast Forward";
+ this.TurboFastForward.Click += new System.EventHandler(this.TurboFastForward_Click);
+ //
+ // FastFowardToEnd
+ //
+ this.FastFowardToEnd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.FastFowardToEnd.Image = global::BizHawk.MultiClient.Properties.Resources.ForwardMore;
+ this.FastFowardToEnd.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.FastFowardToEnd.Name = "FastFowardToEnd";
+ this.FastFowardToEnd.Size = new System.Drawing.Size(23, 22);
+ this.FastFowardToEnd.Text = ">>";
+ this.FastFowardToEnd.ToolTipText = "Fast Foward To End";
+ this.FastFowardToEnd.Click += new System.EventHandler(this.FastForwardToEnd_Click);
+ //
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25);
+ //
+ // StopButton
+ //
+ this.StopButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.StopButton.Image = global::BizHawk.MultiClient.Properties.Resources.Stop;
+ this.StopButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.StopButton.Name = "StopButton";
+ this.StopButton.Size = new System.Drawing.Size(23, 22);
+ this.StopButton.Text = "Stop Movie";
+ this.StopButton.Click += new System.EventHandler(this.StopButton_Click);
+ //
+ // TASView
+ //
+ this.TASView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)));
+ this.TASView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.Frame,
this.Log});
- this.TASView.ContextMenuStrip = this.contextMenuStrip1;
- this.TASView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.TASView.FullRowSelect = true;
- this.TASView.GridLines = true;
- this.TASView.ItemCount = 0;
- this.TASView.Location = new System.Drawing.Point(12, 55);
- this.TASView.Name = "TASView";
- this.TASView.selectedItem = -1;
- this.TASView.Size = new System.Drawing.Size(282, 452);
- this.TASView.TabIndex = 1;
- this.TASView.UseCompatibleStateImageBehavior = false;
- this.TASView.View = System.Windows.Forms.View.Details;
- this.TASView.SelectedIndexChanged += new System.EventHandler(this.TASView_SelectedIndexChanged);
- this.TASView.Click += new System.EventHandler(this.TASView_Click);
- this.TASView.DoubleClick += new System.EventHandler(this.TASView_DoubleClick);
- this.TASView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TASView_KeyDown);
- this.TASView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TASView_MouseUp);
- this.TASView.MouseWheel += new System.Windows.Forms.MouseEventHandler(this.TASView_MouseWheel);
- //
- // Frame
- //
- this.Frame.Text = "Frame";
- //
- // Log
- //
- this.Log.Text = "Log";
- this.Log.Width = 201;
- //
- // VisualizerBox
- //
- this.VisualizerBox.Controls.Add(this.button1);
- this.VisualizerBox.Location = new System.Drawing.Point(300, 144);
- this.VisualizerBox.Name = "VisualizerBox";
- this.VisualizerBox.Size = new System.Drawing.Size(274, 166);
- this.VisualizerBox.TabIndex = 6;
- this.VisualizerBox.TabStop = false;
- this.VisualizerBox.Text = "Visualize Savestates";
- this.VisualizerBox.Visible = false;
- this.VisualizerBox.Paint += new System.Windows.Forms.PaintEventHandler(this.VisualizerBox_Paint);
- this.VisualizerBox.Enter += new System.EventHandler(this.VisualizerBox_Enter);
- //
- // button1
- //
- this.button1.Location = new System.Drawing.Point(211, 137);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(57, 23);
- this.button1.TabIndex = 0;
- this.button1.Text = "Scan";
- this.button1.UseVisualStyleBackColor = true;
- this.button1.Click += new System.EventHandler(this.button1_Click);
- //
- // alwaysOnTopToolStripMenuItem
- //
- this.alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem";
- this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
- this.alwaysOnTopToolStripMenuItem.Text = "Always On Top";
- this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.alwaysOnTopToolStripMenuItem_Click);
- //
- // TAStudio
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(586, 519);
- this.Controls.Add(this.VisualizerBox);
- this.Controls.Add(this.toolStrip1);
- this.Controls.Add(this.menuStrip1);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.ReadOnlyCheckBox);
- this.Controls.Add(this.TASView);
- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MainMenuStrip = this.menuStrip1;
- this.MinimumSize = new System.Drawing.Size(437, 148);
- this.Name = "TAStudio";
- this.Text = "TAStudio";
- this.Load += new System.EventHandler(this.TAStudio_Load);
- this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TAStudio_KeyPress);
- this.menuStrip1.ResumeLayout(false);
- this.menuStrip1.PerformLayout();
- this.contextMenuStrip1.ResumeLayout(false);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- this.toolStrip1.ResumeLayout(false);
- this.toolStrip1.PerformLayout();
- this.VisualizerBox.ResumeLayout(false);
- this.ResumeLayout(false);
- this.PerformLayout();
+ this.TASView.ContextMenuStrip = this.contextMenuStrip1;
+ this.TASView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.TASView.FullRowSelect = true;
+ this.TASView.GridLines = true;
+ this.TASView.ItemCount = 0;
+ this.TASView.Location = new System.Drawing.Point(12, 55);
+ this.TASView.Name = "TASView";
+ this.TASView.selectedItem = -1;
+ this.TASView.Size = new System.Drawing.Size(282, 452);
+ this.TASView.TabIndex = 1;
+ this.TASView.UseCompatibleStateImageBehavior = false;
+ this.TASView.View = System.Windows.Forms.View.Details;
+ this.TASView.SelectedIndexChanged += new System.EventHandler(this.TASView_SelectedIndexChanged);
+ this.TASView.Click += new System.EventHandler(this.TASView_Click);
+ this.TASView.DoubleClick += new System.EventHandler(this.TASView_DoubleClick);
+ this.TASView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TASView_KeyDown);
+ this.TASView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TASView_MouseUp);
+ this.TASView.MouseWheel += new System.Windows.Forms.MouseEventHandler(this.TASView_MouseWheel);
+ //
+ // Frame
+ //
+ this.Frame.Text = "Frame";
+ //
+ // Log
+ //
+ this.Log.Text = "Log";
+ this.Log.Width = 201;
+ //
+ // VisualizerBox
+ //
+ this.VisualizerBox.Controls.Add(this.button1);
+ this.VisualizerBox.Location = new System.Drawing.Point(300, 144);
+ this.VisualizerBox.Name = "VisualizerBox";
+ this.VisualizerBox.Size = new System.Drawing.Size(274, 166);
+ this.VisualizerBox.TabIndex = 6;
+ this.VisualizerBox.TabStop = false;
+ this.VisualizerBox.Text = "Visualize Savestates";
+ this.VisualizerBox.Visible = false;
+ this.VisualizerBox.Paint += new System.Windows.Forms.PaintEventHandler(this.VisualizerBox_Paint);
+ this.VisualizerBox.Enter += new System.EventHandler(this.VisualizerBox_Enter);
+ //
+ // button1
+ //
+ this.button1.Location = new System.Drawing.Point(211, 137);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(57, 23);
+ this.button1.TabIndex = 0;
+ this.button1.Text = "Scan";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // alwaysOnTopToolStripMenuItem
+ //
+ this.alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem";
+ this.alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(240, 22);
+ this.alwaysOnTopToolStripMenuItem.Text = "Always On Top";
+ this.alwaysOnTopToolStripMenuItem.Click += new System.EventHandler(this.alwaysOnTopToolStripMenuItem_Click);
+ //
+ // TAStudio
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(586, 519);
+ this.Controls.Add(this.VisualizerBox);
+ this.Controls.Add(this.toolStrip1);
+ this.Controls.Add(this.menuStrip1);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.ReadOnlyCheckBox);
+ this.Controls.Add(this.TASView);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MainMenuStrip = this.menuStrip1;
+ this.MinimumSize = new System.Drawing.Size(437, 148);
+ this.Name = "TAStudio";
+ this.Text = "TAStudio";
+ this.Load += new System.EventHandler(this.TAStudio_Load);
+ this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TAStudio_KeyPress);
+ this.menuStrip1.ResumeLayout(false);
+ this.menuStrip1.PerformLayout();
+ this.contextMenuStrip1.ResumeLayout(false);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.toolStrip1.ResumeLayout(false);
+ this.toolStrip1.PerformLayout();
+ this.VisualizerBox.ResumeLayout(false);
+ this.ResumeLayout(false);
+ this.PerformLayout();
- }
+ }
- #endregion
+ #endregion
- private MenuStripEx menuStrip1;
- private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem newProjectToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem openProjectToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem saveProjectToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem saveProjectAsToolStripMenuItem;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
- private System.Windows.Forms.ToolStripMenuItem importTASFileToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem restoreWindowToolStripMenuItem;
- private VirtualListView TASView;
+ private MenuStripEx menuStrip1;
+ private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem newProjectToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem openProjectToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem saveProjectToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem saveProjectAsToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.ToolStripMenuItem importTASFileToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem restoreWindowToolStripMenuItem;
+ private VirtualListView TASView;
private System.Windows.Forms.ColumnHeader Log;
- private System.Windows.Forms.ToolStripMenuItem recentToolStripMenuItem;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
- private System.Windows.Forms.ToolStripMenuItem nToolStripMenuItem;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ private System.Windows.Forms.ToolStripMenuItem recentToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripMenuItem nToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem;
private ToolStripEx toolStrip1;
- private System.Windows.Forms.ToolStripButton FrameAdvanceButton;
- private System.Windows.Forms.ToolStripButton RewindButton;
+ private System.Windows.Forms.ToolStripButton FrameAdvanceButton;
+ private System.Windows.Forms.ToolStripButton RewindButton;
private System.Windows.Forms.ToolStripButton PauseButton;
private System.Windows.Forms.ToolStripMenuItem autoloadToolStripMenuItem;
private System.Windows.Forms.CheckBox ReadOnlyCheckBox;
@@ -784,8 +786,8 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ToolStripMenuItem clearVirtualPadsToolStripMenuItem;
- private System.Windows.Forms.ToolStripButton FastForward;
- private System.Windows.Forms.ToolStripButton TurboFastForward;
+ private System.Windows.Forms.ToolStripButton FastForward;
+ private System.Windows.Forms.ToolStripButton TurboFastForward;
private System.Windows.Forms.ToolStripMenuItem ContextMenu_Delete;
private System.Windows.Forms.ToolStripMenuItem cloneToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cloneToolStripMenuItem1;
@@ -811,6 +813,6 @@
private System.Windows.Forms.ToolStripMenuItem cutToolStripMenuItem;
private System.Windows.Forms.GroupBox VisualizerBox;
private System.Windows.Forms.Button button1;
- private System.Windows.Forms.ToolStripMenuItem alwaysOnTopToolStripMenuItem;
- }
+ private System.Windows.Forms.ToolStripMenuItem alwaysOnTopToolStripMenuItem;
+ }
}
\ No newline at end of file
diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.MultiClient/tools/TAStudio.cs
index 4eed5a9eec..251563dfd7 100644
--- a/BizHawk.MultiClient/tools/TAStudio.cs
+++ b/BizHawk.MultiClient/tools/TAStudio.cs
@@ -62,7 +62,7 @@ namespace BizHawk.MultiClient
{
if (!IsHandleCreated || IsDisposed) return;
TASView.BlazingFast = true;
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
DisplayList();
}
@@ -71,7 +71,7 @@ namespace BizHawk.MultiClient
TASView.ItemCount = 0;
}
- if (GlobalWinF.MovieSession.Movie.IsPlaying && !GlobalWinF.MovieSession.Movie.IsFinished)
+ if (Global.MovieSession.Movie.IsPlaying && !Global.MovieSession.Movie.IsFinished)
{
TASView.BlazingFast = false;
}
@@ -99,21 +99,21 @@ namespace BizHawk.MultiClient
private void TASView_QueryItemBkColor(int index, int column, ref Color color)
{
- if (index == 0 && GlobalWinF.MovieSession.Movie.StateFirstIndex == 0)
+ if (index == 0 && Global.MovieSession.Movie.StateFirstIndex == 0)
{
if (color != Color.LightGreen)
{
color = Color.LightGreen; //special case for frame 0. Normally we need to go back an extra frame, but for frame 0 we can reload the rom.
}
}
- else if (GlobalWinF.MovieSession.Movie.FrameLagged(index))
+ else if (Global.MovieSession.Movie.FrameLagged(index))
{
if (color != Color.Pink)
{
color = Color.Pink;
}
}
- else if (index > GlobalWinF.MovieSession.Movie.StateFirstIndex && index <= GlobalWinF.MovieSession.Movie.StateLastIndex)
+ else if (index > Global.MovieSession.Movie.StateFirstIndex && index <= Global.MovieSession.Movie.StateLastIndex)
{
if (color != Color.LightGreen)
{
@@ -134,19 +134,19 @@ namespace BizHawk.MultiClient
text = "";
//If this is just for an actual frame and not just the list view cursor at the end
- if (GlobalWinF.MovieSession.Movie.Frames != index)
+ if (Global.MovieSession.Movie.Frames != index)
{
if (column == 0)
text = String.Format("{0:#,##0}", index);
if (column == 1)
- text = GlobalWinF.MovieSession.Movie.GetInput(index);
+ text = Global.MovieSession.Movie.GetInput(index);
}
}
private void DisplayList()
{
- TASView.ItemCount = GlobalWinF.MovieSession.Movie.RawFrames;
- if (GlobalWinF.MovieSession.Movie.Frames == Global.Emulator.Frame && GlobalWinF.MovieSession.Movie.StateLastIndex == Global.Emulator.Frame - 1)
+ TASView.ItemCount = Global.MovieSession.Movie.RawFrames;
+ if (Global.MovieSession.Movie.Frames == Global.Emulator.Frame && Global.MovieSession.Movie.StateLastIndex == Global.Emulator.Frame - 1)
{
//If we're at the end of the movie add one to show the cursor as a blank frame
TASView.ItemCount++;
@@ -168,9 +168,9 @@ namespace BizHawk.MultiClient
GlobalWinF.MainForm.PauseEmulator();
Engaged = true;
GlobalWinF.OSD.AddMessage("TAStudio engaged");
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
- GlobalWinF.MovieSession.Movie.StateCapturing = true;
+ Global.MovieSession.Movie.StateCapturing = true;
ReadOnlyCheckBox.Checked = GlobalWinF.MainForm.ReadOnly;
}
else
@@ -259,12 +259,12 @@ namespace BizHawk.MultiClient
private void RewindButton_Click(object sender, EventArgs e)
{
stopOnFrame = 0;
- if (GlobalWinF.MovieSession.Movie.IsFinished || !GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsFinished || !Global.MovieSession.Movie.IsActive)
{
GlobalWinF.MainForm.Rewind(1);
- if (Global.Emulator.Frame <= GlobalWinF.MovieSession.Movie.Frames)
+ if (Global.Emulator.Frame <= Global.MovieSession.Movie.Frames)
{
- GlobalWinF.MovieSession.Movie.SwitchToPlay();
+ Global.MovieSession.Movie.SwitchToPlay();
}
}
else
@@ -291,9 +291,9 @@ namespace BizHawk.MultiClient
GlobalWinF.MainForm.SetReadOnly(true);
ReadOnlyCheckBox.BackColor = SystemColors.Control;
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
- GlobalWinF.MovieSession.Movie.SwitchToPlay();
+ Global.MovieSession.Movie.SwitchToPlay();
toolTip1.SetToolTip(ReadOnlyCheckBox, "Currently Read-Only Mode");
}
}
@@ -301,9 +301,9 @@ namespace BizHawk.MultiClient
{
GlobalWinF.MainForm.SetReadOnly(false);
ReadOnlyCheckBox.BackColor = Color.LightCoral;
- if (GlobalWinF.MovieSession.Movie.IsActive)
+ if (Global.MovieSession.Movie.IsActive)
{
- GlobalWinF.MovieSession.Movie.SwitchToRecord();
+ Global.MovieSession.Movie.SwitchToRecord();
toolTip1.SetToolTip(ReadOnlyCheckBox, "Currently Read+Write Mode");
}
}
@@ -381,7 +381,7 @@ namespace BizHawk.MultiClient
private void saveProjectToolStripMenuItem_Click(object sender, EventArgs e)
{
- GlobalWinF.MovieSession.Movie.WriteMovie();
+ Global.MovieSession.Movie.WriteMovie();
}
private void saveProjectAsToolStripMenuItem_Click(object sender, EventArgs e)
@@ -390,8 +390,8 @@ namespace BizHawk.MultiClient
if ("" != fileName)
{
- GlobalWinF.MovieSession.Movie.Filename = fileName;
- GlobalWinF.MovieSession.Movie.WriteMovie();
+ Global.MovieSession.Movie.Filename = fileName;
+ Global.MovieSession.Movie.WriteMovie();
}
}
@@ -424,14 +424,14 @@ namespace BizHawk.MultiClient
private void TASView_DoubleClick(object sender, EventArgs e)
{
- if (TASView.selectedItem <= GlobalWinF.MovieSession.Movie.StateLastIndex)
+ if (TASView.selectedItem <= Global.MovieSession.Movie.StateLastIndex)
{
stopOnFrame = 0;
RewindToFrame(TASView.selectedItem);
}
else
{
- RewindToFrame(GlobalWinF.MovieSession.Movie.StateLastIndex);
+ RewindToFrame(Global.MovieSession.Movie.StateLastIndex);
stopOnFrame = TASView.selectedItem;
GlobalWinF.MainForm.PressFrameAdvance = true;
}
@@ -455,7 +455,7 @@ namespace BizHawk.MultiClient
{
InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPath, null),
DefaultExt = "." + Global.Config.MovieExtension,
- FileName = GlobalWinF.MovieSession.Movie.Filename
+ FileName = Global.MovieSession.Movie.Filename
};
string filter = "Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|Savestates|*.state|All Files|*.*";
sfd.Filter = filter;
@@ -537,7 +537,7 @@ namespace BizHawk.MultiClient
ListView.SelectedIndexCollection list = TASView.SelectedIndices;
for (int index = 0; index < list.Count; index++)
{
- GlobalWinF.MovieSession.Movie.InsertBlankFrame(list[index]);
+ Global.MovieSession.Movie.InsertBlankFrame(list[index]);
}
UpdateValues();
@@ -545,18 +545,18 @@ namespace BizHawk.MultiClient
private void RewindToFrame(int frame)
{
- if (!GlobalWinF.MovieSession.Movie.IsActive || GlobalWinF.MovieSession.Movie.IsFinished)
+ if (!Global.MovieSession.Movie.IsActive || Global.MovieSession.Movie.IsFinished)
{
return;
}
else if (frame <= Global.Emulator.Frame)
{
- if (frame <= GlobalWinF.MovieSession.Movie.StateFirstIndex)
+ if (frame <= Global.MovieSession.Movie.StateFirstIndex)
{
- Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(GlobalWinF.MovieSession.Movie.InitState)));
- if (GlobalWinF.MovieSession.Movie.IsRecording)
+ Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.InitState)));
+ if (Global.MovieSession.Movie.IsRecording)
{
- GlobalWinF.MovieSession.Movie.StartPlayback();
+ Global.MovieSession.Movie.StartPlayback();
GlobalWinF.MainForm.RestoreReadWriteOnStop = true;
}
}
@@ -564,19 +564,19 @@ namespace BizHawk.MultiClient
{
if (frame == 0)
{
- Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(GlobalWinF.MovieSession.Movie.InitState)));
+ Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.InitState)));
}
else
{
//frame-1 because we need to go back an extra frame and then run a frame, otherwise the display doesn't get updated.
- Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(GlobalWinF.MovieSession.Movie.GetState(frame - 1))));
+ Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.GetState(frame - 1))));
GlobalWinF.MainForm.UpdateFrame = true;
}
}
}
- else if (frame <= GlobalWinF.MovieSession.Movie.StateLastIndex)
+ else if (frame <= Global.MovieSession.Movie.StateLastIndex)
{
- Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(GlobalWinF.MovieSession.Movie.GetState(frame - 1))));
+ Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(Global.MovieSession.Movie.GetState(frame - 1))));
GlobalWinF.MainForm.UpdateFrame = true;
}
else
@@ -587,9 +587,9 @@ namespace BizHawk.MultiClient
public void DeleteFrame(int frame)
{
- if (frame <= GlobalWinF.MovieSession.Movie.StateLastIndex)
+ if (frame <= Global.MovieSession.Movie.StateLastIndex)
{
- if (frame <= GlobalWinF.MovieSession.Movie.StateFirstIndex)
+ if (frame <= Global.MovieSession.Movie.StateFirstIndex)
{
RewindToFrame(0);
}
@@ -598,7 +598,7 @@ namespace BizHawk.MultiClient
RewindToFrame(frame);
}
}
- GlobalWinF.MovieSession.Movie.DeleteFrame(frame);
+ Global.MovieSession.Movie.DeleteFrame(frame);
}
private void DeleteFrames()
@@ -606,7 +606,7 @@ namespace BizHawk.MultiClient
ListView.SelectedIndexCollection list = TASView.SelectedIndices;
foreach (object t in list)
{
- GlobalWinF.MovieSession.Movie.DeleteFrame(list[0]); //TODO: this doesn't allow of non-continuous deletion, instead it should iterate from last to first and remove the iterated value
+ Global.MovieSession.Movie.DeleteFrame(list[0]); //TODO: this doesn't allow of non-continuous deletion, instead it should iterate from last to first and remove the iterated value
}
UpdateValues();
@@ -617,7 +617,7 @@ namespace BizHawk.MultiClient
ListView.SelectedIndexCollection list = TASView.SelectedIndices;
for (int index = 0; index < list.Count; index++)
{
- GlobalWinF.MovieSession.Movie.InsertFrame(GlobalWinF.MovieSession.Movie.GetInput(list[index]), list[index]);
+ Global.MovieSession.Movie.InsertFrame(Global.MovieSession.Movie.GetInput(list[index]), list[index]);
}
UpdateValues();
@@ -628,7 +628,7 @@ namespace BizHawk.MultiClient
ListView.SelectedIndexCollection list = TASView.SelectedIndices;
for (int index = 0; index < list.Count; index++)
{
- GlobalWinF.MovieSession.Movie.ClearFrame(list[index]);
+ Global.MovieSession.Movie.ClearFrame(list[index]);
}
UpdateValues();
@@ -649,7 +649,7 @@ namespace BizHawk.MultiClient
int frames = int.Parse(prompt.UserText);
for (int i = 0; i < frames; i++)
{
- GlobalWinF.MovieSession.Movie.InsertBlankFrame(list[0] + i);
+ Global.MovieSession.Movie.InsertBlankFrame(list[0] + i);
}
}
}
@@ -694,7 +694,7 @@ namespace BizHawk.MultiClient
ListView.SelectedIndexCollection list = TASView.SelectedIndices;
if (list.Count > 0)
{
- GlobalWinF.MovieSession.Movie.TruncateMovie(list[0]);
+ Global.MovieSession.Movie.TruncateMovie(list[0]);
UpdateValues();
}
}
@@ -715,7 +715,7 @@ namespace BizHawk.MultiClient
ListView.SelectedIndexCollection list = TASView.SelectedIndices;
for (int i = 0; i < list.Count; i++)
{
- ClipboardEntry entry = new ClipboardEntry {Frame = list[i], Inputstr = GlobalWinF.MovieSession.Movie.GetInput(list[i])};
+ ClipboardEntry entry = new ClipboardEntry {Frame = list[i], Inputstr = Global.MovieSession.Movie.GetInput(list[i])};
Clipboard.Add(entry);
}
UpdateSlicerDisplay();
@@ -760,7 +760,7 @@ namespace BizHawk.MultiClient
{
for (int i = 0; i < Clipboard.Count; i++)
{
- GlobalWinF.MovieSession.Movie.ModifyFrame(Clipboard[i].Inputstr, list[0] + i);
+ Global.MovieSession.Movie.ModifyFrame(Clipboard[i].Inputstr, list[0] + i);
}
}
UpdateValues();
@@ -773,7 +773,7 @@ namespace BizHawk.MultiClient
{
for (int i = 0; i < Clipboard.Count; i++)
{
- GlobalWinF.MovieSession.Movie.InsertFrame(Clipboard[i].Inputstr, list[0] + i);
+ Global.MovieSession.Movie.InsertFrame(Clipboard[i].Inputstr, list[0] + i);
}
}
UpdateValues();
@@ -797,7 +797,7 @@ namespace BizHawk.MultiClient
Clipboard.Clear();
for (int i = 0; i < list.Count; i++)
{
- ClipboardEntry entry = new ClipboardEntry {Frame = list[i], Inputstr = GlobalWinF.MovieSession.Movie.GetInput(list[i])};
+ ClipboardEntry entry = new ClipboardEntry {Frame = list[i], Inputstr = Global.MovieSession.Movie.GetInput(list[i])};
Clipboard.Add(entry);
DeleteFrame(list[0]);
}
diff --git a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs
index 583e065ed4..a4c460a397 100644
--- a/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs
+++ b/BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs
@@ -254,9 +254,9 @@ namespace BizHawk.MultiClient
{
if (!IsHandleCreated || IsDisposed) return;
- if (GlobalWinF.MovieSession.Movie.IsPlaying && !GlobalWinF.MovieSession.Movie.IsFinished)
+ if (Global.MovieSession.Movie.IsPlaying && !Global.MovieSession.Movie.IsFinished)
{
- string str = GlobalWinF.MovieSession.Movie.GetInput(Global.Emulator.Frame);
+ string str = Global.MovieSession.Movie.GetInput(Global.Emulator.Frame);
if (Global.Config.TASUpdatePads && str != "")
{
switch (Global.Emulator.SystemId)