ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

These changes are TAStudio related. 

1. Added a list of save states to the movie log.
2. Added corresponding support functions for the save states.
3. Added double click to the list view to load a previous frame.
4. Added a context menu to the list view with insert and delete.
5. Fixed some issues with the green zone of valid state history.
6. Fixed an input bug that I had unwittingly created, as well as issues with the nes log format.
This commit is contained in:
phillip.grimsrud 2012-06-01 05:49:26 +00:00
parent 986774f5ee
commit d6479e5613
9 changed files with 597 additions and 454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
BizHawk.MultiClient/MainForm.cs
View File

@ -33,6 +33,7 @@ namespace BizHawk.MultiClient
public bool FastForward = false;
public bool TurboFastForward = false;
public bool StopOnEnd = false;
public bool UpdateFrame = false;
//avi/wav state
IVideoWriter CurrAviWriter = null;
@ -1797,6 +1798,12 @@ namespace BizHawk.MultiClient
if (Global.MovieSession.Movie.Mode == MOVIEMODE.RECORD)
Global.MovieSession.Movie.Mode = MOVIEMODE.PLAY;
}
if (true == UpdateFrame)
{
runFrame = true;
if (Global.MovieSession.Movie.Mode == MOVIEMODE.RECORD)
Global.MovieSession.Movie.Mode = MOVIEMODE.PLAY;
}
bool genSound = false;
if (runFrame)
@ -1830,6 +1837,8 @@ namespace BizHawk.MultiClient
}
if (!suppressCaptureRewind && Global.Config.RewindEnabled) CaptureRewindState();
Global.MovieSession.Movie.CaptureState();
if (!runloop_frameadvance) genSound = true;
else if (!Global.Config.MuteFrameAdvance)
genSound = true;
@ -1924,6 +1933,12 @@ namespace BizHawk.MultiClient
Global.MovieSession.Movie.Mode = MOVIEMODE.RECORD;
PressRewind = false;
}
if (true == UpdateFrame)
{
if (ReturnToRecording)
Global.MovieSession.Movie.Mode = MOVIEMODE.RECORD;
UpdateFrame = false;
}
if (genSound)
{
@ -1960,6 +1975,7 @@ namespace BizHawk.MultiClient
//The other tool updates are earlier, TAStudio needs to be later so it can display the latest
//frame of execution in its list view.
TAStudio1.UpdateValues();
Global.MovieSession.Movie.CheckValidity();
}
private unsafe Image MakeScreenshotImage()

2
BizHawk.MultiClient/movie/InputAdapters.cs
View File

@ -396,7 +396,7 @@ namespace BizHawk.MultiClient
if (ControlType == "NES Controller")
{
if (mnemonic.Length < 2) return;
Force("Reset", mnemonic[1] != '.' && mnemonic[1] != 'r' && mnemonic[1] != 'l');
Force("Reset", mnemonic[1] != '.' && mnemonic[1] != '0' && mnemonic[1] != 'l');
}
if (ControlType == "SMS Controller" || ControlType == "TI83 Controller")
{

37
BizHawk.MultiClient/movie/Movie.cs
View File

@ -89,6 +89,39 @@ namespace BizHawk.MultiClient
Mode = MOVIEMODE.INACTIVE;
}
public void CaptureState()
{
byte[] state = Global.Emulator.SaveStateBinary();
Log.AddState(state);
}
public void RewindToFrame(int frame)
{
if (frame <= Global.Emulator.Frame)
{
//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(Log.GetState(frame - 1))));
Global.MainForm.UpdateFrame = true;
}
}
public void DeleteFrame(int frame)
{
RewindToFrame(frame);
Log.DeleteFrame(frame);
Global.MainForm.TAStudio1.UpdateValues();
}
public int LastValidState()
{
return Log.LastValidState();
}
public void CheckValidity()
{
Log.CheckValidity();
}
public void ClearSaveRAM()
{
string x = PathManager.SaveRamPath(Global.Game);
@ -174,7 +207,9 @@ namespace BizHawk.MultiClient
public void InsertFrame(string record, int frame)
{
Log.SetFrameAt(frame, record);
Log.AddFrameAt(record,frame);
Global.MainForm.TAStudio1.UpdateValues();
}
public void WriteMovie()

59
BizHawk.MultiClient/movie/MovieLog.cs
View File

@ -15,6 +15,9 @@ namespace BizHawk.MultiClient
List<string> MovieRecords = new List<string>();
private List<byte[]> StateList = new List<byte[]>();
private int StateLastValidIndex = -1;
public MovieLog()
{
//Should this class initialize with an empty string to MovieRecords so that first frame is index 1?
@ -35,6 +38,16 @@ namespace BizHawk.MultiClient
{
MovieRecords.Add(frame);
}
public void AddState(byte[] state)
{
if (Global.Emulator.Frame >= StateList.Count)
{
StateList.Add(state);
StateLastValidIndex = Global.Emulator.Frame;
}
}
public void SetFrameAt(int frameNum, string frame)
{
if (MovieRecords.Count > frameNum)
@ -45,6 +58,52 @@ namespace BizHawk.MultiClient
public void AddFrameAt(string frame, int frameNum)
{
MovieRecords.Insert(frameNum, frame);
if (frameNum <= StateList.Count - 1)
{
StateList.RemoveRange(frameNum, StateList.Count - frameNum);
}
if (StateLastValidIndex >= frameNum)
{
StateLastValidIndex = frameNum - 1;
}
}
public void CheckValidity()
{
byte[] state = Global.Emulator.SaveStateBinary();
if (Global.Emulator.Frame < StateList.Count && (null == StateList[Global.Emulator.Frame] || !state.SequenceEqual((byte[])StateList[Global.Emulator.Frame])))
{
StateLastValidIndex = Global.Emulator.Frame;
}
}
public int CapturedStateCount()
{
return StateList.Count;
}
public int LastValidState()
{
return StateLastValidIndex;
}
public byte[] GetState(int frame)
{
return StateList[frame];
}
public void DeleteFrame(int frame)
{
MovieRecords.RemoveAt(frame);
if (frame < StateList.Count)
{
StateList.RemoveAt(frame);
}
if (StateLastValidIndex > frame)
{
StateLastValidIndex = frame;
}
}
public void Truncate(int frame)

889
BizHawk.MultiClient/tools/TAStudio.Designer.cs generated
View File

@ -28,75 +28,75 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TAStudio));
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
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.insertFrameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
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.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.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.insertFrameToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ControllerBox = new System.Windows.Forms.GroupBox();
this.ControllersContext = new System.Windows.Forms.ContextMenuStrip(this.components);
this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
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.menuStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.ControllersContext.SuspendLayout();
this.SuspendLayout();
//
// menuStrip1
//
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TAStudio));
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
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.insertFrameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
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.InsertOneFrame = new System.Windows.Forms.ToolStripMenuItem();
this.SelectAll = new System.Windows.Forms.ToolStripMenuItem();
this.ControllerBox = new System.Windows.Forms.GroupBox();
this.ControllersContext = new System.Windows.Forms.ContextMenuStrip(this.components);
this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
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.DeleteFrames = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.ControllersContext.SuspendLayout();
this.toolStrip1.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(686, 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(686, 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,
@ -106,174 +106,237 @@
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.insertFrameToolStripMenuItem,
this.toolStripSeparator7,
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);
//
// insertFrameToolStripMenuItem
//
this.insertFrameToolStripMenuItem.Name = "insertFrameToolStripMenuItem";
this.insertFrameToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
this.insertFrameToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.insertFrameToolStripMenuItem.Text = "Insert Frame";
this.insertFrameToolStripMenuItem.Click += new System.EventHandler(this.insertFrameToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(188, 6);
//
// clearVirtualPadsToolStripMenuItem
//
this.clearVirtualPadsToolStripMenuItem.Name = "clearVirtualPadsToolStripMenuItem";
this.clearVirtualPadsToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.clearVirtualPadsToolStripMenuItem.Text = "&Clear Controller Holds";
this.clearVirtualPadsToolStripMenuItem.Click += new System.EventHandler(this.clearVirtualPadsToolStripMenuItem_Click);
//
// 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);
//
// insertFrameToolStripMenuItem
//
this.insertFrameToolStripMenuItem.Name = "insertFrameToolStripMenuItem";
this.insertFrameToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
this.insertFrameToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.insertFrameToolStripMenuItem.Text = "Insert Frame";
this.insertFrameToolStripMenuItem.Click += new System.EventHandler(this.insertFrameToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(188, 6);
//
// clearVirtualPadsToolStripMenuItem
//
this.clearVirtualPadsToolStripMenuItem.Name = "clearVirtualPadsToolStripMenuItem";
this.clearVirtualPadsToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.clearVirtualPadsToolStripMenuItem.Text = "&Clear Controller Holds";
this.clearVirtualPadsToolStripMenuItem.Click += new System.EventHandler(this.clearVirtualPadsToolStripMenuItem_Click);
//
// settingsToolStripMenuItem
//
this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.saveWindowPositionToolStripMenuItem,
this.autoloadToolStripMenuItem,
this.updatePadsOnMovePlaybackToolStripMenuItem,
this.toolStripSeparator4,
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);
//
// toolStrip1
//
this.toolStrip1.ClickThrough = true;
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None;
this.toolStrip1.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.InsertOneFrame,
this.DeleteFrames,
this.SelectAll});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(157, 70);
//
// InsertOneFrame
//
this.InsertOneFrame.Name = "InsertOneFrame";
this.InsertOneFrame.Size = new System.Drawing.Size(156, 22);
this.InsertOneFrame.Text = "Insert Frame";
this.InsertOneFrame.Click += new System.EventHandler(this.InsertOneFrame_Click);
//
// SelectAll
//
this.SelectAll.Enabled = false;
this.SelectAll.Name = "SelectAll";
this.SelectAll.Size = new System.Drawing.Size(156, 22);
this.SelectAll.Text = "Select All";
//
// ControllerBox
//
this.ControllerBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.ControllerBox.ContextMenuStrip = this.ControllersContext;
this.ControllerBox.Location = new System.Drawing.Point(300, 55);
this.ControllerBox.Name = "ControllerBox";
this.ControllerBox.Size = new System.Drawing.Size(367, 197);
this.ControllerBox.TabIndex = 4;
this.ControllerBox.TabStop = false;
this.ControllerBox.Text = "Controllers";
//
// ControllersContext
//
this.ControllersContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.clearToolStripMenuItem1});
this.ControllersContext.Name = "ControllersContext";
this.ControllersContext.Size = new System.Drawing.Size(136, 26);
//
// clearToolStripMenuItem1
//
this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1";
this.clearToolStripMenuItem1.Size = new System.Drawing.Size(135, 22);
this.clearToolStripMenuItem1.Text = "&Clear Holds";
this.clearToolStripMenuItem1.Click += new System.EventHandler(this.clearToolStripMenuItem1_Click);
//
// 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,
@ -283,223 +346,167 @@
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);
//
// 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.insertFrameToolStripMenuItem1,
this.toolStripSeparator5,
this.selectAllToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(140, 54);
//
// insertFrameToolStripMenuItem1
//
this.insertFrameToolStripMenuItem1.Name = "insertFrameToolStripMenuItem1";
this.insertFrameToolStripMenuItem1.Size = new System.Drawing.Size(139, 22);
this.insertFrameToolStripMenuItem1.Text = "Insert Frame";
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(136, 6);
//
// selectAllToolStripMenuItem
//
this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.selectAllToolStripMenuItem.Text = "Select All";
//
// ControllerBox
//
this.ControllerBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.ControllerBox.ContextMenuStrip = this.ControllersContext;
this.ControllerBox.Location = new System.Drawing.Point(300, 55);
this.ControllerBox.Name = "ControllerBox";
this.ControllerBox.Size = new System.Drawing.Size(367, 197);
this.ControllerBox.TabIndex = 4;
this.ControllerBox.TabStop = false;
this.ControllerBox.Text = "Controllers";
//
// ControllersContext
//
this.ControllersContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.clearToolStripMenuItem1});
this.ControllersContext.Name = "ControllersContext";
this.ControllersContext.Size = new System.Drawing.Size(136, 26);
//
// clearToolStripMenuItem1
//
this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1";
this.clearToolStripMenuItem1.Size = new System.Drawing.Size(135, 22);
this.clearToolStripMenuItem1.Text = "&Clear Holds";
this.clearToolStripMenuItem1.Click += new System.EventHandler(this.clearToolStripMenuItem1_Click);
//
// TASView
//
this.TASView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
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)
| System.Windows.Forms.AnchorStyles.Right)));
this.TASView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.Frame,
this.Log});
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;
//
// Frame
//
this.Frame.Text = "Frame";
//
// Log
//
this.Log.Text = "Log";
this.Log.Width = 201;
//
// TAStudio
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(686, 519);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.menuStrip1);
this.Controls.Add(this.ReadOnlyCheckBox);
this.Controls.Add(this.TASView);
this.Controls.Add(this.ControllerBox);
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.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.contextMenuStrip1.ResumeLayout(false);
this.ControllersContext.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.DoubleClick += new System.EventHandler(this.TASView_DoubleClick);
//
// Frame
//
this.Frame.Text = "Frame";
//
// Log
//
this.Log.Text = "Log";
this.Log.Width = 201;
//
// DeleteFrames
//
this.DeleteFrames.Name = "DeleteFrames";
this.DeleteFrames.Size = new System.Drawing.Size(156, 22);
this.DeleteFrames.Text = "Delete Frame(s)";
this.DeleteFrames.Click += new System.EventHandler(this.DeleteFrames_Click);
//
// TAStudio
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(686, 519);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.menuStrip1);
this.Controls.Add(this.ReadOnlyCheckBox);
this.Controls.Add(this.TASView);
this.Controls.Add(this.ControllerBox);
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.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.contextMenuStrip1.ResumeLayout(false);
this.ControllersContext.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
@ -537,9 +544,8 @@
private System.Windows.Forms.ToolStripButton FastFowardToEnd;
private System.Windows.Forms.ToolStripMenuItem insertFrameToolStripMenuItem;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
private System.Windows.Forms.ToolStripMenuItem insertFrameToolStripMenuItem1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem InsertOneFrame;
private System.Windows.Forms.ToolStripMenuItem SelectAll;
private System.Windows.Forms.GroupBox ControllerBox;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
private System.Windows.Forms.ToolStripButton StopButton;
@ -551,5 +557,6 @@
private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem1;
private System.Windows.Forms.ToolStripButton FastForward;
private System.Windows.Forms.ToolStripButton TurboFastForward;
private System.Windows.Forms.ToolStripMenuItem DeleteFrames;
}
}

32
BizHawk.MultiClient/tools/TAStudio.cs
View File

@ -23,7 +23,8 @@ namespace BizHawk.MultiClient
//PCE virtualpad
//Dynamic virtualpad system based on platform
//ensureVisible when recording
//Allow hotkeys when TAStudio has focus
//Allow hotkeys when TAStudio has focus
//Reduce the memory footprint with compression and or dropping frames and rerunning them when requested.
int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired
int defaultHeight;
@ -103,10 +104,14 @@ namespace BizHawk.MultiClient
private void TASView_QueryItemBkColor(int index, int column, ref Color color)
{
if (index < Global.MainForm.RewindBufferCount())
if (index <= Global.MovieSession.Movie.LastValidState())
color = Color.LightGreen;
else if (Global.MovieSession.Movie.GetInputFrame(index)[1] == 'L')
color = Color.Pink;
if (index == Global.Emulator.Frame)
{
color = Color.LightBlue;
}
}
private void TASView_QueryItemText(int index, int column, out string text)
@ -308,7 +313,7 @@ namespace BizHawk.MultiClient
private void RewindButton_Click(object sender, EventArgs e)
{
Global.MainForm.PressRewind = true;
Global.MovieSession.Movie.RewindToFrame(Global.Emulator.Frame - 1);
}
private void PauseButton_Click(object sender, EventArgs e)
@ -445,5 +450,26 @@ namespace BizHawk.MultiClient
this.FastFowardToEnd.Checked = false;
}
}
private void TASView_SelectedIndexChanged(object sender, EventArgs e)
{
}
private void TASView_DoubleClick(object sender, EventArgs e)
{
Global.MovieSession.Movie.RewindToFrame(TASView.selectedItem);
}
private void InsertOneFrame_Click(object sender, EventArgs e)
{
Global.MovieSession.Movie.InsertFrame(Global.MovieSession.Movie.GetInputFrame(TASView.selectedItem), TASView.selectedItem);
Global.MovieSession.Movie.RewindToFrame(TASView.selectedItem);
}
private void DeleteFrames_Click(object sender, EventArgs e)
{
Global.MovieSession.Movie.DeleteFrame(TASView.selectedItem);
}
}
}

6
BizHawk.MultiClient/tools/TAStudio.resx
View File

@ -120,9 +120,6 @@
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>126, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>324, 17</value>
</metadata>
@ -132,6 +129,9 @@
<metadata name="ControllersContext.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>571, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>126, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

8
BizHawk.MultiClient/tools/VirtualPadNES.cs
View File

@ -155,13 +155,13 @@ namespace BizHawk.MultiClient
public override string GetMnemonic()
{
StringBuilder input = new StringBuilder("");
input.Append(PR.Checked ? "R" : ".");
input.Append(PL.Checked ? "L" : ".");
input.Append(PD.Checked ? "D" : ".");
input.Append(PU.Checked ? "U" : ".");
input.Append(PD.Checked ? "D" : ".");
input.Append(PL.Checked ? "L" : ".");
input.Append(PR.Checked ? "R" : ".");
input.Append(B2.Checked ? "S" : ".");
input.Append(B1.Checked ? "s" : ".");
input.Append(B2.Checked ? "S" : ".");
input.Append(B3.Checked ? "B" : ".");
input.Append(B4.Checked ? "A" : ".");
input.Append("|");

2
BizHawk.MultiClient/tools/VirtualPadNESControl.cs
View File

@ -96,7 +96,7 @@ namespace BizHawk.MultiClient
public override void SetButtons(string buttons)
{
if (buttons.Length < 1) return;
if (buttons[0] == '.' || buttons[0] == 'l')
if (buttons[0] == '.' || buttons[0] == 'l' || buttons[0] == '0')
{
B2.Checked = false;
}