From 95e7c534f654d42e1b544c66f48bd23ee484fc7b Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 27 Jul 2014 17:56:00 +0000 Subject: [PATCH] Play movie - turbo option for the stop on frame feature --- .../movie/PlayMovie.Designer.cs | 19 ++++++++++++++++++- BizHawk.Client.EmuHawk/movie/PlayMovie.cs | 2 ++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs b/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs index 9dbe2a119d..2ff034c0ad 100644 --- a/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs +++ b/BizHawk.Client.EmuHawk/movie/PlayMovie.Designer.cs @@ -55,6 +55,7 @@ this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.LastFrameCheckbox = new System.Windows.Forms.CheckBox(); + this.TurboCheckbox = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -237,6 +238,7 @@ // // StopOnFrameCheckbox // + this.StopOnFrameCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.StopOnFrameCheckbox.AutoSize = true; this.StopOnFrameCheckbox.Location = new System.Drawing.Point(342, 357); this.StopOnFrameCheckbox.Name = "StopOnFrameCheckbox"; @@ -248,6 +250,7 @@ // // StopOnFrameTextBox // + this.StopOnFrameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.StopOnFrameTextBox.ByteSize = BizHawk.Client.Common.Watch.WatchSize.Byte; this.StopOnFrameTextBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper; this.StopOnFrameTextBox.Location = new System.Drawing.Point(438, 355); @@ -313,8 +316,9 @@ // // LastFrameCheckbox // + this.LastFrameCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.LastFrameCheckbox.AutoSize = true; - this.LastFrameCheckbox.Location = new System.Drawing.Point(342, 375); + this.LastFrameCheckbox.Location = new System.Drawing.Point(342, 376); this.LastFrameCheckbox.Name = "LastFrameCheckbox"; this.LastFrameCheckbox.Size = new System.Drawing.Size(75, 17); this.LastFrameCheckbox.TabIndex = 59; @@ -322,6 +326,17 @@ this.LastFrameCheckbox.UseVisualStyleBackColor = true; this.LastFrameCheckbox.CheckedChanged += new System.EventHandler(this.LastFrameCheckbox_CheckedChanged); // + // TurboCheckbox + // + this.TurboCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.TurboCheckbox.AutoSize = true; + this.TurboCheckbox.Location = new System.Drawing.Point(438, 376); + this.TurboCheckbox.Name = "TurboCheckbox"; + this.TurboCheckbox.Size = new System.Drawing.Size(54, 17); + this.TurboCheckbox.TabIndex = 60; + this.TurboCheckbox.Text = "Turbo"; + this.TurboCheckbox.UseVisualStyleBackColor = true; + // // PlayMovie // this.AcceptButton = this.OK; @@ -329,6 +344,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.Cancel; this.ClientSize = new System.Drawing.Size(774, 398); + this.Controls.Add(this.TurboCheckbox); this.Controls.Add(this.LastFrameCheckbox); this.Controls.Add(this.StopOnFrameTextBox); this.Controls.Add(this.StopOnFrameCheckbox); @@ -384,5 +400,6 @@ private System.Windows.Forms.CheckBox StopOnFrameCheckbox; private WatchValueBox StopOnFrameTextBox; private System.Windows.Forms.CheckBox LastFrameCheckbox; + private System.Windows.Forms.CheckBox TurboCheckbox; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs index 3b72266977..64b15abcab 100644 --- a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs +++ b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs @@ -42,6 +42,7 @@ namespace BizHawk.Client.EmuHawk MatchHashCheckBox.Checked = Global.Config.PlayMovie_MatchHash; ScanFiles(); PreHighlightMovie(); + TurboCheckbox.Checked = Global.Config.TurboSeek; } private void MovieView_QueryItemText(int index, int column, out string text) @@ -661,6 +662,7 @@ namespace BizHawk.Client.EmuHawk private void Ok_Click(object sender, EventArgs e) { + Global.Config.TurboSeek = TurboCheckbox.Checked; Run(); Global.MovieSession.ReadOnly = ReadOnlyCheckBox.Checked;