diff --git a/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.Designer.cs b/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.Designer.cs
index 8ff72bdbab..27d955cf9a 100644
--- a/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.Designer.cs
@@ -28,191 +28,203 @@
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(VideoWriterChooserForm));
- this.checkBoxResize = new System.Windows.Forms.CheckBox();
- this.listBox1 = new System.Windows.Forms.ListBox();
- this.buttonOK = new System.Windows.Forms.Button();
- this.buttonCancel = new System.Windows.Forms.Button();
- this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
- this.labelDescription = new System.Windows.Forms.Label();
- this.labelDescriptionBody = new System.Windows.Forms.Label();
- this.numericTextBoxW = new BizHawk.Client.EmuHawk.NumericTextBox();
- this.numericTextBoxH = new BizHawk.Client.EmuHawk.NumericTextBox();
- this.label3 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
- this.buttonAuto = new System.Windows.Forms.Button();
- this.panelSizeSelect = new System.Windows.Forms.Panel();
- this.tableLayoutPanel4.SuspendLayout();
- this.panelSizeSelect.SuspendLayout();
- this.SuspendLayout();
- //
- // checkBoxResize
- //
- this.checkBoxResize.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.checkBoxResize.AutoSize = true;
- this.checkBoxResize.Location = new System.Drawing.Point(347, 12);
- this.checkBoxResize.Name = "checkBoxResize";
- this.checkBoxResize.Size = new System.Drawing.Size(88, 17);
- this.checkBoxResize.TabIndex = 9;
- this.checkBoxResize.Text = "Resize Video";
- this.checkBoxResize.UseVisualStyleBackColor = true;
- this.checkBoxResize.CheckedChanged += new System.EventHandler(this.checkBoxResize_CheckedChanged);
- //
- // listBox1
- //
- this.listBox1.FormattingEnabled = true;
- this.listBox1.IntegralHeight = false;
- this.listBox1.Location = new System.Drawing.Point(12, 12);
- this.listBox1.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
- this.listBox1.Name = "listBox1";
- this.listBox1.Size = new System.Drawing.Size(329, 202);
- this.listBox1.TabIndex = 0;
- this.listBox1.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged);
- //
- // buttonOK
- //
- this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.buttonOK.Location = new System.Drawing.Point(373, 405);
- this.buttonOK.Name = "buttonOK";
- this.buttonOK.Size = new System.Drawing.Size(65, 23);
- this.buttonOK.TabIndex = 1;
- this.buttonOK.Text = "OK";
- this.buttonOK.UseVisualStyleBackColor = true;
- this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
- //
- // buttonCancel
- //
- this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.buttonCancel.Location = new System.Drawing.Point(444, 405);
- this.buttonCancel.Name = "buttonCancel";
- this.buttonCancel.Size = new System.Drawing.Size(65, 23);
- this.buttonCancel.TabIndex = 2;
- this.buttonCancel.Text = "Cancel";
- this.buttonCancel.UseVisualStyleBackColor = true;
- //
- // tableLayoutPanel4
- //
- this.tableLayoutPanel4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.tableLayoutPanel4.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Inset;
- this.tableLayoutPanel4.ColumnCount = 1;
- this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel4.Controls.Add(this.labelDescription, 0, 0);
- this.tableLayoutPanel4.Controls.Add(this.labelDescriptionBody, 0, 1);
- this.tableLayoutPanel4.Location = new System.Drawing.Point(12, 220);
- this.tableLayoutPanel4.Name = "tableLayoutPanel4";
- this.tableLayoutPanel4.RowCount = 2;
- this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());
- this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel4.Size = new System.Drawing.Size(329, 208);
- this.tableLayoutPanel4.TabIndex = 8;
- //
- // labelDescription
- //
- this.labelDescription.AutoSize = true;
- this.labelDescription.Dock = System.Windows.Forms.DockStyle.Fill;
- this.labelDescription.Location = new System.Drawing.Point(5, 2);
- this.labelDescription.Name = "labelDescription";
- this.labelDescription.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3);
- this.labelDescription.Size = new System.Drawing.Size(319, 19);
- this.labelDescription.TabIndex = 3;
- this.labelDescription.Text = "Description:";
- //
- // labelDescriptionBody
- //
- this.labelDescriptionBody.Dock = System.Windows.Forms.DockStyle.Fill;
- this.labelDescriptionBody.Location = new System.Drawing.Point(5, 23);
- this.labelDescriptionBody.Name = "labelDescriptionBody";
- this.labelDescriptionBody.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3);
- this.labelDescriptionBody.Size = new System.Drawing.Size(319, 183);
- this.labelDescriptionBody.TabIndex = 6;
- this.labelDescriptionBody.Text = resources.GetString("labelDescriptionBody.Text");
- //
- // numericTextBoxW
- //
- this.numericTextBoxW.AllowDecimal = false;
- this.numericTextBoxW.AllowNegative = false;
- this.numericTextBoxW.AllowSpace = false;
- this.numericTextBoxW.Location = new System.Drawing.Point(0, 16);
- this.numericTextBoxW.Name = "numericTextBoxW";
- this.numericTextBoxW.Size = new System.Drawing.Size(70, 20);
- this.numericTextBoxW.TabIndex = 10;
- //
- // numericTextBoxH
- //
- this.numericTextBoxH.AllowDecimal = false;
- this.numericTextBoxH.AllowNegative = false;
- this.numericTextBoxH.AllowSpace = false;
- this.numericTextBoxH.Location = new System.Drawing.Point(92, 16);
- this.numericTextBoxH.Name = "numericTextBoxH";
- this.numericTextBoxH.Size = new System.Drawing.Size(70, 20);
- this.numericTextBoxH.TabIndex = 11;
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(74, 23);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(14, 13);
- this.label3.TabIndex = 12;
- this.label3.Text = "X";
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(3, 0);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(30, 13);
- this.label4.TabIndex = 13;
- this.label4.Text = "Size:";
- //
- // buttonAuto
- //
- this.buttonAuto.Location = new System.Drawing.Point(0, 42);
- this.buttonAuto.Name = "buttonAuto";
- this.buttonAuto.Size = new System.Drawing.Size(162, 23);
- this.buttonAuto.TabIndex = 14;
- this.buttonAuto.Text = "Autodetect Size";
- this.buttonAuto.UseVisualStyleBackColor = true;
- this.buttonAuto.Click += new System.EventHandler(this.buttonAuto_Click);
- //
- // panelSizeSelect
- //
- this.panelSizeSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.panelSizeSelect.Controls.Add(this.label4);
- this.panelSizeSelect.Controls.Add(this.buttonAuto);
- this.panelSizeSelect.Controls.Add(this.numericTextBoxW);
- this.panelSizeSelect.Controls.Add(this.numericTextBoxH);
- this.panelSizeSelect.Controls.Add(this.label3);
- this.panelSizeSelect.Location = new System.Drawing.Point(347, 35);
- this.panelSizeSelect.Name = "panelSizeSelect";
- this.panelSizeSelect.Size = new System.Drawing.Size(162, 83);
- this.panelSizeSelect.TabIndex = 15;
- //
- // VideoWriterChooserForm
- //
- this.AcceptButton = this.buttonOK;
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.CancelButton = this.buttonCancel;
- this.ClientSize = new System.Drawing.Size(521, 440);
- this.Controls.Add(this.panelSizeSelect);
- this.Controls.Add(this.tableLayoutPanel4);
- this.Controls.Add(this.listBox1);
- this.Controls.Add(this.buttonOK);
- this.Controls.Add(this.buttonCancel);
- this.Controls.Add(this.checkBoxResize);
- this.Name = "VideoWriterChooserForm";
- this.ShowIcon = false;
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "Choose A\\V Writer";
- this.tableLayoutPanel4.ResumeLayout(false);
- this.tableLayoutPanel4.PerformLayout();
- this.panelSizeSelect.ResumeLayout(false);
- this.panelSizeSelect.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(VideoWriterChooserForm));
+ this.checkBoxResize = new System.Windows.Forms.CheckBox();
+ this.listBox1 = new System.Windows.Forms.ListBox();
+ this.buttonOK = new System.Windows.Forms.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
+ this.labelDescription = new System.Windows.Forms.Label();
+ this.labelDescriptionBody = new System.Windows.Forms.Label();
+ this.numericTextBoxW = new BizHawk.Client.EmuHawk.NumericTextBox();
+ this.numericTextBoxH = new BizHawk.Client.EmuHawk.NumericTextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.buttonAuto = new System.Windows.Forms.Button();
+ this.panelSizeSelect = new System.Windows.Forms.Panel();
+ this.checkBoxPad = new System.Windows.Forms.CheckBox();
+ this.tableLayoutPanel4.SuspendLayout();
+ this.panelSizeSelect.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // checkBoxResize
+ //
+ this.checkBoxResize.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.checkBoxResize.AutoSize = true;
+ this.checkBoxResize.Location = new System.Drawing.Point(347, 12);
+ this.checkBoxResize.Name = "checkBoxResize";
+ this.checkBoxResize.Size = new System.Drawing.Size(88, 17);
+ this.checkBoxResize.TabIndex = 9;
+ this.checkBoxResize.Text = "Resize Video";
+ this.checkBoxResize.UseVisualStyleBackColor = true;
+ this.checkBoxResize.CheckedChanged += new System.EventHandler(this.checkBoxResize_CheckedChanged);
+ //
+ // listBox1
+ //
+ this.listBox1.FormattingEnabled = true;
+ this.listBox1.IntegralHeight = false;
+ this.listBox1.Location = new System.Drawing.Point(12, 12);
+ this.listBox1.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
+ this.listBox1.Name = "listBox1";
+ this.listBox1.Size = new System.Drawing.Size(329, 202);
+ this.listBox1.TabIndex = 0;
+ this.listBox1.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged);
+ //
+ // buttonOK
+ //
+ this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+ this.buttonOK.Location = new System.Drawing.Point(373, 405);
+ this.buttonOK.Name = "buttonOK";
+ this.buttonOK.Size = new System.Drawing.Size(65, 23);
+ this.buttonOK.TabIndex = 1;
+ this.buttonOK.Text = "OK";
+ this.buttonOK.UseVisualStyleBackColor = true;
+ this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.buttonCancel.Location = new System.Drawing.Point(444, 405);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(65, 23);
+ this.buttonCancel.TabIndex = 2;
+ this.buttonCancel.Text = "Cancel";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ //
+ // tableLayoutPanel4
+ //
+ this.tableLayoutPanel4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.tableLayoutPanel4.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Inset;
+ this.tableLayoutPanel4.ColumnCount = 1;
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel4.Controls.Add(this.labelDescription, 0, 0);
+ this.tableLayoutPanel4.Controls.Add(this.labelDescriptionBody, 0, 1);
+ this.tableLayoutPanel4.Location = new System.Drawing.Point(12, 220);
+ this.tableLayoutPanel4.Name = "tableLayoutPanel4";
+ this.tableLayoutPanel4.RowCount = 2;
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(329, 208);
+ this.tableLayoutPanel4.TabIndex = 8;
+ //
+ // labelDescription
+ //
+ this.labelDescription.AutoSize = true;
+ this.labelDescription.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.labelDescription.Location = new System.Drawing.Point(5, 2);
+ this.labelDescription.Name = "labelDescription";
+ this.labelDescription.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3);
+ this.labelDescription.Size = new System.Drawing.Size(319, 19);
+ this.labelDescription.TabIndex = 3;
+ this.labelDescription.Text = "Description:";
+ //
+ // labelDescriptionBody
+ //
+ this.labelDescriptionBody.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.labelDescriptionBody.Location = new System.Drawing.Point(5, 23);
+ this.labelDescriptionBody.Name = "labelDescriptionBody";
+ this.labelDescriptionBody.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3);
+ this.labelDescriptionBody.Size = new System.Drawing.Size(319, 183);
+ this.labelDescriptionBody.TabIndex = 6;
+ this.labelDescriptionBody.Text = resources.GetString("labelDescriptionBody.Text");
+ //
+ // numericTextBoxW
+ //
+ this.numericTextBoxW.AllowDecimal = false;
+ this.numericTextBoxW.AllowNegative = false;
+ this.numericTextBoxW.AllowSpace = false;
+ this.numericTextBoxW.Location = new System.Drawing.Point(0, 16);
+ this.numericTextBoxW.Name = "numericTextBoxW";
+ this.numericTextBoxW.Size = new System.Drawing.Size(70, 20);
+ this.numericTextBoxW.TabIndex = 10;
+ //
+ // numericTextBoxH
+ //
+ this.numericTextBoxH.AllowDecimal = false;
+ this.numericTextBoxH.AllowNegative = false;
+ this.numericTextBoxH.AllowSpace = false;
+ this.numericTextBoxH.Location = new System.Drawing.Point(92, 16);
+ this.numericTextBoxH.Name = "numericTextBoxH";
+ this.numericTextBoxH.Size = new System.Drawing.Size(70, 20);
+ this.numericTextBoxH.TabIndex = 11;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(74, 23);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(14, 13);
+ this.label3.TabIndex = 12;
+ this.label3.Text = "X";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(3, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(30, 13);
+ this.label4.TabIndex = 13;
+ this.label4.Text = "Size:";
+ //
+ // buttonAuto
+ //
+ this.buttonAuto.Location = new System.Drawing.Point(0, 42);
+ this.buttonAuto.Name = "buttonAuto";
+ this.buttonAuto.Size = new System.Drawing.Size(162, 23);
+ this.buttonAuto.TabIndex = 14;
+ this.buttonAuto.Text = "Autodetect Size";
+ this.buttonAuto.UseVisualStyleBackColor = true;
+ this.buttonAuto.Click += new System.EventHandler(this.buttonAuto_Click);
+ //
+ // panelSizeSelect
+ //
+ this.panelSizeSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.panelSizeSelect.Controls.Add(this.checkBoxPad);
+ this.panelSizeSelect.Controls.Add(this.label4);
+ this.panelSizeSelect.Controls.Add(this.buttonAuto);
+ this.panelSizeSelect.Controls.Add(this.numericTextBoxW);
+ this.panelSizeSelect.Controls.Add(this.numericTextBoxH);
+ this.panelSizeSelect.Controls.Add(this.label3);
+ this.panelSizeSelect.Location = new System.Drawing.Point(347, 35);
+ this.panelSizeSelect.Name = "panelSizeSelect";
+ this.panelSizeSelect.Size = new System.Drawing.Size(162, 105);
+ this.panelSizeSelect.TabIndex = 15;
+ //
+ // checkBoxPad
+ //
+ this.checkBoxPad.AutoSize = true;
+ this.checkBoxPad.Location = new System.Drawing.Point(0, 71);
+ this.checkBoxPad.Name = "checkBoxPad";
+ this.checkBoxPad.Size = new System.Drawing.Size(45, 17);
+ this.checkBoxPad.TabIndex = 15;
+ this.checkBoxPad.Text = "Pad";
+ this.checkBoxPad.UseVisualStyleBackColor = true;
+ //
+ // VideoWriterChooserForm
+ //
+ this.AcceptButton = this.buttonOK;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.buttonCancel;
+ this.ClientSize = new System.Drawing.Size(521, 440);
+ this.Controls.Add(this.panelSizeSelect);
+ this.Controls.Add(this.tableLayoutPanel4);
+ this.Controls.Add(this.listBox1);
+ this.Controls.Add(this.buttonOK);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.checkBoxResize);
+ this.Name = "VideoWriterChooserForm";
+ this.ShowIcon = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Choose A\\V Writer";
+ this.tableLayoutPanel4.ResumeLayout(false);
+ this.tableLayoutPanel4.PerformLayout();
+ this.panelSizeSelect.ResumeLayout(false);
+ this.panelSizeSelect.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -231,5 +243,6 @@
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Button buttonAuto;
private System.Windows.Forms.Panel panelSizeSelect;
+ private System.Windows.Forms.CheckBox checkBoxPad;
}
}
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs b/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
index b823131965..5f06024cb2 100644
--- a/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
+++ b/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
@@ -27,7 +27,7 @@ namespace BizHawk.Client.EmuHawk
/// list of IVideoWriters to choose from
/// parent window
/// user choice, or null on Cancel\Close\invalid
- public static IVideoWriter DoVideoWriterChoserDlg(IEnumerable list, IWin32Window owner, out int resizew, out int resizeh)
+ public static IVideoWriter DoVideoWriterChoserDlg(IEnumerable list, IWin32Window owner, out int resizew, out int resizeh, out bool pad)
{
VideoWriterChooserForm dlg = new VideoWriterChooserForm();
@@ -67,6 +67,9 @@ namespace BizHawk.Client.EmuHawk
resizew = -1;
resizeh = -1;
}
+
+ pad = dlg.checkBoxPad.Checked;
+
dlg.Dispose();
return ret;
}
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 6ef485a5b7..07c8d4367c 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -967,6 +967,7 @@ namespace BizHawk.Client.EmuHawk
private long _soundRemainder; // audio timekeeping for video dumping
private int _avwriterResizew;
private int _avwriterResizeh;
+ private bool _avwriterpad;
private bool _exit;
private bool _runloopFrameProgress;
@@ -2477,7 +2478,7 @@ namespace BizHawk.Client.EmuHawk
}
else
{
- aw = VideoWriterChooserForm.DoVideoWriterChoserDlg(video_writers, GlobalWin.MainForm, out _avwriterResizew, out _avwriterResizeh);
+ aw = VideoWriterChooserForm.DoVideoWriterChoserDlg(video_writers, GlobalWin.MainForm, out _avwriterResizew, out _avwriterResizeh, out _avwriterpad);
}
foreach (var w in video_writers)
@@ -2668,7 +2669,15 @@ namespace BizHawk.Client.EmuHawk
var bmpout = new Bitmap(_avwriterResizew, _avwriterResizeh, PixelFormat.Format32bppArgb);
using (var g = Graphics.FromImage(bmpout))
{
- g.DrawImage(bmpin, new Rectangle(0, 0, bmpout.Width, bmpout.Height));
+ if (_avwriterpad)
+ {
+ g.Clear(Color.FromArgb(Global.Emulator.VideoProvider.BackgroundColor));
+ g.DrawImageUnscaled(bmpin, (bmpout.Width - bmpin.Width) / 2, (bmpout.Height - bmpin.Height) / 2);
+ }
+ else
+ {
+ g.DrawImage(bmpin, new Rectangle(0, 0, bmpout.Width, bmpout.Height));
+ }
}
bmpin.Dispose();