diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index e0449dcf67..5ef08d8b78 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -133,7 +133,6 @@ public bool SoundEnabled = true; public bool MuteFrameAdvance = true; public int SoundVolume = 100; //Range 0-100 - public int SoundSampleRateIndex = 2; //0 = 22050, 1 = 32000, 2 = 44100, 3 = 48000, 4 = 960000 // Lua Console public RecentFiles RecentLua = new RecentFiles(8); diff --git a/BizHawk.MultiClient/Sound.cs b/BizHawk.MultiClient/Sound.cs index 1b030669b8..cce0d02727 100644 --- a/BizHawk.MultiClient/Sound.cs +++ b/BizHawk.MultiClient/Sound.cs @@ -176,26 +176,6 @@ namespace BizHawk.MultiClient if (Global.Config.SoundEnabled) vol = -5000; DSoundBuffer.Volume = 0 - ((100 - Global.Config.SoundVolume) * 50); - - switch (Global.Config.SoundSampleRateIndex) - { - case 0: - DSoundBuffer.Format.SamplesPerSecond = 22050; - break; - case 1: - DSoundBuffer.Format.SamplesPerSecond = 32000; - break; - default: - case 2: - DSoundBuffer.Format.SamplesPerSecond = 44100; - break; - case 3: - DSoundBuffer.Format.SamplesPerSecond = 48000; - break; - case 4: - DSoundBuffer.Format.SamplesPerSecond = 96000; - break; - } } } diff --git a/BizHawk.MultiClient/config/SoundConfig.Designer.cs b/BizHawk.MultiClient/config/SoundConfig.Designer.cs index 3dd12997fa..60d9eeb8c3 100644 --- a/BizHawk.MultiClient/config/SoundConfig.Designer.cs +++ b/BizHawk.MultiClient/config/SoundConfig.Designer.cs @@ -35,12 +35,9 @@ this.SoundVolGroup = new System.Windows.Forms.GroupBox(); this.SoundVolBar = new System.Windows.Forms.TrackBar(); this.SoundVolNumeric = new System.Windows.Forms.NumericUpDown(); - this.SampleRateCombo = new System.Windows.Forms.ComboBox(); - this.SampleRateBox = new System.Windows.Forms.GroupBox(); this.SoundVolGroup.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.SoundVolBar)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.SoundVolNumeric)).BeginInit(); - this.SampleRateBox.SuspendLayout(); this.SuspendLayout(); // // Cancel @@ -118,31 +115,6 @@ this.SoundVolNumeric.TabIndex = 0; this.SoundVolNumeric.ValueChanged += new System.EventHandler(this.SoundVolNumeric_ValueChanged); // - // SampleRateCombo - // - this.SampleRateCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.SampleRateCombo.FormattingEnabled = true; - this.SampleRateCombo.Items.AddRange(new object[] { - "22050", - "32000", - "44100", - "48000", - "96000"}); - this.SampleRateCombo.Location = new System.Drawing.Point(6, 19); - this.SampleRateCombo.Name = "SampleRateCombo"; - this.SampleRateCombo.Size = new System.Drawing.Size(121, 21); - this.SampleRateCombo.TabIndex = 5; - // - // SampleRateBox - // - this.SampleRateBox.Controls.Add(this.SampleRateCombo); - this.SampleRateBox.Location = new System.Drawing.Point(127, 71); - this.SampleRateBox.Name = "SampleRateBox"; - this.SampleRateBox.Size = new System.Drawing.Size(135, 53); - this.SampleRateBox.TabIndex = 6; - this.SampleRateBox.TabStop = false; - this.SampleRateBox.Text = "Sample Rate"; - // // SoundConfig // this.AcceptButton = this.OK; @@ -150,7 +122,6 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.Cancel; this.ClientSize = new System.Drawing.Size(355, 286); - this.Controls.Add(this.SampleRateBox); this.Controls.Add(this.SoundVolGroup); this.Controls.Add(this.MuteFrameAdvance); this.Controls.Add(this.SoundOnCheckBox); @@ -164,7 +135,6 @@ this.SoundVolGroup.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.SoundVolBar)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.SoundVolNumeric)).EndInit(); - this.SampleRateBox.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -179,7 +149,5 @@ private System.Windows.Forms.GroupBox SoundVolGroup; private System.Windows.Forms.NumericUpDown SoundVolNumeric; private System.Windows.Forms.TrackBar SoundVolBar; - private System.Windows.Forms.ComboBox SampleRateCombo; - private System.Windows.Forms.GroupBox SampleRateBox; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/config/SoundConfig.cs b/BizHawk.MultiClient/config/SoundConfig.cs index 7ba67c357c..ab4b5f6251 100644 --- a/BizHawk.MultiClient/config/SoundConfig.cs +++ b/BizHawk.MultiClient/config/SoundConfig.cs @@ -22,7 +22,6 @@ namespace BizHawk.MultiClient MuteFrameAdvance.Checked = Global.Config.MuteFrameAdvance; SoundVolBar.Value = Global.Config.SoundVolume; SoundVolNumeric.Value = Global.Config.SoundVolume; - SampleRateCombo.SelectedIndex = Global.Config.SoundSampleRateIndex; UpdateSoundDialog(); } @@ -32,7 +31,6 @@ namespace BizHawk.MultiClient Global.Config.MuteFrameAdvance = MuteFrameAdvance.Checked; Global.Config.SoundVolume = SoundVolBar.Value; Global.Sound.ChangeVolume(Global.Config.SoundVolume); - Global.Config.SoundSampleRateIndex = SampleRateCombo.SelectedIndex; Global.Sound.UpdateSoundSettings(); Global.Sound.StartSound(); this.Close(); @@ -63,13 +61,11 @@ namespace BizHawk.MultiClient if (SoundOnCheckBox.Checked) { SoundVolGroup.Enabled = true; - SampleRateBox.Enabled = true; MuteFrameAdvance.Enabled = true; } else { SoundVolGroup.Enabled = false; - SampleRateBox.Enabled = false; MuteFrameAdvance.Enabled = false; } }