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

Redesign 4 config dialogs as a proof-of-concept

This commit is contained in:
YoshiRulz 2020-03-02 16:58:53 +10:00 committed by James Groom
parent 10818ba069
commit f7ddab25c7
9 changed files with 2195 additions and 2282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
BizHawk.Client.EmuHawk/config/AutofireConfig.Designer.cs generated
View File

@ -10,173 +10,167 @@
/// </summary>
private void InitializeComponent()
{
this.Ok = new System.Windows.Forms.Button();
this.Cancel = new System.Windows.Forms.Button();
this.OnNumeric = new System.Windows.Forms.NumericUpDown();
this.OffNumeric = new System.Windows.Forms.NumericUpDown();
this.label1 = new BizHawk.WinForms.Controls.LabelEx();
this.label2 = new BizHawk.WinForms.Controls.LabelEx();
this.flpButtons = new BizHawk.WinForms.Controls.LocSzSingleRowFLP();
this.flpMain = new BizHawk.WinForms.Controls.LocSzSingleColumnFLP();
this.btnDialogOK = new BizHawk.WinForms.Controls.SzButtonEx();
this.btnDialogCancel = new BizHawk.WinForms.Controls.SzButtonEx();
this.nudPatternOn = new BizHawk.WinForms.Controls.SzNUDEx();
this.nudPatternOff = new BizHawk.WinForms.Controls.SzNUDEx();
this.lblPatternOn = new BizHawk.WinForms.Controls.LabelEx();
this.lblPatternOff = new BizHawk.WinForms.Controls.LabelEx();
this.flpDialogButtons = new BizHawk.WinForms.Controls.LocSzSingleRowFLP();
this.flpDialog = new BizHawk.WinForms.Controls.LocSzSingleColumnFLP();
this.flpPattern = new BizHawk.WinForms.Controls.SingleRowFLP();
this.lblPattern = new BizHawk.WinForms.Controls.LabelEx();
this.LagFrameCheck = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.OnNumeric)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.OffNumeric)).BeginInit();
this.flpButtons.SuspendLayout();
this.flpMain.SuspendLayout();
this.lblPatternDesc = new BizHawk.WinForms.Controls.LabelEx();
this.cbConsiderLag = new BizHawk.WinForms.Controls.CheckBoxEx();
((System.ComponentModel.ISupportInitialize)(this.nudPatternOn)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudPatternOff)).BeginInit();
this.flpDialogButtons.SuspendLayout();
this.flpDialog.SuspendLayout();
this.flpPattern.SuspendLayout();
this.SuspendLayout();
//
// Ok
// btnDialogOK
//
this.Ok.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.Ok.Name = "Ok";
this.Ok.Text = "&OK";
this.Ok.UseVisualStyleBackColor = true;
this.Ok.Click += new System.EventHandler(this.Ok_Click);
this.btnDialogOK.Name = "btnDialogOK";
this.btnDialogOK.Size = new System.Drawing.Size(75, 23);
this.btnDialogOK.Text = "&OK";
this.btnDialogOK.Click += new System.EventHandler(this.btnDialogOK_Click);
//
// Cancel
// btnDialogCancel
//
this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.Cancel.Name = "Cancel";
this.Cancel.Text = "&Cancel";
this.Cancel.UseVisualStyleBackColor = true;
this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
this.btnDialogCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnDialogCancel.Name = "btnDialogCancel";
this.btnDialogCancel.Size = new System.Drawing.Size(75, 23);
this.btnDialogCancel.Text = "&Cancel";
this.btnDialogCancel.Click += new System.EventHandler(this.btnDialogCancel_Click);
//
// OnNumeric
// nudPatternOn
//
this.OnNumeric.Maximum = new decimal(new int[] {
this.nudPatternOn.Maximum = new decimal(new int[] {
512,
0,
0,
0});
this.OnNumeric.Minimum = new decimal(new int[] {
this.nudPatternOn.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.OnNumeric.Name = "OnNumeric";
this.OnNumeric.Size = new System.Drawing.Size(48, 19);
this.OnNumeric.Value = new decimal(new int[] {
this.nudPatternOn.Name = "nudPatternOn";
this.nudPatternOn.Size = new System.Drawing.Size(48, 20);
this.nudPatternOn.Value = new decimal(new int[] {
1,
0,
0,
0});
//
// OffNumeric
// nudPatternOff
//
this.OffNumeric.Maximum = new decimal(new int[] {
this.nudPatternOff.Maximum = new decimal(new int[] {
512,
0,
0,
0});
this.OffNumeric.Minimum = new decimal(new int[] {
this.nudPatternOff.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.OffNumeric.Name = "OffNumeric";
this.OffNumeric.Size = new System.Drawing.Size(48, 19);
this.OffNumeric.Value = new decimal(new int[] {
this.nudPatternOff.Name = "nudPatternOff";
this.nudPatternOff.Size = new System.Drawing.Size(48, 20);
this.nudPatternOff.Value = new decimal(new int[] {
1,
0,
0,
0});
//
// label1
// lblPatternOn
//
this.label1.Name = "label1";
this.label1.Text = "on,";
this.lblPatternOn.Name = "lblPatternOn";
this.lblPatternOn.Text = "on,";
//
// label2
// lblPatternOff
//
this.label2.Name = "label2";
this.label2.Text = "off";
this.lblPatternOff.Name = "lblPatternOff";
this.lblPatternOff.Text = "off";
//
// flpButtons
// flpDialogButtons
//
this.flpButtons.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.flpButtons.Controls.Add(this.Ok);
this.flpButtons.Controls.Add(this.Cancel);
this.flpButtons.Location = new System.Drawing.Point(161, 61);
this.flpButtons.Name = "flpButtons";
this.flpButtons.Size = new System.Drawing.Size(162, 29);
this.flpDialogButtons.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.flpDialogButtons.Controls.Add(this.btnDialogOK);
this.flpDialogButtons.Controls.Add(this.btnDialogCancel);
this.flpDialogButtons.Location = new System.Drawing.Point(161, 61);
this.flpDialogButtons.Name = "flpDialogButtons";
this.flpDialogButtons.Size = new System.Drawing.Size(162, 29);
//
// flpMain
// flpDialog
//
this.flpMain.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
this.flpDialog.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.flpMain.Controls.Add(this.flpPattern);
this.flpMain.Controls.Add(this.LagFrameCheck);
this.flpMain.Location = new System.Drawing.Point(0, 0);
this.flpMain.Name = "flpMain";
this.flpMain.Size = new System.Drawing.Size(323, 55);
this.flpDialog.Controls.Add(this.flpPattern);
this.flpDialog.Controls.Add(this.cbConsiderLag);
this.flpDialog.Location = new System.Drawing.Point(0, 0);
this.flpDialog.Name = "flpDialog";
this.flpDialog.Size = new System.Drawing.Size(323, 55);
//
// flpPattern
//
this.flpPattern.Controls.Add(this.lblPattern);
this.flpPattern.Controls.Add(this.OnNumeric);
this.flpPattern.Controls.Add(this.label1);
this.flpPattern.Controls.Add(this.OffNumeric);
this.flpPattern.Controls.Add(this.label2);
this.flpPattern.Controls.Add(this.lblPatternDesc);
this.flpPattern.Controls.Add(this.nudPatternOn);
this.flpPattern.Controls.Add(this.lblPatternOn);
this.flpPattern.Controls.Add(this.nudPatternOff);
this.flpPattern.Controls.Add(this.lblPatternOff);
this.flpPattern.Name = "flpPattern";
//
// lblPattern
// lblPatternDesc
//
this.lblPattern.Name = "lblPattern";
this.lblPattern.Text = "Pattern:";
this.lblPatternDesc.Name = "lblPatternDesc";
this.lblPatternDesc.Text = "Pattern:";
//
// LagFrameCheck
// cbConsiderLag
//
this.LagFrameCheck.AutoSize = true;
this.LagFrameCheck.Name = "LagFrameCheck";
this.LagFrameCheck.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
this.LagFrameCheck.Text = "Take lag frames into account";
this.LagFrameCheck.UseVisualStyleBackColor = true;
this.cbConsiderLag.Name = "cbConsiderLag";
this.cbConsiderLag.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
this.cbConsiderLag.Text = "Take lag frames into account";
//
// AutofireConfig
//
this.AcceptButton = this.Ok;
this.AcceptButton = this.btnDialogOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.Cancel;
this.CancelButton = this.btnDialogCancel;
this.ClientSize = new System.Drawing.Size(323, 90);
this.Controls.Add(this.flpMain);
this.Controls.Add(this.flpButtons);
this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning_MultiSize;
this.Controls.Add(this.flpDialog);
this.Controls.Add(this.flpDialogButtons);
this.MaximizeBox = false;
this.MinimumSize = new System.Drawing.Size(339, 129);
this.Name = "AutofireConfig";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Autofire Configuration";
this.Load += new System.EventHandler(this.AutofireConfig_Load);
((System.ComponentModel.ISupportInitialize)(this.OnNumeric)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.OffNumeric)).EndInit();
this.flpButtons.ResumeLayout(false);
this.flpMain.ResumeLayout(false);
this.flpMain.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nudPatternOn)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudPatternOff)).EndInit();
this.flpDialogButtons.ResumeLayout(false);
this.flpDialog.ResumeLayout(false);
this.flpDialog.PerformLayout();
this.flpPattern.ResumeLayout(false);
this.flpPattern.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Button Ok;
private System.Windows.Forms.Button Cancel;
private System.Windows.Forms.NumericUpDown OffNumeric;
private BizHawk.WinForms.Controls.LabelEx label1;
private BizHawk.WinForms.Controls.LabelEx label2;
private BizHawk.WinForms.Controls.SzButtonEx btnDialogOK;
private BizHawk.WinForms.Controls.SzButtonEx btnDialogCancel;
private BizHawk.WinForms.Controls.SzNUDEx nudPatternOff;
private BizHawk.WinForms.Controls.LabelEx lblPatternOn;
private BizHawk.WinForms.Controls.LabelEx lblPatternOff;
private BizHawk.WinForms.Controls.SingleRowFLP flpPattern;
private BizHawk.WinForms.Controls.LocSzSingleColumnFLP flpMain;
private BizHawk.WinForms.Controls.LocSzSingleRowFLP flpButtons;
private BizHawk.WinForms.Controls.LabelEx lblPattern;
public System.Windows.Forms.NumericUpDown OnNumeric;
private System.Windows.Forms.CheckBox LagFrameCheck;
private BizHawk.WinForms.Controls.LocSzSingleColumnFLP flpDialog;
private BizHawk.WinForms.Controls.LocSzSingleRowFLP flpDialogButtons;
private BizHawk.WinForms.Controls.LabelEx lblPatternDesc;
public BizHawk.WinForms.Controls.SzNUDEx nudPatternOn;
private BizHawk.WinForms.Controls.CheckBoxEx cbConsiderLag;
}
}

32
BizHawk.Client.EmuHawk/config/AutofireConfig.cs
View File

@ -23,46 +23,46 @@ namespace BizHawk.Client.EmuHawk
private void AutofireConfig_Load(object sender, EventArgs e)
{
if (_config.AutofireOn < OnNumeric.Minimum)
if (_config.AutofireOn < nudPatternOn.Minimum)
{
OnNumeric.Value = OnNumeric.Minimum;
nudPatternOn.Value = nudPatternOn.Minimum;
}
else if (_config.AutofireOn > OnNumeric.Maximum)
else if (_config.AutofireOn > nudPatternOn.Maximum)
{
OnNumeric.Value = OnNumeric.Maximum;
nudPatternOn.Value = nudPatternOn.Maximum;
}
else
{
OnNumeric.Value = _config.AutofireOn;
nudPatternOn.Value = _config.AutofireOn;
}
if (_config.AutofireOff < OffNumeric.Minimum)
if (_config.AutofireOff < nudPatternOff.Minimum)
{
OffNumeric.Value = OffNumeric.Minimum;
nudPatternOff.Value = nudPatternOff.Minimum;
}
else if (_config.AutofireOff > OffNumeric.Maximum)
else if (_config.AutofireOff > nudPatternOff.Maximum)
{
OffNumeric.Value = OffNumeric.Maximum;
nudPatternOff.Value = nudPatternOff.Maximum;
}
else
{
OffNumeric.Value = _config.AutofireOff;
nudPatternOff.Value = _config.AutofireOff;
}
LagFrameCheck.Checked = _config.AutofireLagFrames;
cbConsiderLag.Checked = _config.AutofireLagFrames;
}
private void Ok_Click(object sender, EventArgs e)
private void btnDialogOK_Click(object sender, EventArgs e)
{
_autoFireController.On = _config.AutofireOn = (int)OnNumeric.Value;
_autoFireController.Off = _config.AutofireOff = (int)OffNumeric.Value;
_config.AutofireLagFrames = LagFrameCheck.Checked;
_autoFireController.On = _config.AutofireOn = (int)nudPatternOn.Value;
_autoFireController.Off = _config.AutofireOff = (int)nudPatternOff.Value;
_config.AutofireLagFrames = cbConsiderLag.Checked;
_stickyXorAdapter.SetOnOffPatternFromConfig();
Close();
}
private void Cancel_Click(object sender, EventArgs e)
private void btnDialogCancel_Click(object sender, EventArgs e)
{
Close();
}

2066
BizHawk.Client.EmuHawk/config/DisplayConfig.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

196
BizHawk.Client.EmuHawk/config/DisplayConfig.cs
View File

@ -20,10 +20,10 @@ namespace BizHawk.Client.EmuHawk
_config = config;
InitializeComponent();
rbNone.Checked = _config.TargetDisplayFilter == 0;
rbHq2x.Checked = _config.TargetDisplayFilter == 1;
rbScanlines.Checked = _config.TargetDisplayFilter == 2;
rbUser.Checked = _config.TargetDisplayFilter == 3;
rbFilterNone.Checked = _config.TargetDisplayFilter == 0;
rbFilterHq2x.Checked = _config.TargetDisplayFilter == 1;
rbFilterScanline.Checked = _config.TargetDisplayFilter == 2;
rbFilterUser.Checked = _config.TargetDisplayFilter == 3;
_pathSelection = _config.DispUserFilterPath ?? "";
RefreshState();
@ -32,52 +32,52 @@ namespace BizHawk.Client.EmuHawk
rbFinalFilterBilinear.Checked = _config.DispFinalFilter == 1;
rbFinalFilterBicubic.Checked = _config.DispFinalFilter == 2;
tbScanlineIntensity.Value = _config.TargetScanlineFilterIntensity;
checkLetterbox.Checked = _config.DispFixAspectRatio;
checkPadInteger.Checked = _config.DispFixScaleInteger;
cbFullscreenHacks.Checked = _config.DispFullscreenHacks;
tbFilterScanlineAlpha.Value = _config.TargetScanlineFilterIntensity;
cbLetterbox.Checked = _config.DispFixAspectRatio;
cbScaleByInteger.Checked = _config.DispFixScaleInteger;
cbFSWinHacks.Checked = _config.DispFullscreenHacks;
cbAutoPrescale.Checked = _config.DispAutoPrescale;
cbAlternateVsync.Checked = _config.DispAlternateVsync;
cbD3DAltVSync.Checked = _config.DispAlternateVsync;
if (_config.DispSpeedupFeatures == 2) rbDisplayFull.Checked = true;
if (_config.DispSpeedupFeatures == 1) rbDisplayMinimal.Checked = true;
if (_config.DispSpeedupFeatures == 0) rbDisplayAbsoluteZero.Checked = true;
if (_config.DispSpeedupFeatures == 2) rbDispFeaturesFull.Checked = true;
if (_config.DispSpeedupFeatures == 1) rbDispFeaturesMinimal.Checked = true;
if (_config.DispSpeedupFeatures == 0) rbDispFeaturesNothing.Checked = true;
rbOpenGL.Checked = _config.DispMethod == EDispMethod.OpenGL;
rbGDIPlus.Checked = _config.DispMethod == EDispMethod.GdiPlus;
rbD3D9.Checked = _config.DispMethod == EDispMethod.SlimDX9;
rbDispMethodOpenGL.Checked = _config.DispMethod == EDispMethod.OpenGL;
rbDispMethodGDIPlus.Checked = _config.DispMethod == EDispMethod.GdiPlus;
rbDispMethodD3D.Checked = _config.DispMethod == EDispMethod.SlimDX9;
cbStatusBarWindowed.Checked = _config.DispChromeStatusBarWindowed;
cbCaptionWindowed.Checked = _config.DispChromeCaptionWindowed;
cbMenuWindowed.Checked = _config.DispChromeMenuWindowed;
cbStatusBarFullscreen.Checked = _config.DispChromeStatusBarFullscreen;
cbMenuFullscreen.Checked = _config.DispChromeMenuFullscreen;
trackbarFrameSizeWindowed.Value = _config.DispChromeFrameWindowed;
cbWindowedStatusBar.Checked = _config.DispChromeStatusBarWindowed;
cbWindowedCaption.Checked = _config.DispChromeCaptionWindowed;
cbWindowedMenu.Checked = _config.DispChromeMenuWindowed;
cbFSStatusBar.Checked = _config.DispChromeStatusBarFullscreen;
cbFSMenu.Checked = _config.DispChromeMenuFullscreen;
tbWindowedFrameType.Value = _config.DispChromeFrameWindowed;
cbFSAutohideMouse.Checked = _config.DispChromeFullscreenAutohideMouse;
SyncTrackBar();
cbAllowDoubleclickFullscreen.Checked = _config.DispChromeAllowDoubleClickFullscreen;
cbDoubleClickFS.Checked = _config.DispChromeAllowDoubleClickFullscreen;
nudPrescale.Value = _config.DispPrescale;
nudUserPrescale.Value = _config.DispPrescale;
if (_config.DispManagerAR == EDispManagerAR.None)
rbUseRaw.Checked = true;
rbARSquare.Checked = true;
else if (_config.DispManagerAR == EDispManagerAR.System)
rbUseSystem.Checked = true;
rbARBySystem.Checked = true;
else if (_config.DispManagerAR == EDispManagerAR.Custom)
rbUseCustom.Checked = true;
rbARCustomSize.Checked = true;
else if (_config.DispManagerAR == EDispManagerAR.CustomRatio)
rbUseCustomRatio.Checked = true;
rbARCustomRatio.Checked = true;
if(_config.DispCustomUserARWidth != -1)
txtCustomARWidth.Text = _config.DispCustomUserARWidth.ToString();
txtARCustomWidth.Text = _config.DispCustomUserARWidth.ToString();
if (_config.DispCustomUserARHeight != -1)
txtCustomARHeight.Text = _config.DispCustomUserARHeight.ToString();
txtARCustomHeight.Text = _config.DispCustomUserARHeight.ToString();
if (_config.DispCustomUserArx != -1)
txtCustomARX.Text = _config.DispCustomUserArx.ToString();
txtARCustomRatioH.Text = _config.DispCustomUserArx.ToString();
if (_config.DispCustomUserAry != -1)
txtCustomARY.Text = _config.DispCustomUserAry.ToString();
txtARCustomRatioV.Text = _config.DispCustomUserAry.ToString();
txtCropLeft.Text = _config.DispCropLeft.ToString();
txtCropTop.Text = _config.DispCropTop.ToString();
@ -86,26 +86,18 @@ namespace BizHawk.Client.EmuHawk
RefreshAspectRatioOptions();
if (OSTailoredCode.IsUnixHost)
{
// Disable SlimDX on Unix
rbD3D9.Enabled = false;
rbD3D9.AutoCheck = false;
cbAlternateVsync.Enabled = false;
label13.Enabled = false;
label8.Enabled = false;
}
if (OSTailoredCode.IsUnixHost) flpD3DSection.Enabled = false; // Disable SlimDX on Unix
}
private void btnOk_Click(object sender, EventArgs e)
private void btnDialogOK_Click(object sender, EventArgs e)
{
if (rbNone.Checked)
if (rbFilterNone.Checked)
_config.TargetDisplayFilter = 0;
if (rbHq2x.Checked)
if (rbFilterHq2x.Checked)
_config.TargetDisplayFilter = 1;
if (rbScanlines.Checked)
if (rbFilterScanline.Checked)
_config.TargetDisplayFilter = 2;
if (rbUser.Checked)
if (rbFilterUser.Checked)
_config.TargetDisplayFilter = 3;
if (rbFinalFilterNone.Checked)
@ -115,41 +107,41 @@ namespace BizHawk.Client.EmuHawk
if (rbFinalFilterBicubic.Checked)
_config.DispFinalFilter = 2;
_config.DispPrescale = (int)nudPrescale.Value;
_config.DispPrescale = (int)nudUserPrescale.Value;
_config.TargetScanlineFilterIntensity = tbScanlineIntensity.Value;
_config.DispFixAspectRatio = checkLetterbox.Checked;
_config.DispFixScaleInteger = checkPadInteger.Checked;
_config.DispFullscreenHacks = cbFullscreenHacks.Checked;
_config.TargetScanlineFilterIntensity = tbFilterScanlineAlpha.Value;
_config.DispFixAspectRatio = cbLetterbox.Checked;
_config.DispFixScaleInteger = cbScaleByInteger.Checked;
_config.DispFullscreenHacks = cbFSWinHacks.Checked;
_config.DispAutoPrescale = cbAutoPrescale.Checked;
_config.DispAlternateVsync = cbAlternateVsync.Checked;
_config.DispAlternateVsync = cbD3DAltVSync.Checked;
_config.DispChromeStatusBarWindowed = cbStatusBarWindowed.Checked;
_config.DispChromeCaptionWindowed = cbCaptionWindowed.Checked;
_config.DispChromeMenuWindowed = cbMenuWindowed.Checked;
_config.DispChromeStatusBarFullscreen = cbStatusBarFullscreen.Checked;
_config.DispChromeMenuFullscreen = cbMenuFullscreen.Checked;
_config.DispChromeFrameWindowed = trackbarFrameSizeWindowed.Value;
_config.DispChromeStatusBarWindowed = cbWindowedStatusBar.Checked;
_config.DispChromeCaptionWindowed = cbWindowedCaption.Checked;
_config.DispChromeMenuWindowed = cbWindowedMenu.Checked;
_config.DispChromeStatusBarFullscreen = cbFSStatusBar.Checked;
_config.DispChromeMenuFullscreen = cbFSMenu.Checked;
_config.DispChromeFrameWindowed = tbWindowedFrameType.Value;
_config.DispChromeFullscreenAutohideMouse = cbFSAutohideMouse.Checked;
_config.DispChromeAllowDoubleClickFullscreen = cbAllowDoubleclickFullscreen.Checked;
_config.DispChromeAllowDoubleClickFullscreen = cbDoubleClickFS.Checked;
if (rbDisplayFull.Checked) _config.DispSpeedupFeatures = 2;
if (rbDisplayMinimal.Checked) _config.DispSpeedupFeatures = 1;
if (rbDisplayAbsoluteZero.Checked) _config.DispSpeedupFeatures = 0;
if (rbDispFeaturesFull.Checked) _config.DispSpeedupFeatures = 2;
if (rbDispFeaturesMinimal.Checked) _config.DispSpeedupFeatures = 1;
if (rbDispFeaturesNothing.Checked) _config.DispSpeedupFeatures = 0;
if (rbUseRaw.Checked)
if (rbARSquare.Checked)
_config.DispManagerAR = EDispManagerAR.None;
else if (rbUseSystem.Checked)
else if (rbARBySystem.Checked)
_config.DispManagerAR = EDispManagerAR.System;
else if (rbUseCustom.Checked)
else if (rbARCustomSize.Checked)
_config.DispManagerAR = EDispManagerAR.Custom;
else if (rbUseCustomRatio.Checked)
else if (rbARCustomRatio.Checked)
_config.DispManagerAR = EDispManagerAR.CustomRatio;
if (string.IsNullOrWhiteSpace(txtCustomARWidth.Text))
if (string.IsNullOrWhiteSpace(txtARCustomWidth.Text))
{
if (int.TryParse(txtCustomARWidth.Text, out int dispCustomUserARWidth))
if (int.TryParse(txtARCustomWidth.Text, out int dispCustomUserARWidth))
{
_config.DispCustomUserARWidth = dispCustomUserARWidth;
}
@ -159,9 +151,9 @@ namespace BizHawk.Client.EmuHawk
_config.DispCustomUserARWidth = -1;
}
if (string.IsNullOrWhiteSpace(txtCustomARHeight.Text))
if (string.IsNullOrWhiteSpace(txtARCustomHeight.Text))
{
if (int.TryParse(txtCustomARHeight.Text, out int dispCustomUserARHeight))
if (int.TryParse(txtARCustomHeight.Text, out int dispCustomUserARHeight))
{
_config.DispCustomUserARHeight = dispCustomUserARHeight;
}
@ -171,9 +163,9 @@ namespace BizHawk.Client.EmuHawk
_config.DispCustomUserARHeight = -1;
}
if (string.IsNullOrWhiteSpace(txtCustomARX.Text))
if (string.IsNullOrWhiteSpace(txtARCustomRatioH.Text))
{
if (float.TryParse(txtCustomARX.Text, out float dispCustomUserArx))
if (float.TryParse(txtARCustomRatioH.Text, out float dispCustomUserArx))
{
_config.DispCustomUserArx = dispCustomUserArx;
}
@ -183,9 +175,9 @@ namespace BizHawk.Client.EmuHawk
_config.DispCustomUserArx = -1;
}
if (string.IsNullOrWhiteSpace(txtCustomARY.Text))
if (string.IsNullOrWhiteSpace(txtARCustomRatioV.Text))
{
if (float.TryParse(txtCustomARY.Text, out float dispCustomUserAry))
if (float.TryParse(txtARCustomRatioV.Text, out float dispCustomUserAry))
{
_config.DispCustomUserAry = dispCustomUserAry;
}
@ -196,11 +188,11 @@ namespace BizHawk.Client.EmuHawk
}
var oldDisplayMethod = _config.DispMethod;
if(rbOpenGL.Checked)
if(rbDispMethodOpenGL.Checked)
_config.DispMethod = EDispMethod.OpenGL;
if(rbGDIPlus.Checked)
if(rbDispMethodGDIPlus.Checked)
_config.DispMethod = EDispMethod.GdiPlus;
if(rbD3D9.Checked)
if(rbDispMethodD3D.Checked)
_config.DispMethod = EDispMethod.SlimDX9;
if (int.TryParse(txtCropLeft.Text, out int dispCropLeft))
@ -236,10 +228,10 @@ namespace BizHawk.Client.EmuHawk
private void RefreshState()
{
lblUserFilterName.Text = Path.GetFileNameWithoutExtension(_pathSelection);
lblFilterUser.Text = Path.GetFileNameWithoutExtension(_pathSelection);
}
private void btnSelectUserFilter_Click(object sender, EventArgs e)
private void btnFilterUser_Click(object sender, EventArgs e)
{
using var ofd = new OpenFileDialog
{
@ -248,7 +240,7 @@ namespace BizHawk.Client.EmuHawk
};
if (ofd.ShowDialog() == DialogResult.OK)
{
rbUser.Checked = true;
rbFilterUser.Checked = true;
var choice = Path.GetFullPath(ofd.FileName);
//test the preset
@ -284,81 +276,81 @@ namespace BizHawk.Client.EmuHawk
}
}
private void checkLetterbox_CheckedChanged(object sender, EventArgs e)
private void cbLetterbox_CheckedChanged(object sender, EventArgs e)
{
RefreshAspectRatioOptions();
}
private void checkPadInteger_CheckedChanged(object sender, EventArgs e)
private void cbScaleByInteger_CheckedChanged(object sender, EventArgs e)
{
RefreshAspectRatioOptions();
}
private void rbUseRaw_CheckedChanged(object sender, EventArgs e)
private void rbARSquare_CheckedChanged(object sender, EventArgs e)
{
RefreshAspectRatioOptions();
}
private void rbUseSystem_CheckedChanged(object sender, EventArgs e)
private void rbARBySystem_CheckedChanged(object sender, EventArgs e)
{
RefreshAspectRatioOptions();
}
void RefreshAspectRatioOptions()
{
grpARSelection.Enabled = checkLetterbox.Checked;
checkPadInteger.Enabled = checkLetterbox.Checked;
grpAspectRatio.Enabled = cbLetterbox.Checked;
cbScaleByInteger.Enabled = cbLetterbox.Checked;
}
public void tbScanlineIntensity_Scroll(object sender, EventArgs e)
public void tbFilterScanlineAlpha_Scroll(object sender, EventArgs e)
{
_config.TargetScanlineFilterIntensity = tbScanlineIntensity.Value;
_config.TargetScanlineFilterIntensity = tbFilterScanlineAlpha.Value;
int scanlines = _config.TargetScanlineFilterIntensity;
float percentage = (float) scanlines / 256 * 100;
lblScanlines.Text = $"{percentage:F2}%";
lblFilterScanlineAlpha.Text = $"{percentage:F2}%";
}
private void TrackBarFrameSizeWindowed_ValueChanged(object sender, EventArgs e)
private void tbWidowedFrameType_ValueChanged(object sender, EventArgs e)
{
SyncTrackBar();
}
private void SyncTrackBar()
{
if (trackbarFrameSizeWindowed.Value == 0)
if (tbWindowedFrameType.Value == 0)
{
lblFrameTypeWindowed.Text = "None";
lblWindowedFrameTypeReadout.Text = "None";
}
if (trackbarFrameSizeWindowed.Value == 1)
if (tbWindowedFrameType.Value == 1)
{
lblFrameTypeWindowed.Text = "Thin";
lblWindowedFrameTypeReadout.Text = "Thin";
}
if (trackbarFrameSizeWindowed.Value == 2)
if (tbWindowedFrameType.Value == 2)
{
lblFrameTypeWindowed.Text = "Thick";
lblWindowedFrameTypeReadout.Text = "Thick";
}
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
private void lnkDocs_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
System.Diagnostics.Process.Start("http://tasvideos.org/Bizhawk/DisplayConfig.html");
}
private void label13_Click(object sender, EventArgs e)
private void lblD3DAltVSync_Click(object sender, EventArgs e)
{
cbAlternateVsync.Checked ^= true;
cbD3DAltVSync.Checked ^= true;
}
private void btnDefaults_Click(object sender, EventArgs e)
{
nudPrescale.Value = 1;
rbNone.Checked = true;
nudUserPrescale.Value = 1;
rbFilterNone.Checked = true;
cbAutoPrescale.Checked = true;
rbFinalFilterBilinear.Checked = true;
checkLetterbox.Checked = true;
rbUseSystem.Checked = true;
cbLetterbox.Checked = true;
rbARBySystem.Checked = true;
}
}
}

4
BizHawk.Client.EmuHawk/config/DisplayConfig.resx
View File

@ -120,10 +120,10 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="label13.Text" xml:space="preserve">
<data name="lblD3DAltVSync.Text" xml:space="preserve">
<value>Alternate VSync Method: Some GPUs have problems VSyncing. It seems to manifest on full-screen windows. There will be hiccups when throttling to VSync. Use this to try and solve it (busy loop; burns major CPU)</value>
</data>
<data name="label1.Text" xml:space="preserve">
<data name="lblFSWinHacks.Text" xml:space="preserve">
<value>For Windows operating systems &gt;= Vista, with some video cards, the monitors may flicker when going 'windowed fullscreen' while the system disobeys us and goes actual fullscreen instead. This hack prevents that, but may increase frame latency (since in Microsoft's new and disimproved operating systems, windowed mode things may have higher latency)</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

1180
BizHawk.Client.EmuHawk/config/EmuHawkOptions.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

106
BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs
View File

@ -20,109 +20,109 @@ namespace BizHawk.Client.EmuHawk
{
get
{
if (AutosaveSRAMradioButton1.Checked)
if (cbAutoSaveRAMFreq5s.Checked)
{
return 5;
}
if (AutosaveSRAMradioButton2.Checked)
if (AutoSaveRAMFreq5min.Checked)
{
return 5 * 60;
}
return (int)AutosaveSRAMtextBox.Value;
return (int)nudAutoSaveRAMFreqCustom.Value;
}
set
{
switch (value)
{
case 5:
AutosaveSRAMradioButton1.Checked = true;
AutosaveSRAMtextBox.Enabled = false;
cbAutoSaveRAMFreq5s.Checked = true;
nudAutoSaveRAMFreqCustom.Enabled = false;
break;
case 5 * 60:
AutosaveSRAMradioButton2.Checked = true;
AutosaveSRAMtextBox.Enabled = false;
AutoSaveRAMFreq5min.Checked = true;
nudAutoSaveRAMFreqCustom.Enabled = false;
break;
default:
AutosaveSRAMradioButton3.Checked = true;
AutosaveSRAMtextBox.Enabled = true;
rbAutoSaveRAMFreqCustom.Checked = true;
nudAutoSaveRAMFreqCustom.Enabled = true;
break;
}
AutosaveSRAMtextBox.Value = value;
nudAutoSaveRAMFreqCustom.Value = value;
}
}
private void GuiOptions_Load(object sender, EventArgs e)
{
StartFullScreenCheckbox.Checked = _config.StartFullscreen;
StartPausedCheckbox.Checked = _config.StartPaused;
PauseWhenMenuActivatedCheckbox.Checked = _config.PauseWhenMenuActivated;
EnableContextMenuCheckbox.Checked = _config.ShowContextMenu;
SaveWindowPositionCheckbox.Checked = _config.SaveWindowPosition;
RunInBackgroundCheckbox.Checked = _config.RunInBackground;
AcceptBackgroundInputCheckbox.Checked = _config.AcceptBackgroundInput;
AcceptBackgroundInputControllerOnlyCheckBox.Checked = _config.AcceptBackgroundInputControllerOnly;
HandleAlternateKeyboardLayoutsCheckBox.Checked = _config.HandleAlternateKeyboardLayouts;
NeverAskSaveCheckbox.Checked = _config.SuppressAskSave;
SingleInstanceModeCheckbox.Checked = _config.SingleInstanceMode;
cbStartInFS.Checked = _config.StartFullscreen;
cbStartPaused.Checked = _config.StartPaused;
cbMenusPauseEmulation.Checked = _config.PauseWhenMenuActivated;
cbEnableContextMenu.Checked = _config.ShowContextMenu;
cbSaveWindowPosition.Checked = _config.SaveWindowPosition;
cbNoFocusEmulate.Checked = _config.RunInBackground;
cbNoFocusInput.Checked = _config.AcceptBackgroundInput;
cbNoFocusInputGamepadOnly.Checked = _config.AcceptBackgroundInputControllerOnly;
cbNonQWERTY.Checked = _config.HandleAlternateKeyboardLayouts;
cbNeverAskForSave.Checked = _config.SuppressAskSave;
cbSingleInstance.Checked = _config.SingleInstanceMode;
BackupSRamCheckbox.Checked = _config.BackupSaveram;
AutosaveSRAMCheckbox.Checked = _config.AutosaveSaveRAM;
groupBox2.Enabled = AutosaveSRAMCheckbox.Checked;
cbBackupSaveRAM.Checked = _config.BackupSaveram;
cbAutoSaveRAM.Checked = _config.AutosaveSaveRAM;
grpAutoSaveRAM.Enabled = cbAutoSaveRAM.Checked;
AutosaveSaveRAMSeconds = _config.FlushSaveRamFrames / 60;
FrameAdvSkipLagCheckbox.Checked = _config.SkipLagFrame;
LuaDuringTurboCheckbox.Checked = _config.RunLuaDuringTurbo;
cbFrameAdvPastLag.Checked = _config.SkipLagFrame;
cbRunLuaDuringTurbo.Checked = _config.RunLuaDuringTurbo;
cbMoviesOnDisk.Checked = _config.MoviesOnDisk;
cbMoviesInAWE.Checked = _config.MoviesInAwe;
switch (_config.LuaEngine)
{
case ELuaEngine.LuaPlusLuaInterface:
LuaInterfaceRadio.Checked = true;
rbLuaInterface.Checked = true;
break;
case ELuaEngine.NLuaPlusKopiLua:
NLuaRadio.Checked = true;
rbKopiLua.Checked = true;
break;
default:
throw new ArgumentOutOfRangeException();
}
}
private void OkBtn_Click(object sender, EventArgs e)
private void btnDialogOK_Click(object sender, EventArgs e)
{
_config.StartFullscreen = StartFullScreenCheckbox.Checked;
_config.StartPaused = StartPausedCheckbox.Checked;
_config.PauseWhenMenuActivated = PauseWhenMenuActivatedCheckbox.Checked;
_config.ShowContextMenu = EnableContextMenuCheckbox.Checked;
_config.SaveWindowPosition = SaveWindowPositionCheckbox.Checked;
_config.RunInBackground = RunInBackgroundCheckbox.Checked;
_config.AcceptBackgroundInput = AcceptBackgroundInputCheckbox.Checked;
_config.AcceptBackgroundInputControllerOnly = AcceptBackgroundInputControllerOnlyCheckBox.Checked;
_config.HandleAlternateKeyboardLayouts = HandleAlternateKeyboardLayoutsCheckBox.Checked;
_config.SuppressAskSave = NeverAskSaveCheckbox.Checked;
_config.SingleInstanceMode = SingleInstanceModeCheckbox.Checked;
_config.StartFullscreen = cbStartInFS.Checked;
_config.StartPaused = cbStartPaused.Checked;
_config.PauseWhenMenuActivated = cbMenusPauseEmulation.Checked;
_config.ShowContextMenu = cbEnableContextMenu.Checked;
_config.SaveWindowPosition = cbSaveWindowPosition.Checked;
_config.RunInBackground = cbNoFocusEmulate.Checked;
_config.AcceptBackgroundInput = cbNoFocusInput.Checked;
_config.AcceptBackgroundInputControllerOnly = cbNoFocusInputGamepadOnly.Checked;
_config.HandleAlternateKeyboardLayouts = cbNonQWERTY.Checked;
_config.SuppressAskSave = cbNeverAskForSave.Checked;
_config.SingleInstanceMode = cbSingleInstance.Checked;
_config.BackupSaveram = BackupSRamCheckbox.Checked;
_config.AutosaveSaveRAM = AutosaveSRAMCheckbox.Checked;
_config.BackupSaveram = cbBackupSaveRAM.Checked;
_config.AutosaveSaveRAM = cbAutoSaveRAM.Checked;
_config.FlushSaveRamFrames = AutosaveSaveRAMSeconds * 60;
if (_mainForm.AutoFlushSaveRamIn > _config.FlushSaveRamFrames)
{
_mainForm.AutoFlushSaveRamIn = _config.FlushSaveRamFrames;
}
_config.SkipLagFrame = FrameAdvSkipLagCheckbox.Checked;
_config.RunLuaDuringTurbo = LuaDuringTurboCheckbox.Checked;
_config.SkipLagFrame = cbFrameAdvPastLag.Checked;
_config.RunLuaDuringTurbo = cbRunLuaDuringTurbo.Checked;
_config.MoviesOnDisk = cbMoviesOnDisk.Checked;
_config.MoviesInAwe = cbMoviesInAWE.Checked;
var prevLuaEngine = _config.LuaEngine;
if (LuaInterfaceRadio.Checked)
if (rbLuaInterface.Checked)
{
_config.LuaEngine = ELuaEngine.LuaPlusLuaInterface;
}
else if (NLuaRadio.Checked)
else if (rbKopiLua.Checked)
{
_config.LuaEngine = ELuaEngine.NLuaPlusKopiLua;
}
@ -137,26 +137,26 @@ namespace BizHawk.Client.EmuHawk
DialogResult = DialogResult.OK;
}
private void CancelBtn_Click(object sender, EventArgs e)
private void btnDialogCancel_Click(object sender, EventArgs e)
{
Close();
DialogResult = DialogResult.Cancel;
_mainForm.AddOnScreenMessage("Customizing aborted.");
}
private void AcceptBackgroundInputCheckbox_CheckedChanged(object sender, EventArgs e)
private void cbNoFocusInput_CheckedChanged(object sender, EventArgs e)
{
AcceptBackgroundInputControllerOnlyCheckBox.Enabled = AcceptBackgroundInputCheckbox.Checked;
cbNoFocusInputGamepadOnly.Enabled = cbNoFocusInput.Checked;
}
private void AutosaveSRAMCheckbox_CheckedChanged(object sender, EventArgs e)
private void cbAutoSaveRAM_CheckedChanged(object sender, EventArgs e)
{
groupBox2.Enabled = AutosaveSRAMCheckbox.Checked;
grpAutoSaveRAM.Enabled = cbAutoSaveRAM.Checked;
}
private void AutosaveSRAMRadioButton3_CheckedChanged(object sender, EventArgs e)
private void rbAutoSaveRAMFreqCustom_CheckedChanged(object sender, EventArgs e)
{
AutosaveSRAMtextBox.Enabled = AutosaveSRAMradioButton3.Checked;
nudAutoSaveRAMFreqCustom.Enabled = rbAutoSaveRAMFreqCustom.Checked;
}
}
}

616
BizHawk.Client.EmuHawk/config/SoundConfig.Designer.cs generated
View File

@ -2,24 +2,6 @@
{
partial class SoundConfig
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
@ -28,344 +10,340 @@
/// </summary>
private void InitializeComponent()
{
this.Cancel = new System.Windows.Forms.Button();
this.OK = new System.Windows.Forms.Button();
this.cbEnableNormal = new System.Windows.Forms.CheckBox();
this.grpSoundVol = new System.Windows.Forms.GroupBox();
this.nudRWFF = new System.Windows.Forms.NumericUpDown();
this.cbEnableRWFF = new System.Windows.Forms.CheckBox();
this.tbRWFF = new System.Windows.Forms.TrackBar();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.tbNormal = new System.Windows.Forms.TrackBar();
this.nudNormal = new System.Windows.Forms.NumericUpDown();
this.listBoxSoundDevices = new System.Windows.Forms.ListBox();
this.SoundDeviceLabel = new System.Windows.Forms.Label();
this.BufferSizeLabel = new System.Windows.Forms.Label();
this.BufferSizeNumeric = new System.Windows.Forms.NumericUpDown();
this.BufferSizeUnitsLabel = new System.Windows.Forms.Label();
this.grpOutputMethod = new System.Windows.Forms.GroupBox();
this.rbOutputMethodOpenAL = new System.Windows.Forms.RadioButton();
this.rbOutputMethodXAudio2 = new System.Windows.Forms.RadioButton();
this.rbOutputMethodDirectSound = new System.Windows.Forms.RadioButton();
this.cbMuteFrameAdvance = new System.Windows.Forms.CheckBox();
this.cbEnableMaster = new System.Windows.Forms.CheckBox();
this.label3 = new System.Windows.Forms.Label();
this.grpSoundVol.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nudRWFF)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tbRWFF)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tbNormal)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudNormal)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.BufferSizeNumeric)).BeginInit();
this.grpOutputMethod.SuspendLayout();
this.btnDialogCancel = new BizHawk.WinForms.Controls.SzButtonEx();
this.btnDialogOK = new BizHawk.WinForms.Controls.SzButtonEx();
this.cbFullSpeedEnable = new BizHawk.WinForms.Controls.CheckBoxEx();
this.grpVolume = new BizHawk.WinForms.Controls.LocSzGroupBoxEx();
this.flpGrpVolume = new BizHawk.WinForms.Controls.LocSingleRowFLP();
this.flpFullSpeed = new BizHawk.WinForms.Controls.SingleColumnFLP();
this.lblFullSpeedVolume = new BizHawk.WinForms.Controls.LabelEx();
this.tbFullSpeedVolume = new System.Windows.Forms.TrackBar();
this.nudFullSpeedVolume = new BizHawk.WinForms.Controls.SzNUDEx();
this.flpRWFF = new BizHawk.WinForms.Controls.SingleColumnFLP();
this.cbRewindFFWEnable = new BizHawk.WinForms.Controls.CheckBoxEx();
this.lblRewindFFWVolume = new BizHawk.WinForms.Controls.LabelEx();
this.tbRewindFFWVolume = new System.Windows.Forms.TrackBar();
this.nudRewindFFWVolume = new BizHawk.WinForms.Controls.SzNUDEx();
this.listDevices = new System.Windows.Forms.ListBox();
this.lblDevices = new BizHawk.WinForms.Controls.LocLabelEx();
this.lblBufferSizeDesc = new BizHawk.WinForms.Controls.LabelEx();
this.nudBufferSize = new BizHawk.WinForms.Controls.SzNUDEx();
this.lblBufferSizeUnits = new BizHawk.WinForms.Controls.LabelEx();
this.flpDialogButtons = new BizHawk.WinForms.Controls.LocSzSingleRowFLP();
this.flpBufferSize = new BizHawk.WinForms.Controls.SingleRowFLP();
this.flpFlowRHS = new BizHawk.WinForms.Controls.LocSingleColumnFLP();
this.flpFlowRHSTop = new BizHawk.WinForms.Controls.SzColumnsToRightFLP();
this.cbMasterEnable = new BizHawk.WinForms.Controls.CheckBoxEx();
this.lblMasterEnable = new BizHawk.WinForms.Controls.LocSzLabelEx();
this.cbMuteFrameAdvance = new BizHawk.WinForms.Controls.CheckBoxEx();
this.grpSoundMethod = new BizHawk.WinForms.Controls.SzGroupBoxEx();
this.flpGrpSoundMethod = new BizHawk.WinForms.Controls.LocSingleColumnFLP();
this.rbSoundMethodDirectSound = new BizHawk.WinForms.Controls.RadioButtonEx();
this.rbSoundMethodXAudio2 = new BizHawk.WinForms.Controls.RadioButtonEx();
this.rbSoundMethodOpenAL = new BizHawk.WinForms.Controls.RadioButtonEx();
this.grpVolume.SuspendLayout();
this.flpGrpVolume.SuspendLayout();
this.flpFullSpeed.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tbFullSpeedVolume)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudFullSpeedVolume)).BeginInit();
this.flpRWFF.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tbRewindFFWVolume)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudRewindFFWVolume)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudBufferSize)).BeginInit();
this.flpDialogButtons.SuspendLayout();
this.flpBufferSize.SuspendLayout();
this.flpFlowRHS.SuspendLayout();
this.flpFlowRHSTop.SuspendLayout();
this.grpSoundMethod.SuspendLayout();
this.flpGrpSoundMethod.SuspendLayout();
this.SuspendLayout();
//
// Cancel
// btnDialogCancel
//
this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.Cancel.Location = new System.Drawing.Point(317, 244);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 1;
this.Cancel.Text = "&Cancel";
this.Cancel.UseVisualStyleBackColor = true;
this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
this.btnDialogCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnDialogCancel.Name = "btnDialogCancel";
this.btnDialogCancel.Size = new System.Drawing.Size(75, 23);
this.btnDialogCancel.Text = "&Cancel";
this.btnDialogCancel.Click += new System.EventHandler(this.btnDialogCancel_Click);
//
// OK
// btnDialogOK
//
this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OK.Location = new System.Drawing.Point(236, 244);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 0;
this.OK.Text = "&OK";
this.OK.UseVisualStyleBackColor = true;
this.OK.Click += new System.EventHandler(this.Ok_Click);
this.btnDialogOK.Name = "btnDialogOK";
this.btnDialogOK.Size = new System.Drawing.Size(75, 23);
this.btnDialogOK.Text = "&OK";
this.btnDialogOK.Click += new System.EventHandler(this.btnDialogOK_Click);
//
// cbEnableNormal
// cbFullSpeedEnable
//
this.cbEnableNormal.AutoSize = true;
this.cbEnableNormal.Location = new System.Drawing.Point(6, 20);
this.cbEnableNormal.Name = "cbEnableNormal";
this.cbEnableNormal.Size = new System.Drawing.Size(48, 17);
this.cbEnableNormal.TabIndex = 0;
this.cbEnableNormal.Text = "Ena.";
this.cbEnableNormal.UseVisualStyleBackColor = true;
this.cbEnableNormal.CheckedChanged += new System.EventHandler(this.UpdateSoundDialog);
this.cbFullSpeedEnable.Name = "cbFullSpeedEnable";
this.cbFullSpeedEnable.Text = "Ena.";
this.cbFullSpeedEnable.CheckedChanged += new System.EventHandler(this.cbMasterOrFullSpeed_CheckedChanged);
//
// grpSoundVol
// grpVolume
//
this.grpSoundVol.Controls.Add(this.nudRWFF);
this.grpSoundVol.Controls.Add(this.cbEnableRWFF);
this.grpSoundVol.Controls.Add(this.tbRWFF);
this.grpSoundVol.Controls.Add(this.label2);
this.grpSoundVol.Controls.Add(this.label1);
this.grpSoundVol.Controls.Add(this.tbNormal);
this.grpSoundVol.Controls.Add(this.nudNormal);
this.grpSoundVol.Controls.Add(this.cbEnableNormal);
this.grpSoundVol.Location = new System.Drawing.Point(12, 12);
this.grpSoundVol.Name = "grpSoundVol";
this.grpSoundVol.Size = new System.Drawing.Size(117, 255);
this.grpSoundVol.TabIndex = 2;
this.grpSoundVol.TabStop = false;
this.grpSoundVol.Text = "Volume";
this.grpVolume.Controls.Add(this.flpGrpVolume);
this.grpVolume.Location = new System.Drawing.Point(4, 4);
this.grpVolume.Name = "grpVolume";
this.grpVolume.Size = new System.Drawing.Size(111, 246);
this.grpVolume.Text = "Volume";
//
// nudRWFF
// flpGrpVolume
//
this.nudRWFF.Location = new System.Drawing.Point(58, 223);
this.nudRWFF.Name = "nudRWFF";
this.nudRWFF.Size = new System.Drawing.Size(45, 20);
this.nudRWFF.TabIndex = 7;
this.nudRWFF.Value = new decimal(new int[] {
this.flpGrpVolume.Controls.Add(this.flpFullSpeed);
this.flpGrpVolume.Controls.Add(this.flpRWFF);
this.flpGrpVolume.Location = new System.Drawing.Point(0, 12);
this.flpGrpVolume.Name = "flpGrpVolume";
//
// flpFullSpeed
//
this.flpFullSpeed.Controls.Add(this.cbFullSpeedEnable);
this.flpFullSpeed.Controls.Add(this.lblFullSpeedVolume);
this.flpFullSpeed.Controls.Add(this.tbFullSpeedVolume);
this.flpFullSpeed.Controls.Add(this.nudFullSpeedVolume);
this.flpFullSpeed.Name = "flpFullSpeed";
//
// lblFullSpeedVolume
//
this.lblFullSpeedVolume.Name = "lblFullSpeedVolume";
this.lblFullSpeedVolume.Text = "Normal";
//
// tbFullSpeedVolume
//
this.tbFullSpeedVolume.LargeChange = 10;
this.tbFullSpeedVolume.Location = new System.Drawing.Point(3, 39);
this.tbFullSpeedVolume.Maximum = 100;
this.tbFullSpeedVolume.Name = "tbFullSpeedVolume";
this.tbFullSpeedVolume.Orientation = System.Windows.Forms.Orientation.Vertical;
this.tbFullSpeedVolume.Size = new System.Drawing.Size(45, 164);
this.tbFullSpeedVolume.TabIndex = 2;
this.tbFullSpeedVolume.TickFrequency = 10;
this.tbFullSpeedVolume.Scroll += new System.EventHandler(this.tbFullSpeedVolume_Scroll);
//
// nudFullSpeedVolume
//
this.nudFullSpeedVolume.Name = "nudFullSpeedVolume";
this.nudFullSpeedVolume.Size = new System.Drawing.Size(45, 20);
this.nudFullSpeedVolume.Value = new decimal(new int[] {
100,
0,
0,
0});
this.nudFullSpeedVolume.ValueChanged += new System.EventHandler(this.nudFullSpeedVolume_ValueChanged);
//
// flpRWFF
//
this.flpRWFF.Controls.Add(this.cbRewindFFWEnable);
this.flpRWFF.Controls.Add(this.lblRewindFFWVolume);
this.flpRWFF.Controls.Add(this.tbRewindFFWVolume);
this.flpRWFF.Controls.Add(this.nudRewindFFWVolume);
this.flpRWFF.Name = "flpRWFF";
//
// cbRewindFFWEnable
//
this.cbRewindFFWEnable.Name = "cbRewindFFWEnable";
this.cbRewindFFWEnable.Text = "Ena.";
//
// lblRewindFFWVolume
//
this.lblRewindFFWVolume.Name = "lblRewindFFWVolume";
this.lblRewindFFWVolume.Text = "RW && FF";
//
// tbRewindFFWVolume
//
this.tbRewindFFWVolume.LargeChange = 10;
this.tbRewindFFWVolume.Location = new System.Drawing.Point(3, 39);
this.tbRewindFFWVolume.Maximum = 100;
this.tbRewindFFWVolume.Name = "tbRewindFFWVolume";
this.tbRewindFFWVolume.Orientation = System.Windows.Forms.Orientation.Vertical;
this.tbRewindFFWVolume.Size = new System.Drawing.Size(45, 164);
this.tbRewindFFWVolume.TabIndex = 6;
this.tbRewindFFWVolume.TickFrequency = 10;
this.tbRewindFFWVolume.Scroll += new System.EventHandler(this.tbRewindFFWVolume_Scroll);
//
// nudRewindFFWVolume
//
this.nudRewindFFWVolume.Name = "nudRewindFFWVolume";
this.nudRewindFFWVolume.Size = new System.Drawing.Size(45, 20);
this.nudRewindFFWVolume.Value = new decimal(new int[] {
100,
0,
0,
0});
//
// cbEnableRWFF
// listDevices
//
this.cbEnableRWFF.AutoSize = true;
this.cbEnableRWFF.Location = new System.Drawing.Point(58, 20);
this.cbEnableRWFF.Name = "cbEnableRWFF";
this.cbEnableRWFF.Size = new System.Drawing.Size(48, 17);
this.cbEnableRWFF.TabIndex = 4;
this.cbEnableRWFF.Text = "Ena.";
this.cbEnableRWFF.UseVisualStyleBackColor = true;
this.listDevices.FormattingEnabled = true;
this.listDevices.Location = new System.Drawing.Point(3, 110);
this.listDevices.Name = "listDevices";
this.listDevices.Size = new System.Drawing.Size(254, 95);
this.listDevices.TabIndex = 8;
//
// tbRWFF
// lblDevices
//
this.tbRWFF.LargeChange = 10;
this.tbRWFF.Location = new System.Drawing.Point(64, 53);
this.tbRWFF.Maximum = 100;
this.tbRWFF.Name = "tbRWFF";
this.tbRWFF.Orientation = System.Windows.Forms.Orientation.Vertical;
this.tbRWFF.Size = new System.Drawing.Size(42, 164);
this.tbRWFF.TabIndex = 6;
this.tbRWFF.TickFrequency = 10;
this.tbRWFF.Scroll += new System.EventHandler(this.TbRwff_Scroll);
this.lblDevices.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblDevices.Location = new System.Drawing.Point(3, 94);
this.lblDevices.Name = "lblDevices";
this.lblDevices.Text = "Sound Device:";
//
// label2
// lblBufferSizeDesc
//
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(56, 42);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(50, 13);
this.label2.TabIndex = 5;
this.label2.Text = "RW && FF";
this.lblBufferSizeDesc.Name = "lblBufferSizeDesc";
this.lblBufferSizeDesc.Text = "Buffer Size:";
//
// label1
// nudBufferSize
//
this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 42);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(40, 13);
this.label1.TabIndex = 1;
this.label1.Text = "Normal";
//
// tbNormal
//
this.tbNormal.LargeChange = 10;
this.tbNormal.Location = new System.Drawing.Point(8, 53);
this.tbNormal.Maximum = 100;
this.tbNormal.Name = "tbNormal";
this.tbNormal.Orientation = System.Windows.Forms.Orientation.Vertical;
this.tbNormal.Size = new System.Drawing.Size(42, 164);
this.tbNormal.TabIndex = 2;
this.tbNormal.TickFrequency = 10;
this.tbNormal.Scroll += new System.EventHandler(this.TrackBar1_Scroll);
//
// nudNormal
//
this.nudNormal.Location = new System.Drawing.Point(5, 223);
this.nudNormal.Name = "nudNormal";
this.nudNormal.Size = new System.Drawing.Size(45, 20);
this.nudNormal.TabIndex = 3;
this.nudNormal.Value = new decimal(new int[] {
100,
0,
0,
0});
this.nudNormal.ValueChanged += new System.EventHandler(this.SoundVolNumeric_ValueChanged);
//
// listBoxSoundDevices
//
this.listBoxSoundDevices.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.listBoxSoundDevices.FormattingEnabled = true;
this.listBoxSoundDevices.Location = new System.Drawing.Point(138, 110);
this.listBoxSoundDevices.Name = "listBoxSoundDevices";
this.listBoxSoundDevices.Size = new System.Drawing.Size(254, 95);
this.listBoxSoundDevices.TabIndex = 8;
//
// SoundDeviceLabel
//
this.SoundDeviceLabel.AutoSize = true;
this.SoundDeviceLabel.Location = new System.Drawing.Point(135, 89);
this.SoundDeviceLabel.Name = "SoundDeviceLabel";
this.SoundDeviceLabel.Size = new System.Drawing.Size(78, 13);
this.SoundDeviceLabel.TabIndex = 7;
this.SoundDeviceLabel.Text = "Sound Device:";
//
// BufferSizeLabel
//
this.BufferSizeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.BufferSizeLabel.AutoSize = true;
this.BufferSizeLabel.Location = new System.Drawing.Point(135, 210);
this.BufferSizeLabel.Name = "BufferSizeLabel";
this.BufferSizeLabel.Size = new System.Drawing.Size(61, 13);
this.BufferSizeLabel.TabIndex = 9;
this.BufferSizeLabel.Text = "Buffer Size:";
//
// BufferSizeNumeric
//
this.BufferSizeNumeric.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.BufferSizeNumeric.Location = new System.Drawing.Point(202, 208);
this.BufferSizeNumeric.Maximum = new decimal(new int[] {
this.nudBufferSize.Maximum = new decimal(new int[] {
250,
0,
0,
0});
this.BufferSizeNumeric.Minimum = new decimal(new int[] {
this.nudBufferSize.Minimum = new decimal(new int[] {
30,
0,
0,
0});
this.BufferSizeNumeric.Name = "BufferSizeNumeric";
this.BufferSizeNumeric.Size = new System.Drawing.Size(59, 20);
this.BufferSizeNumeric.TabIndex = 10;
this.BufferSizeNumeric.Value = new decimal(new int[] {
this.nudBufferSize.Name = "nudBufferSize";
this.nudBufferSize.Size = new System.Drawing.Size(59, 20);
this.nudBufferSize.Value = new decimal(new int[] {
100,
0,
0,
0});
//
// BufferSizeUnitsLabel
// lblBufferSizeUnits
//
this.BufferSizeUnitsLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.BufferSizeUnitsLabel.AutoSize = true;
this.BufferSizeUnitsLabel.Location = new System.Drawing.Point(267, 210);
this.BufferSizeUnitsLabel.Name = "BufferSizeUnitsLabel";
this.BufferSizeUnitsLabel.Size = new System.Drawing.Size(63, 13);
this.BufferSizeUnitsLabel.TabIndex = 11;
this.BufferSizeUnitsLabel.Text = "milliseconds";
this.lblBufferSizeUnits.Name = "lblBufferSizeUnits";
this.lblBufferSizeUnits.Text = "milliseconds";
//
// grpOutputMethod
// flpDialogButtons
//
this.grpOutputMethod.Controls.Add(this.rbOutputMethodOpenAL);
this.grpOutputMethod.Controls.Add(this.rbOutputMethodXAudio2);
this.grpOutputMethod.Controls.Add(this.rbOutputMethodDirectSound);
this.grpOutputMethod.Location = new System.Drawing.Point(292, 12);
this.grpOutputMethod.Name = "grpOutputMethod";
this.grpOutputMethod.Size = new System.Drawing.Size(100, 90);
this.grpOutputMethod.TabIndex = 12;
this.grpOutputMethod.TabStop = false;
this.grpOutputMethod.Text = "Output Method";
this.flpDialogButtons.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.flpDialogButtons.Controls.Add(this.btnDialogOK);
this.flpDialogButtons.Controls.Add(this.btnDialogCancel);
this.flpDialogButtons.Location = new System.Drawing.Point(216, 241);
this.flpDialogButtons.MinimumSize = new System.Drawing.Size(24, 24);
this.flpDialogButtons.Name = "flpDialogButtons";
this.flpDialogButtons.Size = new System.Drawing.Size(162, 29);
//
// rbOutputMethodOpenAL
// flpBufferSize
//
this.rbOutputMethodOpenAL.AutoSize = true;
this.rbOutputMethodOpenAL.Location = new System.Drawing.Point(6, 65);
this.rbOutputMethodOpenAL.Name = "rbOutputMethodOpenAL";
this.rbOutputMethodOpenAL.Size = new System.Drawing.Size(64, 17);
this.rbOutputMethodOpenAL.TabIndex = 2;
this.rbOutputMethodOpenAL.TabStop = true;
this.rbOutputMethodOpenAL.Text = "OpenAL";
this.rbOutputMethodOpenAL.UseVisualStyleBackColor = true;
this.rbOutputMethodOpenAL.CheckedChanged += new System.EventHandler(this.OutputMethodRadioButtons_CheckedChanged);
this.flpBufferSize.Controls.Add(this.lblBufferSizeDesc);
this.flpBufferSize.Controls.Add(this.nudBufferSize);
this.flpBufferSize.Controls.Add(this.lblBufferSizeUnits);
this.flpBufferSize.Name = "flpBufferSize";
//
// rbOutputMethodXAudio2
// flpFlowRHS
//
this.rbOutputMethodXAudio2.AutoSize = true;
this.rbOutputMethodXAudio2.Location = new System.Drawing.Point(6, 42);
this.rbOutputMethodXAudio2.Name = "rbOutputMethodXAudio2";
this.rbOutputMethodXAudio2.Size = new System.Drawing.Size(65, 17);
this.rbOutputMethodXAudio2.TabIndex = 1;
this.rbOutputMethodXAudio2.TabStop = true;
this.rbOutputMethodXAudio2.Text = "XAudio2";
this.rbOutputMethodXAudio2.UseVisualStyleBackColor = true;
this.rbOutputMethodXAudio2.CheckedChanged += new System.EventHandler(this.OutputMethodRadioButtons_CheckedChanged);
this.flpFlowRHS.Controls.Add(this.flpFlowRHSTop);
this.flpFlowRHS.Controls.Add(this.lblDevices);
this.flpFlowRHS.Controls.Add(this.listDevices);
this.flpFlowRHS.Controls.Add(this.flpBufferSize);
this.flpFlowRHS.Location = new System.Drawing.Point(118, 4);
this.flpFlowRHS.Name = "flpFlowRHS";
//
// rbOutputMethodDirectSound
// flpFlowRHSTop
//
this.rbOutputMethodDirectSound.AutoSize = true;
this.rbOutputMethodDirectSound.Location = new System.Drawing.Point(6, 19);
this.rbOutputMethodDirectSound.Name = "rbOutputMethodDirectSound";
this.rbOutputMethodDirectSound.Size = new System.Drawing.Size(84, 17);
this.rbOutputMethodDirectSound.TabIndex = 0;
this.rbOutputMethodDirectSound.TabStop = true;
this.rbOutputMethodDirectSound.Text = "DirectSound";
this.rbOutputMethodDirectSound.UseVisualStyleBackColor = true;
this.rbOutputMethodDirectSound.CheckedChanged += new System.EventHandler(this.OutputMethodRadioButtons_CheckedChanged);
this.flpFlowRHSTop.Controls.Add(this.cbMasterEnable);
this.flpFlowRHSTop.Controls.Add(this.lblMasterEnable);
this.flpFlowRHSTop.Controls.Add(this.cbMuteFrameAdvance);
this.flpFlowRHSTop.Controls.Add(this.grpSoundMethod);
this.flpFlowRHSTop.MinimumSize = new System.Drawing.Size(24, 24);
this.flpFlowRHSTop.Name = "flpFlowRHSTop";
this.flpFlowRHSTop.Size = new System.Drawing.Size(245, 94);
//
// cbMasterEnable
//
this.cbMasterEnable.Name = "cbMasterEnable";
this.cbMasterEnable.Text = "Sound Master Enable";
this.cbMasterEnable.CheckedChanged += new System.EventHandler(this.cbMasterOrFullSpeed_CheckedChanged);
//
// lblMasterEnable
//
this.lblMasterEnable.Location = new System.Drawing.Point(3, 23);
this.lblMasterEnable.Name = "lblMasterEnable";
this.lblMasterEnable.Padding = new System.Windows.Forms.Padding(16, 0, 0, 0);
this.lblMasterEnable.Size = new System.Drawing.Size(131, 26);
this.lblMasterEnable.Text = "Controls whether cores even generate audio.";
//
// cbMuteFrameAdvance
//
this.cbMuteFrameAdvance.AutoSize = true;
this.cbMuteFrameAdvance.Location = new System.Drawing.Point(139, 68);
this.cbMuteFrameAdvance.Name = "cbMuteFrameAdvance";
this.cbMuteFrameAdvance.Size = new System.Drawing.Size(128, 17);
this.cbMuteFrameAdvance.TabIndex = 6;
this.cbMuteFrameAdvance.Text = "Mute Frame Advance";
this.cbMuteFrameAdvance.UseVisualStyleBackColor = true;
//
// cbEnableMaster
// grpSoundMethod
//
this.cbEnableMaster.AutoSize = true;
this.cbEnableMaster.Location = new System.Drawing.Point(139, 16);
this.cbEnableMaster.Name = "cbEnableMaster";
this.cbEnableMaster.Size = new System.Drawing.Size(128, 17);
this.cbEnableMaster.TabIndex = 4;
this.cbEnableMaster.Text = "Sound Master Enable";
this.cbEnableMaster.UseVisualStyleBackColor = true;
this.cbEnableMaster.CheckedChanged += new System.EventHandler(this.UpdateSoundDialog);
this.grpSoundMethod.Controls.Add(this.flpGrpSoundMethod);
this.grpSoundMethod.Name = "grpSoundMethod";
this.grpSoundMethod.Size = new System.Drawing.Size(100, 90);
this.grpSoundMethod.Text = "Output Method";
//
// label3
// flpGrpSoundMethod
//
this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label3.Location = new System.Drawing.Point(161, 35);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(126, 26);
this.label3.TabIndex = 5;
this.label3.Text = "Controls whether cores even generate audio.";
this.flpGrpSoundMethod.Controls.Add(this.rbSoundMethodDirectSound);
this.flpGrpSoundMethod.Controls.Add(this.rbSoundMethodXAudio2);
this.flpGrpSoundMethod.Controls.Add(this.rbSoundMethodOpenAL);
this.flpGrpSoundMethod.Location = new System.Drawing.Point(6, 13);
this.flpGrpSoundMethod.Name = "flpGrpSoundMethod";
//
// rbSoundMethodDirectSound
//
this.rbSoundMethodDirectSound.Name = "rbSoundMethodDirectSound";
this.rbSoundMethodDirectSound.Text = "DirectSound";
this.rbSoundMethodDirectSound.CheckedChanged += new System.EventHandler(this.rbSoundMethodAllRadios_CheckedChanged);
//
// rbSoundMethodXAudio2
//
this.rbSoundMethodXAudio2.Name = "rbSoundMethodXAudio2";
this.rbSoundMethodXAudio2.Text = "XAudio2";
this.rbSoundMethodXAudio2.CheckedChanged += new System.EventHandler(this.rbSoundMethodAllRadios_CheckedChanged);
//
// rbSoundMethodOpenAL
//
this.rbSoundMethodOpenAL.Name = "rbSoundMethodOpenAL";
this.rbSoundMethodOpenAL.Text = "OpenAL";
this.rbSoundMethodOpenAL.CheckedChanged += new System.EventHandler(this.rbSoundMethodAllRadios_CheckedChanged);
//
// SoundConfig
//
this.AcceptButton = this.OK;
this.AcceptButton = this.btnDialogOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.Cancel;
this.ClientSize = new System.Drawing.Size(404, 279);
this.Controls.Add(this.label3);
this.Controls.Add(this.cbEnableMaster);
this.Controls.Add(this.cbMuteFrameAdvance);
this.Controls.Add(this.grpOutputMethod);
this.Controls.Add(this.BufferSizeUnitsLabel);
this.Controls.Add(this.BufferSizeNumeric);
this.Controls.Add(this.BufferSizeLabel);
this.Controls.Add(this.SoundDeviceLabel);
this.Controls.Add(this.listBoxSoundDevices);
this.Controls.Add(this.grpSoundVol);
this.Controls.Add(this.OK);
this.Controls.Add(this.Cancel);
this.CancelButton = this.btnDialogCancel;
this.ClientSize = new System.Drawing.Size(382, 274);
this.Controls.Add(this.grpVolume);
this.Controls.Add(this.flpDialogButtons);
this.Controls.Add(this.flpFlowRHS);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MinimumSize = new System.Drawing.Size(279, 259);
this.MinimumSize = new System.Drawing.Size(398, 313);
this.Name = "SoundConfig";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Sound Configuration";
this.Load += new System.EventHandler(this.SoundConfig_Load);
this.grpSoundVol.ResumeLayout(false);
this.grpSoundVol.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nudRWFF)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tbRWFF)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tbNormal)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudNormal)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.BufferSizeNumeric)).EndInit();
this.grpOutputMethod.ResumeLayout(false);
this.grpOutputMethod.PerformLayout();
this.grpVolume.ResumeLayout(false);
this.grpVolume.PerformLayout();
this.flpGrpVolume.ResumeLayout(false);
this.flpGrpVolume.PerformLayout();
this.flpFullSpeed.ResumeLayout(false);
this.flpFullSpeed.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.tbFullSpeedVolume)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudFullSpeedVolume)).EndInit();
this.flpRWFF.ResumeLayout(false);
this.flpRWFF.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.tbRewindFFWVolume)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudRewindFFWVolume)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudBufferSize)).EndInit();
this.flpDialogButtons.ResumeLayout(false);
this.flpBufferSize.ResumeLayout(false);
this.flpBufferSize.PerformLayout();
this.flpFlowRHS.ResumeLayout(false);
this.flpFlowRHS.PerformLayout();
this.flpFlowRHSTop.ResumeLayout(false);
this.flpFlowRHSTop.PerformLayout();
this.grpSoundMethod.ResumeLayout(false);
this.grpSoundMethod.PerformLayout();
this.flpGrpSoundMethod.ResumeLayout(false);
this.flpGrpSoundMethod.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@ -373,28 +351,36 @@
#endregion
private System.Windows.Forms.Button Cancel;
private System.Windows.Forms.Button OK;
private System.Windows.Forms.CheckBox cbEnableNormal;
private System.Windows.Forms.GroupBox grpSoundVol;
private System.Windows.Forms.NumericUpDown nudNormal;
private System.Windows.Forms.TrackBar tbNormal;
private System.Windows.Forms.ListBox listBoxSoundDevices;
private System.Windows.Forms.Label SoundDeviceLabel;
private System.Windows.Forms.Label BufferSizeLabel;
private System.Windows.Forms.NumericUpDown BufferSizeNumeric;
private System.Windows.Forms.Label BufferSizeUnitsLabel;
private System.Windows.Forms.GroupBox grpOutputMethod;
private System.Windows.Forms.RadioButton rbOutputMethodXAudio2;
private System.Windows.Forms.RadioButton rbOutputMethodDirectSound;
private System.Windows.Forms.RadioButton rbOutputMethodOpenAL;
private System.Windows.Forms.NumericUpDown nudRWFF;
private System.Windows.Forms.CheckBox cbEnableRWFF;
private System.Windows.Forms.TrackBar tbRWFF;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox cbMuteFrameAdvance;
private System.Windows.Forms.CheckBox cbEnableMaster;
private System.Windows.Forms.Label label3;
private BizHawk.WinForms.Controls.SingleColumnFLP flpFullSpeed;
private BizHawk.WinForms.Controls.SingleRowFLP flpBufferSize;
private BizHawk.WinForms.Controls.LocSingleColumnFLP flpFlowRHS;
private BizHawk.WinForms.Controls.LocSzSingleRowFLP flpDialogButtons;
private BizHawk.WinForms.Controls.SingleColumnFLP flpRWFF;
private BizHawk.WinForms.Controls.SzButtonEx btnDialogCancel;
private BizHawk.WinForms.Controls.SzButtonEx btnDialogOK;
private BizHawk.WinForms.Controls.CheckBoxEx cbFullSpeedEnable;
private BizHawk.WinForms.Controls.LocSzGroupBoxEx grpVolume;
private BizHawk.WinForms.Controls.SzNUDEx nudFullSpeedVolume;
private System.Windows.Forms.TrackBar tbFullSpeedVolume;
private System.Windows.Forms.ListBox listDevices;
private BizHawk.WinForms.Controls.LocLabelEx lblDevices;
private BizHawk.WinForms.Controls.LabelEx lblBufferSizeDesc;
private BizHawk.WinForms.Controls.SzNUDEx nudBufferSize;
private BizHawk.WinForms.Controls.LabelEx lblBufferSizeUnits;
private BizHawk.WinForms.Controls.SzNUDEx nudRewindFFWVolume;
private BizHawk.WinForms.Controls.CheckBoxEx cbRewindFFWEnable;
private System.Windows.Forms.TrackBar tbRewindFFWVolume;
private BizHawk.WinForms.Controls.LabelEx lblRewindFFWVolume;
private BizHawk.WinForms.Controls.LabelEx lblFullSpeedVolume;
private BizHawk.WinForms.Controls.LocSingleRowFLP flpGrpVolume;
private BizHawk.WinForms.Controls.SzColumnsToRightFLP flpFlowRHSTop;
private BizHawk.WinForms.Controls.CheckBoxEx cbMasterEnable;
private BizHawk.WinForms.Controls.LocSzLabelEx lblMasterEnable;
private BizHawk.WinForms.Controls.CheckBoxEx cbMuteFrameAdvance;
private BizHawk.WinForms.Controls.SzGroupBoxEx grpSoundMethod;
private BizHawk.WinForms.Controls.LocSingleColumnFLP flpGrpSoundMethod;
private BizHawk.WinForms.Controls.RadioButtonEx rbSoundMethodDirectSound;
private BizHawk.WinForms.Controls.RadioButtonEx rbSoundMethodXAudio2;
private BizHawk.WinForms.Controls.RadioButtonEx rbSoundMethodOpenAL;
}
}
}

93
BizHawk.Client.EmuHawk/config/SoundConfig.cs
View File

@ -5,6 +5,7 @@ using System.Windows.Forms;
using BizHawk.Client.Common;
using BizHawk.Common;
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
@ -23,51 +24,51 @@ namespace BizHawk.Client.EmuHawk
{
_programmaticallyChangingValue = true;
cbEnableMaster.Checked = _config.SoundEnabled;
cbEnableNormal.Checked = _config.SoundEnabledNormal;
cbEnableRWFF.Checked = _config.SoundEnabledRWFF;
cbMasterEnable.Checked = _config.SoundEnabled;
cbFullSpeedEnable.Checked = _config.SoundEnabledNormal;
cbRewindFFWEnable.Checked = _config.SoundEnabledRWFF;
cbMuteFrameAdvance.Checked = _config.MuteFrameAdvance;
if (OSTailoredCode.IsUnixHost)
{
// Disable DirectSound and XAudio2 on Mono
rbOutputMethodDirectSound.Enabled = false;
rbOutputMethodXAudio2.Enabled = false;
rbSoundMethodDirectSound.Enabled = false;
rbSoundMethodXAudio2.Enabled = false;
}
rbOutputMethodDirectSound.Checked = _config.SoundOutputMethod == ESoundOutputMethod.DirectSound;
rbOutputMethodXAudio2.Checked = _config.SoundOutputMethod == ESoundOutputMethod.XAudio2;
rbOutputMethodOpenAL.Checked = _config.SoundOutputMethod == ESoundOutputMethod.OpenAL;
BufferSizeNumeric.Value = _config.SoundBufferSizeMs;
tbNormal.Value = _config.SoundVolume;
nudNormal.Value = _config.SoundVolume;
tbRWFF.Value = _config.SoundVolumeRWFF;
nudRWFF.Value = _config.SoundVolumeRWFF;
rbSoundMethodDirectSound.Checked = _config.SoundOutputMethod == ESoundOutputMethod.DirectSound;
rbSoundMethodXAudio2.Checked = _config.SoundOutputMethod == ESoundOutputMethod.XAudio2;
rbSoundMethodOpenAL.Checked = _config.SoundOutputMethod == ESoundOutputMethod.OpenAL;
nudBufferSize.Value = _config.SoundBufferSizeMs;
tbFullSpeedVolume.Value = _config.SoundVolume;
nudFullSpeedVolume.Value = _config.SoundVolume;
tbRewindFFWVolume.Value = _config.SoundVolumeRWFF;
nudRewindFFWVolume.Value = _config.SoundVolumeRWFF;
UpdateSoundDialog();
_programmaticallyChangingValue = false;
}
private void Ok_Click(object sender, EventArgs e)
private void btnDialogOK_Click(object sender, EventArgs e)
{
if (rbOutputMethodDirectSound.Checked && (int)BufferSizeNumeric.Value < 60)
if (rbSoundMethodDirectSound.Checked && (int)nudBufferSize.Value < 60)
{
MessageBox.Show("Buffer size must be at least 60 milliseconds for DirectSound.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
var oldOutputMethod = _config.SoundOutputMethod;
var oldDevice = _config.SoundDevice;
_config.SoundEnabled = cbEnableMaster.Checked;
_config.SoundEnabledNormal = cbEnableNormal.Checked;
_config.SoundEnabledRWFF = cbEnableRWFF.Checked;
_config.SoundEnabled = cbMasterEnable.Checked;
_config.SoundEnabledNormal = cbFullSpeedEnable.Checked;
_config.SoundEnabledRWFF = cbRewindFFWEnable.Checked;
_config.MuteFrameAdvance = cbMuteFrameAdvance.Checked;
if (rbOutputMethodDirectSound.Checked) _config.SoundOutputMethod = ESoundOutputMethod.DirectSound;
if (rbOutputMethodXAudio2.Checked) _config.SoundOutputMethod = ESoundOutputMethod.XAudio2;
if (rbOutputMethodOpenAL.Checked) _config.SoundOutputMethod = ESoundOutputMethod.OpenAL;
_config.SoundBufferSizeMs = (int)BufferSizeNumeric.Value;
_config.SoundVolume = tbNormal.Value;
_config.SoundVolumeRWFF = tbRWFF.Value;
_config.SoundDevice = (string)listBoxSoundDevices.SelectedItem ?? "<default>";
if (rbSoundMethodDirectSound.Checked) _config.SoundOutputMethod = ESoundOutputMethod.DirectSound;
if (rbSoundMethodXAudio2.Checked) _config.SoundOutputMethod = ESoundOutputMethod.XAudio2;
if (rbSoundMethodOpenAL.Checked) _config.SoundOutputMethod = ESoundOutputMethod.OpenAL;
_config.SoundBufferSizeMs = (int)nudBufferSize.Value;
_config.SoundVolume = tbFullSpeedVolume.Value;
_config.SoundVolumeRWFF = tbRewindFFWVolume.Value;
_config.SoundDevice = (string)listDevices.SelectedItem ?? "<default>";
GlobalWin.Sound.StopSound();
if (_config.SoundOutputMethod != oldOutputMethod
|| _config.SoundDevice != oldDevice)
@ -79,7 +80,7 @@ namespace BizHawk.Client.EmuHawk
DialogResult = DialogResult.OK;
}
private void Cancel_Click(object sender, EventArgs e)
private void btnDialogCancel_Click(object sender, EventArgs e)
{
Close();
}
@ -89,27 +90,27 @@ namespace BizHawk.Client.EmuHawk
IEnumerable<string> deviceNames = Enumerable.Empty<string>();
if (!OSTailoredCode.IsUnixHost)
{
if (rbOutputMethodDirectSound.Checked) deviceNames = DirectSoundSoundOutput.GetDeviceNames();
if (rbOutputMethodXAudio2.Checked) deviceNames = XAudio2SoundOutput.GetDeviceNames();
if (rbSoundMethodDirectSound.Checked) deviceNames = DirectSoundSoundOutput.GetDeviceNames();
if (rbSoundMethodXAudio2.Checked) deviceNames = XAudio2SoundOutput.GetDeviceNames();
}
if (rbOutputMethodOpenAL.Checked) deviceNames = OpenALSoundOutput.GetDeviceNames();
if (rbSoundMethodOpenAL.Checked) deviceNames = OpenALSoundOutput.GetDeviceNames();
listBoxSoundDevices.Items.Clear();
listBoxSoundDevices.Items.Add("<default>");
listBoxSoundDevices.SelectedIndex = 0;
listDevices.Items.Clear();
listDevices.Items.Add("<default>");
listDevices.SelectedIndex = 0;
foreach (var name in deviceNames)
{
listBoxSoundDevices.Items.Add(name);
listDevices.Items.Add(name);
if (name == _config.SoundDevice)
{
listBoxSoundDevices.SelectedItem = name;
listDevices.SelectedItem = name;
}
}
}
private void OutputMethodRadioButtons_CheckedChanged(object sender, EventArgs e)
private void rbSoundMethodAllRadios_CheckedChanged(object sender, EventArgs e)
{
if (!((RadioButton)sender).Checked)
if (!((RadioButtonEx)sender).Checked)
{
return;
}
@ -117,34 +118,34 @@ namespace BizHawk.Client.EmuHawk
PopulateDeviceList();
}
private void TrackBar1_Scroll(object sender, EventArgs e)
private void tbFullSpeedVolume_Scroll(object sender, EventArgs e)
{
nudNormal.Value = tbNormal.Value;
nudFullSpeedVolume.Value = tbFullSpeedVolume.Value;
}
private void TbRwff_Scroll(object sender, EventArgs e)
private void tbRewindFFWVolume_Scroll(object sender, EventArgs e)
{
nudRWFF.Value = tbRWFF.Value;
nudRewindFFWVolume.Value = tbRewindFFWVolume.Value;
}
private void SoundVolNumeric_ValueChanged(object sender, EventArgs e)
private void nudFullSpeedVolume_ValueChanged(object sender, EventArgs e)
{
tbNormal.Value = (int)nudNormal.Value;
tbFullSpeedVolume.Value = (int)nudFullSpeedVolume.Value;
// If the user is changing the volume, automatically turn on/off sound accordingly
if (!_programmaticallyChangingValue)
{
cbEnableNormal.Checked = tbNormal.Value != 0;
cbFullSpeedEnable.Checked = tbFullSpeedVolume.Value != 0;
}
}
private void UpdateSoundDialog()
{
cbEnableRWFF.Enabled = cbEnableNormal.Checked;
grpSoundVol.Enabled = cbEnableMaster.Checked;
cbRewindFFWEnable.Enabled = cbFullSpeedEnable.Checked;
grpVolume.Enabled = cbMasterEnable.Checked;
}
private void UpdateSoundDialog(object sender, EventArgs e)
private void cbMasterOrFullSpeed_CheckedChanged(object sender, EventArgs e)
{
UpdateSoundDialog();
}