#28263: DTX2WAV007:

 * oggとmp3のエンコード設定を追加。(といっても、ビットレート設定のみですが。oggはQ値設定のみ、mp3はCBRのビットレート指定のみ。)
 * DTXMania本体がない時の例外処理追加
 * ウインドウリサイズ対応(道半ば)
 * それなりにタブオーダーを設定
#xxxxx DTXMania本体: 設定画面のフォント指定機能を追加。(resources.csvファイルで設定)

diff --git a/DTX2WAV/App.config b/DTX2WAV/App.config
index 266c2b1..94be76d 100644 (file)
--- a/DTX2WAV/App.config
+++ b/DTX2WAV/App.config
@@ -29,7 +29,7 @@
                 <value>100</value>
             </setting>
             <setting name="nVol_Master" serializeAs="String">
-                <value>0</value>
+                <value>100</value>
             </setting>
             <setting name="bMonitorSound" serializeAs="String">
                 <value>True</value>
@@ -40,6 +40,12 @@
             <setting name="nAudioFormat" serializeAs="String">
                 <value>0</value>
             </setting>
+            <setting name="nOgg_Q" serializeAs="String">
+                <value>10</value>
+            </setting>
+            <setting name="nMP3_bps" serializeAs="String">
+                <value>4</value>
+            </setting>
         </DTX2WAV.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file

diff --git a/DTX2WAV/Form1.Designer.cs b/DTX2WAV/Form1.Designer.cs
index c5b45a8..40d2cbf 100644 (file)
--- a/DTX2WAV/Form1.Designer.cs
+++ b/DTX2WAV/Form1.Designer.cs
@@ -38,7 +38,7 @@
                        this.statusStrip1 = new System.Windows.Forms.StatusStrip();
                        this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
                        this.label1 = new System.Windows.Forms.Label();
-                       this.groupBox1 = new System.Windows.Forms.GroupBox();
+                       this.groupBox_recfiles = new System.Windows.Forms.GroupBox();
                        this.comboBox_AudioFormat = new System.Windows.Forms.ComboBox();
                        this.label3 = new System.Windows.Forms.Label();
                        this.button_BrowseAudio = new System.Windows.Forms.Button();
@@ -50,7 +50,7 @@
                        this.tabPage1 = new System.Windows.Forms.TabPage();
                        this.button_Cancel = new System.Windows.Forms.Button();
                        this.button_Convert = new System.Windows.Forms.Button();
-                       this.groupBox2 = new System.Windows.Forms.GroupBox();
+                       this.groupBox_volumes = new System.Windows.Forms.GroupBox();
                        this.checkBox_MonitorSound = new System.Windows.Forms.CheckBox();
                        this.numericUpDown_Master = new System.Windows.Forms.NumericUpDown();
                        this.bindingSource_Master = new System.Windows.Forms.BindingSource(this.components);
@@ -77,13 +77,21 @@
                        this.label4 = new System.Windows.Forms.Label();
                        this.trackBar_BGM = new System.Windows.Forms.TrackBar();
                        this.tabPage2 = new System.Windows.Forms.TabPage();
+                       this.groupBox_MP3 = new System.Windows.Forms.GroupBox();
+                       this.label11 = new System.Windows.Forms.Label();
+                       this.groupBox_Ogg = new System.Windows.Forms.GroupBox();
+                       this.numericUpDown_Ogg_Q = new System.Windows.Forms.NumericUpDown();
+                       this.bindingSource_Ogg_Q = new System.Windows.Forms.BindingSource(this.components);
+                       this.label10 = new System.Windows.Forms.Label();
+                       this.trackBar_Ogg_Q = new System.Windows.Forms.TrackBar();
                        this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
                        this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+                       this.comboBox_MP3_bps = new System.Windows.Forms.ComboBox();
                        this.menuStrip1.SuspendLayout();
-                       this.groupBox1.SuspendLayout();
+                       this.groupBox_recfiles.SuspendLayout();
                        this.tabControl1.SuspendLayout();
                        this.tabPage1.SuspendLayout();
-                       this.groupBox2.SuspendLayout();
+                       this.groupBox_volumes.SuspendLayout();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Master)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Master)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_Master)).BeginInit();
@@ -102,6 +110,12 @@
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_BGM)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.bindingSource_BGM)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_BGM)).BeginInit();
+                       this.tabPage2.SuspendLayout();
+                       this.groupBox_MP3.SuspendLayout();
+                       this.groupBox_Ogg.SuspendLayout();
+                       ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Ogg_Q)).BeginInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Ogg_Q)).BeginInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.trackBar_Ogg_Q)).BeginInit();
                        this.SuspendLayout();
                        // 
                        // menuStrip1
@@ -149,19 +163,19 @@
                        resources.ApplyResources(this.label1, "label1");
                        this.label1.Name = "label1";
                        // 
-                       // groupBox1
+                       // groupBox_recfiles
                        // 
-                       this.groupBox1.Controls.Add(this.comboBox_AudioFormat);
-                       this.groupBox1.Controls.Add(this.label3);
-                       this.groupBox1.Controls.Add(this.button_BrowseAudio);
-                       this.groupBox1.Controls.Add(this.textBox_BrowseAudio);
-                       this.groupBox1.Controls.Add(this.label2);
-                       this.groupBox1.Controls.Add(this.button_browseDTX);
-                       this.groupBox1.Controls.Add(this.textBox_BrowseDTX);
-                       this.groupBox1.Controls.Add(this.label1);
-                       resources.ApplyResources(this.groupBox1, "groupBox1");
-                       this.groupBox1.Name = "groupBox1";
-                       this.groupBox1.TabStop = false;
+                       resources.ApplyResources(this.groupBox_recfiles, "groupBox_recfiles");
+                       this.groupBox_recfiles.Controls.Add(this.comboBox_AudioFormat);
+                       this.groupBox_recfiles.Controls.Add(this.label3);
+                       this.groupBox_recfiles.Controls.Add(this.button_BrowseAudio);
+                       this.groupBox_recfiles.Controls.Add(this.textBox_BrowseAudio);
+                       this.groupBox_recfiles.Controls.Add(this.label2);
+                       this.groupBox_recfiles.Controls.Add(this.button_browseDTX);
+                       this.groupBox_recfiles.Controls.Add(this.textBox_BrowseDTX);
+                       this.groupBox_recfiles.Controls.Add(this.label1);
+                       this.groupBox_recfiles.Name = "groupBox_recfiles";
+                       this.groupBox_recfiles.TabStop = false;
                        // 
                        // comboBox_AudioFormat
                        // 
@@ -216,13 +230,14 @@
                        resources.ApplyResources(this.tabControl1, "tabControl1");
                        this.tabControl1.Name = "tabControl1";
                        this.tabControl1.SelectedIndex = 0;
+                       this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
                        // 
                        // tabPage1
                        // 
                        this.tabPage1.Controls.Add(this.button_Cancel);
                        this.tabPage1.Controls.Add(this.button_Convert);
-                       this.tabPage1.Controls.Add(this.groupBox2);
-                       this.tabPage1.Controls.Add(this.groupBox1);
+                       this.tabPage1.Controls.Add(this.groupBox_volumes);
+                       this.tabPage1.Controls.Add(this.groupBox_recfiles);
                        resources.ApplyResources(this.tabPage1, "tabPage1");
                        this.tabPage1.Name = "tabPage1";
                        this.tabPage1.UseVisualStyleBackColor = true;
@@ -241,30 +256,30 @@
                        this.button_Convert.UseVisualStyleBackColor = true;
                        this.button_Convert.Click += new System.EventHandler(this.button_Convert_Click);
                        // 
-                       // groupBox2
-                       // 
-                       this.groupBox2.Controls.Add(this.checkBox_MonitorSound);
-                       this.groupBox2.Controls.Add(this.numericUpDown_Master);
-                       this.groupBox2.Controls.Add(this.label9);
-                       this.groupBox2.Controls.Add(this.trackBar_Master);
-                       this.groupBox2.Controls.Add(this.numericUpDown_Bass);
-                       this.groupBox2.Controls.Add(this.label8);
-                       this.groupBox2.Controls.Add(this.trackBar_Bass);
-                       this.groupBox2.Controls.Add(this.numericUpDown_Guitar);
-                       this.groupBox2.Controls.Add(this.label7);
-                       this.groupBox2.Controls.Add(this.trackBar_Guitar);
-                       this.groupBox2.Controls.Add(this.numericUpDown_Drums);
-                       this.groupBox2.Controls.Add(this.label6);
-                       this.groupBox2.Controls.Add(this.trackBar_Drums);
-                       this.groupBox2.Controls.Add(this.numericUpDown_SE);
-                       this.groupBox2.Controls.Add(this.label5);
-                       this.groupBox2.Controls.Add(this.trackBar_SE);
-                       this.groupBox2.Controls.Add(this.numericUpDown_BGM);
-                       this.groupBox2.Controls.Add(this.label4);
-                       this.groupBox2.Controls.Add(this.trackBar_BGM);
-                       resources.ApplyResources(this.groupBox2, "groupBox2");
-                       this.groupBox2.Name = "groupBox2";
-                       this.groupBox2.TabStop = false;
+                       // groupBox_volumes
+                       // 
+                       resources.ApplyResources(this.groupBox_volumes, "groupBox_volumes");
+                       this.groupBox_volumes.Controls.Add(this.checkBox_MonitorSound);
+                       this.groupBox_volumes.Controls.Add(this.numericUpDown_Master);
+                       this.groupBox_volumes.Controls.Add(this.label9);
+                       this.groupBox_volumes.Controls.Add(this.trackBar_Master);
+                       this.groupBox_volumes.Controls.Add(this.numericUpDown_Bass);
+                       this.groupBox_volumes.Controls.Add(this.label8);
+                       this.groupBox_volumes.Controls.Add(this.trackBar_Bass);
+                       this.groupBox_volumes.Controls.Add(this.numericUpDown_Guitar);
+                       this.groupBox_volumes.Controls.Add(this.label7);
+                       this.groupBox_volumes.Controls.Add(this.trackBar_Guitar);
+                       this.groupBox_volumes.Controls.Add(this.numericUpDown_Drums);
+                       this.groupBox_volumes.Controls.Add(this.label6);
+                       this.groupBox_volumes.Controls.Add(this.trackBar_Drums);
+                       this.groupBox_volumes.Controls.Add(this.numericUpDown_SE);
+                       this.groupBox_volumes.Controls.Add(this.label5);
+                       this.groupBox_volumes.Controls.Add(this.trackBar_SE);
+                       this.groupBox_volumes.Controls.Add(this.numericUpDown_BGM);
+                       this.groupBox_volumes.Controls.Add(this.label4);
+                       this.groupBox_volumes.Controls.Add(this.trackBar_BGM);
+                       this.groupBox_volumes.Name = "groupBox_volumes";
+                       this.groupBox_volumes.TabStop = false;
                        // 
                        // checkBox_MonitorSound
                        // 
@@ -486,10 +501,91 @@
                        // 
                        // tabPage2
                        // 
+                       this.tabPage2.Controls.Add(this.groupBox_MP3);
+                       this.tabPage2.Controls.Add(this.groupBox_Ogg);
                        resources.ApplyResources(this.tabPage2, "tabPage2");
                        this.tabPage2.Name = "tabPage2";
                        this.tabPage2.UseVisualStyleBackColor = true;
                        // 
+                       // groupBox_MP3
+                       // 
+                       this.groupBox_MP3.Controls.Add(this.comboBox_MP3_bps);
+                       this.groupBox_MP3.Controls.Add(this.label11);
+                       resources.ApplyResources(this.groupBox_MP3, "groupBox_MP3");
+                       this.groupBox_MP3.Name = "groupBox_MP3";
+                       this.groupBox_MP3.TabStop = false;
+                       // 
+                       // label11
+                       // 
+                       resources.ApplyResources(this.label11, "label11");
+                       this.label11.Name = "label11";
+                       // 
+                       // groupBox_Ogg
+                       // 
+                       this.groupBox_Ogg.Controls.Add(this.numericUpDown_Ogg_Q);
+                       this.groupBox_Ogg.Controls.Add(this.label10);
+                       this.groupBox_Ogg.Controls.Add(this.trackBar_Ogg_Q);
+                       resources.ApplyResources(this.groupBox_Ogg, "groupBox_Ogg");
+                       this.groupBox_Ogg.Name = "groupBox_Ogg";
+                       this.groupBox_Ogg.TabStop = false;
+                       // 
+                       // numericUpDown_Ogg_Q
+                       // 
+                       this.numericUpDown_Ogg_Q.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bindingSource_Ogg_Q, "Value", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+                       resources.ApplyResources(this.numericUpDown_Ogg_Q, "numericUpDown_Ogg_Q");
+                       this.numericUpDown_Ogg_Q.Maximum = new decimal(new int[] {
+            10,
+            0,
+            0,
+            0});
+                       this.numericUpDown_Ogg_Q.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            -2147483648});
+                       this.numericUpDown_Ogg_Q.Name = "numericUpDown_Ogg_Q";
+                       this.numericUpDown_Ogg_Q.Value = new decimal(new int[] {
+            10,
+            0,
+            0,
+            0});
+                       // 
+                       // bindingSource_Ogg_Q
+                       // 
+                       this.bindingSource_Ogg_Q.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
+                       // 
+                       // label10
+                       // 
+                       resources.ApplyResources(this.label10, "label10");
+                       this.label10.Name = "label10";
+                       // 
+                       // trackBar_Ogg_Q
+                       // 
+                       resources.ApplyResources(this.trackBar_Ogg_Q, "trackBar_Ogg_Q");
+                       this.trackBar_Ogg_Q.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bindingSource_Ogg_Q, "Value", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+                       this.trackBar_Ogg_Q.LargeChange = 1;
+                       this.trackBar_Ogg_Q.Minimum = -1;
+                       this.trackBar_Ogg_Q.Name = "trackBar_Ogg_Q";
+                       this.trackBar_Ogg_Q.Value = 10;
+                       // 
+                       // comboBox_MP3_bps
+                       // 
+                       this.comboBox_MP3_bps.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+                       this.comboBox_MP3_bps.FormattingEnabled = true;
+                       this.comboBox_MP3_bps.Items.AddRange(new object[] {
+            resources.GetString("comboBox_MP3_bps.Items"),
+            resources.GetString("comboBox_MP3_bps.Items1"),
+            resources.GetString("comboBox_MP3_bps.Items2"),
+            resources.GetString("comboBox_MP3_bps.Items3"),
+            resources.GetString("comboBox_MP3_bps.Items4"),
+            resources.GetString("comboBox_MP3_bps.Items5"),
+            resources.GetString("comboBox_MP3_bps.Items6"),
+            resources.GetString("comboBox_MP3_bps.Items7"),
+            resources.GetString("comboBox_MP3_bps.Items8"),
+            resources.GetString("comboBox_MP3_bps.Items9")});
+                       resources.ApplyResources(this.comboBox_MP3_bps, "comboBox_MP3_bps");
+                       this.comboBox_MP3_bps.Name = "comboBox_MP3_bps";
+                       // 
                        // Main
                        // 
                        resources.ApplyResources(this, "$this");
@@ -503,12 +599,12 @@
                        this.Shown += new System.EventHandler(this.Main_Shown);
                        this.menuStrip1.ResumeLayout(false);
                        this.menuStrip1.PerformLayout();
-                       this.groupBox1.ResumeLayout(false);
-                       this.groupBox1.PerformLayout();
+                       this.groupBox_recfiles.ResumeLayout(false);
+                       this.groupBox_recfiles.PerformLayout();
                        this.tabControl1.ResumeLayout(false);
                        this.tabPage1.ResumeLayout(false);
-                       this.groupBox2.ResumeLayout(false);
-                       this.groupBox2.PerformLayout();
+                       this.groupBox_volumes.ResumeLayout(false);
+                       this.groupBox_volumes.PerformLayout();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Master)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Master)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_Master)).EndInit();
@@ -527,6 +623,14 @@
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_BGM)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.bindingSource_BGM)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_BGM)).EndInit();
+                       this.tabPage2.ResumeLayout(false);
+                       this.groupBox_MP3.ResumeLayout(false);
+                       this.groupBox_MP3.PerformLayout();
+                       this.groupBox_Ogg.ResumeLayout(false);
+                       this.groupBox_Ogg.PerformLayout();
+                       ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Ogg_Q)).EndInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Ogg_Q)).EndInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.trackBar_Ogg_Q)).EndInit();
                        this.ResumeLayout(false);
                        this.PerformLayout();
 
@@ -541,7 +645,7 @@
                private System.Windows.Forms.StatusStrip statusStrip1;
                private System.Windows.Forms.OpenFileDialog openFileDialog1;
                private System.Windows.Forms.Label label1;
-               private System.Windows.Forms.GroupBox groupBox1;
+               private System.Windows.Forms.GroupBox groupBox_recfiles;
                private System.Windows.Forms.ComboBox comboBox_AudioFormat;
                private System.Windows.Forms.Label label3;
                private System.Windows.Forms.Button button_BrowseAudio;
@@ -553,7 +657,7 @@
                private System.Windows.Forms.TabPage tabPage1;
                private System.Windows.Forms.TabPage tabPage2;
                private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
-               private System.Windows.Forms.GroupBox groupBox2;
+               private System.Windows.Forms.GroupBox groupBox_volumes;
                private System.Windows.Forms.CheckBox checkBox_MonitorSound;
                private System.Windows.Forms.NumericUpDown numericUpDown_Master;
                private System.Windows.Forms.Label label9;
@@ -583,6 +687,14 @@
                private System.Windows.Forms.BindingSource bindingSource_Guitar;
                private System.Windows.Forms.BindingSource bindingSource_Bass;
                private System.Windows.Forms.BindingSource bindingSource_Master;
+               private System.Windows.Forms.GroupBox groupBox_MP3;
+               private System.Windows.Forms.Label label11;
+               private System.Windows.Forms.GroupBox groupBox_Ogg;
+               private System.Windows.Forms.NumericUpDown numericUpDown_Ogg_Q;
+               private System.Windows.Forms.Label label10;
+               private System.Windows.Forms.TrackBar trackBar_Ogg_Q;
+               private System.Windows.Forms.BindingSource bindingSource_Ogg_Q;
+               private System.Windows.Forms.ComboBox comboBox_MP3_bps;
        }
 }
 

diff --git a/DTX2WAV/Form1.cs b/DTX2WAV/Form1.cs
index d245f8f..18e7d27 100644 (file)
--- a/DTX2WAV/Form1.cs
+++ b/DTX2WAV/Form1.cs
@@ -17,6 +17,7 @@ namespace DTX2WAV
        {
                Form_Recording formRecording;
                Process p_DTXMania = null;
+               bool bOpenedEncodingSettingTab = false;
 
                public Main()
                {
@@ -27,6 +28,7 @@ namespace DTX2WAV
                        bindingSource_Guitar.DataSource = new VolumeSlider();
                        bindingSource_Bass.DataSource = new VolumeSlider();
                        bindingSource_Master.DataSource = new VolumeSlider();
+                       bindingSource_Ogg_Q.DataSource = new VolumeSlider();
                }
 
                /// <summary>
@@ -66,14 +68,17 @@ namespace DTX2WAV
                        #endregion
 
                        #region [ 復元した設定値を、Formに反映する ]
-                       numericUpDown_BGM.Value    = Properties.Settings.Default.nVol_BGM;
-                       numericUpDown_SE.Value     = Properties.Settings.Default.nVol_SE;
-                       numericUpDown_Drums.Value  = Properties.Settings.Default.nVol_Drums;
-                       numericUpDown_Guitar.Value = Properties.Settings.Default.nVol_Guitar;
-                       numericUpDown_Bass.Value   = Properties.Settings.Default.nVol_Bass;
-                       numericUpDown_Master.Value = Properties.Settings.Default.nVol_Master;
-                       checkBox_MonitorSound.Checked = Properties.Settings.Default.bMonitorSound;
+                       numericUpDown_BGM.Value            = Properties.Settings.Default.nVol_BGM;
+                       numericUpDown_SE.Value             = Properties.Settings.Default.nVol_SE;
+                       numericUpDown_Drums.Value          = Properties.Settings.Default.nVol_Drums;
+                       numericUpDown_Guitar.Value         = Properties.Settings.Default.nVol_Guitar;
+                       numericUpDown_Bass.Value           = Properties.Settings.Default.nVol_Bass;
+                       numericUpDown_Master.Value         = Properties.Settings.Default.nVol_Master;
+                       checkBox_MonitorSound.Checked      = Properties.Settings.Default.bMonitorSound;
                        comboBox_AudioFormat.SelectedIndex = Properties.Settings.Default.nAudioFormat;
+
+                       numericUpDown_Ogg_Q.Value          = Properties.Settings.Default.nOgg_Q;        // この設定は後でもう一度実施する。tabControl1_SelectedIndexChanged()へ。
+                       comboBox_MP3_bps.SelectedIndex     = Properties.Settings.Default.nMP3_bps;
                        #endregion
                }
 
@@ -181,12 +186,40 @@ namespace DTX2WAV
 
                        //アプリ名と引数の情報を設定
                        p_DTXMania.StartInfo.FileName = "DTXManiaGR.exe";
-                       p_DTXMania.StartInfo.Arguments = $"-E{comboBox_AudioFormat.Text.ToUpper()},48000,192,";
+                       p_DTXMania.StartInfo.Arguments  = $"-E{comboBox_AudioFormat.Text.ToUpper()},";
+
+                       switch (comboBox_AudioFormat.Text.ToUpper())
+                       {
+                               case "WAV":
+                                       p_DTXMania.StartInfo.Arguments +=  "48000,192,";        // freqとbitrate、DTXMania側ではいずれも無視される
+                                       break;
+                               case "OGG":
+                                       p_DTXMania.StartInfo.Arguments += $"48000,{numericUpDown_Ogg_Q.Value},";
+                                       break;
+                               case "MP3":
+                                       p_DTXMania.StartInfo.Arguments += $"48000,{comboBox_MP3_bps.Text},";
+                                       break;
+                               default:
+                                       p_DTXMania.StartInfo.Arguments +=  "48000,192,";
+                                       break;
+                       }
+
                        p_DTXMania.StartInfo.Arguments += $"{numericUpDown_BGM.Value},{numericUpDown_SE.Value},{numericUpDown_Drums.Value},{numericUpDown_Guitar.Value},{numericUpDown_Bass.Value},{numericUpDown_Master.Value},";
                        p_DTXMania.StartInfo.Arguments += $"\"{textBox_BrowseAudio.Text}\",\"{textBox_BrowseDTX.Text}\"";
 
                        //起動する
-                       p_DTXMania.Start();
+                       try
+                       {
+                               p_DTXMania.Start();
+                       }
+                       catch (Exception)
+                       {
+                               MessageBox.Show("DTXMania本体の起動に失敗しました。録音できません。", "Failed launching DTXMania", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                               p_DTXMania.Close();
+                               p_DTXMania.Dispose();
+                               p_DTXMania = null;
+                               return;
+                       }
                        #endregion
 
                        //モーダルで変換中ダイアログを表示して、処理をいったん止める(キャンセル or 正常終了イベント待ち)
@@ -237,6 +270,7 @@ namespace DTX2WAV
 
                                }
                        }
+                       p_DTXMania.Close();
                        p_DTXMania.Dispose();
                        p_DTXMania = null;
                }
@@ -328,7 +362,9 @@ namespace DTX2WAV
                        Properties.Settings.Default.nVol_Bass     = (int)numericUpDown_Bass.Value;
                        Properties.Settings.Default.nVol_Master   = (int)numericUpDown_Master.Value;
                        Properties.Settings.Default.bMonitorSound = checkBox_MonitorSound.Checked;
-                       Properties.Settings.Default.nAudioFormat = comboBox_AudioFormat.SelectedIndex;
+                       Properties.Settings.Default.nAudioFormat  = comboBox_AudioFormat.SelectedIndex;
+                       Properties.Settings.Default.nOgg_Q        = (int)numericUpDown_Ogg_Q.Value;
+                       Properties.Settings.Default.nMP3_bps      = comboBox_MP3_bps.SelectedIndex;
                        #endregion
 
                        Properties.Settings.Default.Save();
@@ -358,6 +394,21 @@ namespace DTX2WAV
                        }
                        base.WndProc(ref m);
                }
+
+
+
+               private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
+               {
+                       // Encoding Settingsタブにある、numericUpDownかTrackbarの値は、
+                       // Form_Shown()で初期化した値が、
+                       // タブの初回オープン時にゼロクリアされてしまう模様。
+                       // そのため、この値だけは、タブの初回オープン時に初期化する。
+                       if (tabControl1.SelectedIndex == 1 && bOpenedEncodingSettingTab == false)
+                       {
+                               bOpenedEncodingSettingTab = true;
+                               numericUpDown_Ogg_Q.Value = Properties.Settings.Default.nOgg_Q;
+                       }
+               }
        }
        
 }

diff --git a/DTX2WAV/Form1.resx b/DTX2WAV/Form1.resx
index 606a821..807368e 100644 (file)
--- a/DTX2WAV/Form1.resx
+++ b/DTX2WAV/Form1.resx
@@ -118,14 +118,14 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>191, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="menuStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
   <data name="menuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>681, 24</value>
+    <value>655, 24</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="menuStrip1.TabIndex" type="System.Int32, mscorlib">
@@ -153,7 +153,7 @@
     <value>&amp;File</value>
   </data>
   <data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>93, 22</value>
+    <value>152, 22</value>
   </data>
   <data name="exitToolStripMenuItem.Text" xml:space="preserve">
     <value>E&amp;xit</value>
@@ -171,13 +171,13 @@
     <value>&amp;Help</value>
   </data>
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>132, 17</value>
+    <value>306, 17</value>
   </metadata>
   <data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 513</value>
+    <value>0, 497</value>
   </data>
   <data name="statusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>681, 22</value>
+    <value>655, 22</value>
   </data>
   <data name="statusStrip1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -198,7 +198,7 @@
     <value>1</value>
   </data>
   <metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>248, 17</value>
+    <value>422, 17</value>
   </metadata>
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -211,13 +211,13 @@
     <value>20, 26</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 12</value>
+    <value>142, 12</value>
   </data>
   <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
   <data name="label1.Text" xml:space="preserve">
-    <value>変換するDTXファイル(&amp;D)</value>
+    <value>録音元のDTXファイルパス(&amp;D)</value>
   </data>
   <data name="&gt;&gt;label1.Name" xml:space="preserve">
     <value>label1</value>
@@ -226,118 +226,13 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+    <value>groupBox_recfiles</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
     <value>7</value>
   </data>
-  <data name="&gt;&gt;comboBox_AudioFormat.Name" xml:space="preserve">
-    <value>comboBox_AudioFormat</value>
-  </data>
-  <data name="&gt;&gt;comboBox_AudioFormat.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;comboBox_AudioFormat.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;comboBox_AudioFormat.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;label3.Name" xml:space="preserve">
-    <value>label3</value>
-  </data>
-  <data name="&gt;&gt;label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;button_BrowseAudio.Name" xml:space="preserve">
-    <value>button_BrowseAudio</value>
-  </data>
-  <data name="&gt;&gt;button_BrowseAudio.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;button_BrowseAudio.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;button_BrowseAudio.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;textBox_BrowseAudio.Name" xml:space="preserve">
-    <value>textBox_BrowseAudio</value>
-  </data>
-  <data name="&gt;&gt;textBox_BrowseAudio.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;textBox_BrowseAudio.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;textBox_BrowseAudio.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;label2.Name" xml:space="preserve">
-    <value>label2</value>
-  </data>
-  <data name="&gt;&gt;label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;button_browseDTX.Name" xml:space="preserve">
-    <value>button_browseDTX</value>
-  </data>
-  <data name="&gt;&gt;button_browseDTX.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;button_browseDTX.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;button_browseDTX.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;textBox_BrowseDTX.Name" xml:space="preserve">
-    <value>textBox_BrowseDTX</value>
-  </data>
-  <data name="&gt;&gt;textBox_BrowseDTX.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;textBox_BrowseDTX.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;textBox_BrowseDTX.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 6</value>
-  </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>633, 138</value>
-  </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>変換ファイルの指定</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
-    <value>tabPage1</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>3</value>
+  <data name="groupBox_recfiles.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Left, Right</value>
   </data>
   <data name="comboBox_AudioFormat.Items" xml:space="preserve">
     <value>WAV</value>
@@ -355,7 +250,7 @@
     <value>121, 20</value>
   </data>
   <data name="comboBox_AudioFormat.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+    <value>5</value>
   </data>
   <data name="&gt;&gt;comboBox_AudioFormat.Name" xml:space="preserve">
     <value>comboBox_AudioFormat</value>
@@ -364,7 +259,7 @@
     <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;comboBox_AudioFormat.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+    <value>groupBox_recfiles</value>
   </data>
   <data name="&gt;&gt;comboBox_AudioFormat.ZOrder" xml:space="preserve">
     <value>0</value>
@@ -379,13 +274,13 @@
     <value>20, 103</value>
   </data>
   <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>134, 12</value>
+    <value>104, 12</value>
   </data>
   <data name="label3.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
   </data>
   <data name="label3.Text" xml:space="preserve">
-    <value>å\87ºå\8a\9bã\81\99ã\82\8bã\82ªã\83¼ã\83\87ã\82£ã\82ª形式(&amp;M)</value>
+    <value>å\87ºå\8a\9bã\83\95ã\82¡ã\82¤ã\83«形式(&amp;M)</value>
   </data>
   <data name="&gt;&gt;label3.Name" xml:space="preserve">
     <value>label3</value>
@@ -394,7 +289,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+    <value>groupBox_recfiles</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
     <value>1</value>
@@ -409,7 +304,7 @@
     <value>75, 23</value>
   </data>
   <data name="button_BrowseAudio.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
+    <value>4</value>
   </data>
   <data name="button_BrowseAudio.Text" xml:space="preserve">
     <value>参照</value>
@@ -421,7 +316,7 @@
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;button_BrowseAudio.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+    <value>groupBox_recfiles</value>
   </data>
   <data name="&gt;&gt;button_BrowseAudio.ZOrder" xml:space="preserve">
     <value>2</value>
@@ -433,7 +328,7 @@
     <value>342, 19</value>
   </data>
   <data name="textBox_BrowseAudio.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
+    <value>3</value>
   </data>
   <data name="&gt;&gt;textBox_BrowseAudio.Name" xml:space="preserve">
     <value>textBox_BrowseAudio</value>
@@ -442,7 +337,7 @@
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;textBox_BrowseAudio.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+    <value>groupBox_recfiles</value>
   </data>
   <data name="&gt;&gt;textBox_BrowseAudio.ZOrder" xml:space="preserve">
     <value>3</value>
@@ -463,7 +358,7 @@
     <value>6</value>
   </data>
   <data name="label2.Text" xml:space="preserve">
-    <value>å\87ºå\8a\9bã\81\99ã\82\8bã\82ªã\83¼ã\83\87ã\82£ã\82ªã\83\95ã\82¡ã\82¤ã\83«(&amp;A)</value>
+    <value>å\87ºå\8a\9bã\82ªã\83¼ã\83\87ã\82£ã\82ªã\83\95ã\82¡ã\82¤ã\83«ã\83\91ã\82¹(&amp;A)</value>
   </data>
   <data name="&gt;&gt;label2.Name" xml:space="preserve">
     <value>label2</value>
@@ -472,7 +367,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label2.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+    <value>groupBox_recfiles</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
     <value>4</value>
@@ -487,7 +382,7 @@
     <value>75, 23</value>
   </data>
   <data name="button_browseDTX.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+    <value>2</value>
   </data>
   <data name="button_browseDTX.Text" xml:space="preserve">
     <value>参照</value>
@@ -499,7 +394,7 @@
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;button_browseDTX.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+    <value>groupBox_recfiles</value>
   </data>
   <data name="&gt;&gt;button_browseDTX.ZOrder" xml:space="preserve">
     <value>5</value>
@@ -511,7 +406,7 @@
     <value>342, 19</value>
   </data>
   <data name="textBox_BrowseDTX.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;textBox_BrowseDTX.Name" xml:space="preserve">
     <value>textBox_BrowseDTX</value>
@@ -520,11 +415,38 @@
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;textBox_BrowseDTX.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+    <value>groupBox_recfiles</value>
   </data>
   <data name="&gt;&gt;textBox_BrowseDTX.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
+  <data name="groupBox_recfiles.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 6</value>
+  </data>
+  <data name="groupBox_recfiles.Size" type="System.Drawing.Size, System.Drawing">
+    <value>633, 138</value>
+  </data>
+  <data name="groupBox_recfiles.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="groupBox_recfiles.Text" xml:space="preserve">
+    <value>録音ファイルの指定</value>
+  </data>
+  <data name="&gt;&gt;groupBox_recfiles.Name" xml:space="preserve">
+    <value>groupBox_recfiles</value>
+  </data>
+  <data name="&gt;&gt;groupBox_recfiles.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBox_recfiles.Parent" xml:space="preserve">
+    <value>tabPage1</value>
+  </data>
+  <data name="&gt;&gt;groupBox_recfiles.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="button_Cancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
   <data name="button_Cancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
@@ -535,10 +457,10 @@
     <value>75, 23</value>
   </data>
   <data name="button_Cancel.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>0</value>
   </data>
   <data name="button_Cancel.Text" xml:space="preserve">
-    <value>Cancel</value>
+    <value>終了</value>
   </data>
   <data name="&gt;&gt;button_Cancel.Name" xml:space="preserve">
     <value>button_Cancel</value>
@@ -552,6 +474,9 @@
   <data name="&gt;&gt;button_Cancel.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="button_Convert.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
   <data name="button_Convert.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
@@ -562,7 +487,7 @@
     <value>75, 23</value>
   </data>
   <data name="button_Convert.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>3</value>
   </data>
   <data name="button_Convert.Text" xml:space="preserve">
     <value>録音</value>
@@ -579,6 +504,9 @@
   <data name="&gt;&gt;button_Convert.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="groupBox_volumes.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Left, Right</value>
+  </data>
   <data name="checkBox_MonitorSound.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -607,13 +535,13 @@
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;checkBox_MonitorSound.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;checkBox_MonitorSound.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <metadata name="bindingSource_Master.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>177, 56</value>
+    <value>346, 56</value>
   </metadata>
   <data name="numericUpDown_Master.Location" type="System.Drawing.Point, System.Drawing">
     <value>525, 186</value>
@@ -622,7 +550,7 @@
     <value>75, 19</value>
   </data>
   <data name="numericUpDown_Master.TabIndex" type="System.Int32, mscorlib">
-    <value>17</value>
+    <value>12</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Master.Name" xml:space="preserve">
     <value>numericUpDown_Master</value>
@@ -631,7 +559,7 @@
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Master.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Master.ZOrder" xml:space="preserve">
     <value>1</value>
@@ -661,14 +589,11 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label9.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;label9.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <metadata name="bindingSource_Master.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>177, 56</value>
-  </metadata>
   <data name="trackBar_Master.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
@@ -682,7 +607,7 @@
     <value>330, 22</value>
   </data>
   <data name="trackBar_Master.TabIndex" type="System.Int32, mscorlib">
-    <value>15</value>
+    <value>11</value>
   </data>
   <data name="&gt;&gt;trackBar_Master.Name" xml:space="preserve">
     <value>trackBar_Master</value>
@@ -691,13 +616,13 @@
     <value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;trackBar_Master.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;trackBar_Master.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
   <metadata name="bindingSource_Bass.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+    <value>186, 56</value>
   </metadata>
   <data name="numericUpDown_Bass.Location" type="System.Drawing.Point, System.Drawing">
     <value>525, 133</value>
@@ -706,7 +631,7 @@
     <value>75, 19</value>
   </data>
   <data name="numericUpDown_Bass.TabIndex" type="System.Int32, mscorlib">
-    <value>14</value>
+    <value>10</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Bass.Name" xml:space="preserve">
     <value>numericUpDown_Bass</value>
@@ -715,7 +640,7 @@
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Bass.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Bass.ZOrder" xml:space="preserve">
     <value>4</value>
@@ -745,7 +670,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label8.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
     <value>5</value>
@@ -763,7 +688,7 @@
     <value>330, 22</value>
   </data>
   <data name="trackBar_Bass.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
+    <value>9</value>
   </data>
   <data name="&gt;&gt;trackBar_Bass.Name" xml:space="preserve">
     <value>trackBar_Bass</value>
@@ -772,13 +697,13 @@
     <value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;trackBar_Bass.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;trackBar_Bass.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
   <metadata name="bindingSource_Guitar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1069, 17</value>
+    <value>17, 56</value>
   </metadata>
   <data name="numericUpDown_Guitar.Location" type="System.Drawing.Point, System.Drawing">
     <value>525, 105</value>
@@ -787,7 +712,7 @@
     <value>75, 19</value>
   </data>
   <data name="numericUpDown_Guitar.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+    <value>8</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Guitar.Name" xml:space="preserve">
     <value>numericUpDown_Guitar</value>
@@ -796,7 +721,7 @@
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Guitar.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Guitar.ZOrder" xml:space="preserve">
     <value>7</value>
@@ -826,7 +751,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label7.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
     <value>8</value>
@@ -844,7 +769,7 @@
     <value>330, 22</value>
   </data>
   <data name="trackBar_Guitar.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
+    <value>7</value>
   </data>
   <data name="&gt;&gt;trackBar_Guitar.Name" xml:space="preserve">
     <value>trackBar_Guitar</value>
@@ -853,13 +778,13 @@
     <value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;trackBar_Guitar.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;trackBar_Guitar.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
   <metadata name="bindingSource_Drums.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>932, 17</value>
+    <value>1106, 17</value>
   </metadata>
   <data name="numericUpDown_Drums.Location" type="System.Drawing.Point, System.Drawing">
     <value>525, 77</value>
@@ -868,7 +793,7 @@
     <value>75, 19</value>
   </data>
   <data name="numericUpDown_Drums.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+    <value>6</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Drums.Name" xml:space="preserve">
     <value>numericUpDown_Drums</value>
@@ -877,7 +802,7 @@
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Drums.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Drums.ZOrder" xml:space="preserve">
     <value>10</value>
@@ -907,7 +832,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label6.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
     <value>11</value>
@@ -925,7 +850,7 @@
     <value>330, 22</value>
   </data>
   <data name="trackBar_Drums.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>5</value>
   </data>
   <data name="&gt;&gt;trackBar_Drums.Name" xml:space="preserve">
     <value>trackBar_Drums</value>
@@ -934,13 +859,13 @@
     <value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;trackBar_Drums.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;trackBar_Drums.ZOrder" xml:space="preserve">
     <value>12</value>
   </data>
   <metadata name="bindingSource_SE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>783, 17</value>
+    <value>957, 17</value>
   </metadata>
   <data name="numericUpDown_SE.Location" type="System.Drawing.Point, System.Drawing">
     <value>525, 49</value>
@@ -949,7 +874,7 @@
     <value>75, 19</value>
   </data>
   <data name="numericUpDown_SE.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>4</value>
   </data>
   <data name="&gt;&gt;numericUpDown_SE.Name" xml:space="preserve">
     <value>numericUpDown_SE</value>
@@ -958,7 +883,7 @@
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;numericUpDown_SE.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;numericUpDown_SE.ZOrder" xml:space="preserve">
     <value>13</value>
@@ -988,7 +913,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label5.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
     <value>14</value>
@@ -1015,13 +940,13 @@
     <value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;trackBar_SE.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;trackBar_SE.ZOrder" xml:space="preserve">
     <value>15</value>
   </data>
   <metadata name="bindingSource_BGM.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>621, 17</value>
+    <value>795, 17</value>
   </metadata>
   <data name="numericUpDown_BGM.Location" type="System.Drawing.Point, System.Drawing">
     <value>525, 21</value>
@@ -1039,7 +964,7 @@
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;numericUpDown_BGM.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;numericUpDown_BGM.ZOrder" xml:space="preserve">
     <value>16</value>
@@ -1069,7 +994,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label4.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
     <value>17</value>
@@ -1087,7 +1012,7 @@
     <value>330, 22</value>
   </data>
   <data name="trackBar_BGM.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;trackBar_BGM.Name" xml:space="preserve">
     <value>trackBar_BGM</value>
@@ -1096,33 +1021,33 @@
     <value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;trackBar_BGM.Parent" xml:space="preserve">
-    <value>groupBox2</value>
+    <value>groupBox_volumes</value>
   </data>
   <data name="&gt;&gt;trackBar_BGM.ZOrder" xml:space="preserve">
     <value>18</value>
   </data>
-  <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="groupBox_volumes.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 150</value>
   </data>
-  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="groupBox_volumes.Size" type="System.Drawing.Size, System.Drawing">
     <value>633, 254</value>
   </data>
-  <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+  <data name="groupBox_volumes.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
   </data>
-  <data name="groupBox2.Text" xml:space="preserve">
+  <data name="groupBox_volumes.Text" xml:space="preserve">
     <value>Volume設定</value>
   </data>
-  <data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
-    <value>groupBox2</value>
+  <data name="&gt;&gt;groupBox_volumes.Name" xml:space="preserve">
+    <value>groupBox_volumes</value>
   </data>
-  <data name="&gt;&gt;groupBox2.Type" xml:space="preserve">
+  <data name="&gt;&gt;groupBox_volumes.Type" xml:space="preserve">
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;groupBox2.Parent" xml:space="preserve">
+  <data name="&gt;&gt;groupBox_volumes.Parent" xml:space="preserve">
     <value>tabPage1</value>
   </data>
-  <data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;groupBox_volumes.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
   <data name="tabPage1.Location" type="System.Drawing.Point, System.Drawing">
@@ -1132,7 +1057,7 @@
     <value>3, 3, 3, 3</value>
   </data>
   <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>656, 448</value>
+    <value>647, 447</value>
   </data>
   <data name="tabPage1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1152,6 +1077,30 @@
   <data name="&gt;&gt;tabPage1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="&gt;&gt;groupBox_MP3.Name" xml:space="preserve">
+    <value>groupBox_MP3</value>
+  </data>
+  <data name="&gt;&gt;groupBox_MP3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBox_MP3.Parent" xml:space="preserve">
+    <value>tabPage2</value>
+  </data>
+  <data name="&gt;&gt;groupBox_MP3.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;groupBox_Ogg.Name" xml:space="preserve">
+    <value>groupBox_Ogg</value>
+  </data>
+  <data name="&gt;&gt;groupBox_Ogg.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBox_Ogg.Parent" xml:space="preserve">
+    <value>tabPage2</value>
+  </data>
+  <data name="&gt;&gt;groupBox_Ogg.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="tabPage2.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>
   </data>
@@ -1159,13 +1108,13 @@
     <value>3, 3, 3, 3</value>
   </data>
   <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>656, 448</value>
+    <value>647, 447</value>
   </data>
   <data name="tabPage2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
   <data name="tabPage2.Text" xml:space="preserve">
-    <value>Encoding</value>
+    <value>Encoder Settings</value>
   </data>
   <data name="&gt;&gt;tabPage2.Name" xml:space="preserve">
     <value>tabPage2</value>
@@ -1179,14 +1128,17 @@
   <data name="&gt;&gt;tabPage2.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="tabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
   <data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 27</value>
+    <value>0, 24</value>
   </data>
   <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>664, 474</value>
+    <value>655, 473</value>
   </data>
   <data name="tabControl1.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+    <value>0</value>
   </data>
   <data name="&gt;&gt;tabControl1.Name" xml:space="preserve">
     <value>tabControl1</value>
@@ -1200,27 +1152,279 @@
   <data name="&gt;&gt;tabControl1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <metadata name="bindingSource_Bass.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
-  </metadata>
-  <metadata name="bindingSource_Guitar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1069, 17</value>
-  </metadata>
-  <metadata name="bindingSource_Drums.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>932, 17</value>
-  </metadata>
-  <metadata name="bindingSource_SE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>783, 17</value>
+  <data name="&gt;&gt;comboBox_MP3_bps.Name" xml:space="preserve">
+    <value>comboBox_MP3_bps</value>
+  </data>
+  <data name="&gt;&gt;comboBox_MP3_bps.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;comboBox_MP3_bps.Parent" xml:space="preserve">
+    <value>groupBox_MP3</value>
+  </data>
+  <data name="&gt;&gt;comboBox_MP3_bps.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;label11.Name" xml:space="preserve">
+    <value>label11</value>
+  </data>
+  <data name="&gt;&gt;label11.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label11.Parent" xml:space="preserve">
+    <value>groupBox_MP3</value>
+  </data>
+  <data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="groupBox_MP3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 79</value>
+  </data>
+  <data name="groupBox_MP3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>644, 78</value>
+  </data>
+  <data name="groupBox_MP3.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="groupBox_MP3.Text" xml:space="preserve">
+    <value>MP3</value>
+  </data>
+  <data name="&gt;&gt;groupBox_MP3.Name" xml:space="preserve">
+    <value>groupBox_MP3</value>
+  </data>
+  <data name="&gt;&gt;groupBox_MP3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBox_MP3.Parent" xml:space="preserve">
+    <value>tabPage2</value>
+  </data>
+  <data name="&gt;&gt;groupBox_MP3.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="label11.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label11.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
+    <value>18, 27</value>
+  </data>
+  <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
+    <value>42, 12</value>
+  </data>
+  <data name="label11.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="label11.Text" xml:space="preserve">
+    <value>Bitrate:</value>
+  </data>
+  <data name="&gt;&gt;label11.Name" xml:space="preserve">
+    <value>label11</value>
+  </data>
+  <data name="&gt;&gt;label11.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label11.Parent" xml:space="preserve">
+    <value>groupBox_MP3</value>
+  </data>
+  <data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;numericUpDown_Ogg_Q.Name" xml:space="preserve">
+    <value>numericUpDown_Ogg_Q</value>
+  </data>
+  <data name="&gt;&gt;numericUpDown_Ogg_Q.Type" xml:space="preserve">
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;numericUpDown_Ogg_Q.Parent" xml:space="preserve">
+    <value>groupBox_Ogg</value>
+  </data>
+  <data name="&gt;&gt;numericUpDown_Ogg_Q.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;label10.Name" xml:space="preserve">
+    <value>label10</value>
+  </data>
+  <data name="&gt;&gt;label10.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label10.Parent" xml:space="preserve">
+    <value>groupBox_Ogg</value>
+  </data>
+  <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;trackBar_Ogg_Q.Name" xml:space="preserve">
+    <value>trackBar_Ogg_Q</value>
+  </data>
+  <data name="&gt;&gt;trackBar_Ogg_Q.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;trackBar_Ogg_Q.Parent" xml:space="preserve">
+    <value>groupBox_Ogg</value>
+  </data>
+  <data name="&gt;&gt;trackBar_Ogg_Q.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="groupBox_Ogg.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 6</value>
+  </data>
+  <data name="groupBox_Ogg.Size" type="System.Drawing.Size, System.Drawing">
+    <value>644, 67</value>
+  </data>
+  <data name="groupBox_Ogg.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="groupBox_Ogg.Text" xml:space="preserve">
+    <value>Ogg</value>
+  </data>
+  <data name="&gt;&gt;groupBox_Ogg.Name" xml:space="preserve">
+    <value>groupBox_Ogg</value>
+  </data>
+  <data name="&gt;&gt;groupBox_Ogg.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBox_Ogg.Parent" xml:space="preserve">
+    <value>tabPage2</value>
+  </data>
+  <data name="&gt;&gt;groupBox_Ogg.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <metadata name="bindingSource_Ogg_Q.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
   </metadata>
-  <metadata name="bindingSource_BGM.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>621, 17</value>
+  <data name="numericUpDown_Ogg_Q.Location" type="System.Drawing.Point, System.Drawing">
+    <value>561, 25</value>
+  </data>
+  <data name="numericUpDown_Ogg_Q.Size" type="System.Drawing.Size, System.Drawing">
+    <value>57, 19</value>
+  </data>
+  <data name="numericUpDown_Ogg_Q.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;numericUpDown_Ogg_Q.Name" xml:space="preserve">
+    <value>numericUpDown_Ogg_Q</value>
+  </data>
+  <data name="&gt;&gt;numericUpDown_Ogg_Q.Type" xml:space="preserve">
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;numericUpDown_Ogg_Q.Parent" xml:space="preserve">
+    <value>groupBox_Ogg</value>
+  </data>
+  <data name="&gt;&gt;numericUpDown_Ogg_Q.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="bindingSource_Ogg_Q.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
   </metadata>
+  <data name="label10.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label10.Location" type="System.Drawing.Point, System.Drawing">
+    <value>18, 25</value>
+  </data>
+  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label10.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="label10.Text" xml:space="preserve">
+    <value>Quality Setting:</value>
+  </data>
+  <data name="&gt;&gt;label10.Name" xml:space="preserve">
+    <value>label10</value>
+  </data>
+  <data name="&gt;&gt;label10.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label10.Parent" xml:space="preserve">
+    <value>groupBox_Ogg</value>
+  </data>
+  <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="trackBar_Ogg_Q.AutoSize" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="trackBar_Ogg_Q.Location" type="System.Drawing.Point, System.Drawing">
+    <value>117, 18</value>
+  </data>
+  <data name="trackBar_Ogg_Q.Size" type="System.Drawing.Size, System.Drawing">
+    <value>426, 26</value>
+  </data>
+  <data name="trackBar_Ogg_Q.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;trackBar_Ogg_Q.Name" xml:space="preserve">
+    <value>trackBar_Ogg_Q</value>
+  </data>
+  <data name="&gt;&gt;trackBar_Ogg_Q.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;trackBar_Ogg_Q.Parent" xml:space="preserve">
+    <value>groupBox_Ogg</value>
+  </data>
+  <data name="&gt;&gt;trackBar_Ogg_Q.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
   <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>388, 17</value>
+    <value>562, 17</value>
   </metadata>
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>524, 17</value>
+    <value>698, 17</value>
   </metadata>
+  <data name="comboBox_MP3_bps.Items" xml:space="preserve">
+    <value>64</value>
+  </data>
+  <data name="comboBox_MP3_bps.Items1" xml:space="preserve">
+    <value>80</value>
+  </data>
+  <data name="comboBox_MP3_bps.Items2" xml:space="preserve">
+    <value>96</value>
+  </data>
+  <data name="comboBox_MP3_bps.Items3" xml:space="preserve">
+    <value>112</value>
+  </data>
+  <data name="comboBox_MP3_bps.Items4" xml:space="preserve">
+    <value>128</value>
+  </data>
+  <data name="comboBox_MP3_bps.Items5" xml:space="preserve">
+    <value>160</value>
+  </data>
+  <data name="comboBox_MP3_bps.Items6" xml:space="preserve">
+    <value>192</value>
+  </data>
+  <data name="comboBox_MP3_bps.Items7" xml:space="preserve">
+    <value>224</value>
+  </data>
+  <data name="comboBox_MP3_bps.Items8" xml:space="preserve">
+    <value>256</value>
+  </data>
+  <data name="comboBox_MP3_bps.Items9" xml:space="preserve">
+    <value>320</value>
+  </data>
+  <data name="comboBox_MP3_bps.Location" type="System.Drawing.Point, System.Drawing">
+    <value>117, 24</value>
+  </data>
+  <data name="comboBox_MP3_bps.Size" type="System.Drawing.Size, System.Drawing">
+    <value>121, 20</value>
+  </data>
+  <data name="comboBox_MP3_bps.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;comboBox_MP3_bps.Name" xml:space="preserve">
+    <value>comboBox_MP3_bps</value>
+  </data>
+  <data name="&gt;&gt;comboBox_MP3_bps.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;comboBox_MP3_bps.Parent" xml:space="preserve">
+    <value>groupBox_MP3</value>
+  </data>
+  <data name="&gt;&gt;comboBox_MP3_bps.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -1228,7 +1432,7 @@
     <value>6, 12</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>681, 535</value>
+    <value>655, 519</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>DTX2WAV</value>
@@ -1299,6 +1503,12 @@
   <data name="&gt;&gt;bindingSource_BGM.Type" xml:space="preserve">
     <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;bindingSource_Ogg_Q.Name" xml:space="preserve">
+    <value>bindingSource_Ogg_Q</value>
+  </data>
+  <data name="&gt;&gt;bindingSource_Ogg_Q.Type" xml:space="preserve">
+    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;saveFileDialog1.Name" xml:space="preserve">
     <value>saveFileDialog1</value>
   </data>

diff --git a/DTX2WAV/Form_Recording.resx b/DTX2WAV/Form_Recording.resx
index 242104f..7d979ee 100644 (file)
--- a/DTX2WAV/Form_Recording.resx
+++ b/DTX2WAV/Form_Recording.resx
@@ -198,13 +198,13 @@
     <value>108, 57</value>
   </data>
   <data name="label_boot.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 12</value>
+    <value>160, 12</value>
   </data>
   <data name="label_boot.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
   <data name="label_boot.Text" xml:space="preserve">
-    <value>DTXManiaの起動</value>
+    <value>DTXManiaのバックグラウンド起動</value>
   </data>
   <data name="&gt;&gt;label_boot.Name" xml:space="preserve">
     <value>label_boot</value>
@@ -487,7 +487,7 @@
     <value>CenterParent</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>DTX2WAV [Recording...]</value>
+    <value>DTX2WAV [録音中...]</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>Form_Recording</value>

diff --git a/DTX2WAV/Properties/AssemblyInfo.cs b/DTX2WAV/Properties/AssemblyInfo.cs
index e851d6a..2783dfc 100644 (file)
--- a/DTX2WAV/Properties/AssemblyInfo.cs
+++ b/DTX2WAV/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
+[assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.0.0.0")]

diff --git a/DTX2WAV/Properties/Settings.Designer.cs b/DTX2WAV/Properties/Settings.Designer.cs
index 6548bfb..8696ae4 100644 (file)
--- a/DTX2WAV/Properties/Settings.Designer.cs
+++ b/DTX2WAV/Properties/Settings.Designer.cs
@@ -97,7 +97,7 @@ namespace DTX2WAV.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        [global::System.Configuration.DefaultSettingValueAttribute("100")]
         public int nVol_Master {
             get {
                 return ((int)(this["nVol_Master"]));
@@ -142,5 +142,29 @@ namespace DTX2WAV.Properties {
                 this["nAudioFormat"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("10")]
+        public int nOgg_Q {
+            get {
+                return ((int)(this["nOgg_Q"]));
+            }
+            set {
+                this["nOgg_Q"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("4")]
+        public int nMP3_bps {
+            get {
+                return ((int)(this["nMP3_bps"]));
+            }
+            set {
+                this["nMP3_bps"] = value;
+            }
+        }
     }
 }

diff --git a/DTX2WAV/Properties/Settings.settings b/DTX2WAV/Properties/Settings.settings
index 9ab513b..4dc4316 100644 (file)
--- a/DTX2WAV/Properties/Settings.settings
+++ b/DTX2WAV/Properties/Settings.settings
@@ -21,7 +21,7 @@
       <Value Profile="(Default)">100</Value>
     </Setting>
     <Setting Name="nVol_Master" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">0</Value>
+      <Value Profile="(Default)">100</Value>
     </Setting>
     <Setting Name="bMonitorSound" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
@@ -32,5 +32,11 @@
     <Setting Name="nAudioFormat" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>
+    <Setting Name="nOgg_Q" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">10</Value>
+    </Setting>
+    <Setting Name="nMP3_bps" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">4</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file

diff --git a/DTXMania/コード/ステージ/04.コンフィグ/CActConfigList.cs b/DTXMania/コード/ステージ/04.コンフィグ/CActConfigList.cs
index ec3536d..64ef6dc 100644 (file)
--- a/DTXMania/コード/ステージ/04.コンフィグ/CActConfigList.cs
+++ b/DTXMania/コード/ステージ/04.コンフィグ/CActConfigList.cs
@@ -6,6 +6,7 @@ using System.Drawing;
 using System.Threading;
 using SharpDX;
 using FDK;
+using System.IO;
 
 using Color = System.Drawing.Color;
 using Point = System.Drawing.Point;
@@ -622,7 +623,11 @@ namespace DTXMania
                        {
                                this.list項目リスト = new List<COptionBase>();
                                this.eメニュー種別 = Eメニュー種別.Unknown;
-                               this.prvFont = new CPrivateFastFont(CSkin.Path(@"Graphics\fonts\mplus-1p-heavy.ttf"), (int)(18 * Scale.Y));
+
+                               CResources cr = CDTXMania.Instance.Resources;
+                               string fontname = cr.Explanation("strCfgConfigurationFontFileName");
+                               string path = Path.Combine(@"Graphics\fonts", fontname);
+                               this.prvFont = new CPrivateFastFont(CSkin.Path(path), (int)(18 * Scale.Y));
                                this.b要素値にフォーカス中 = false;
                                this.n目標のスクロールカウンタ = 0;
                                this.n現在のスクロールカウンタ = 0;
@@ -635,7 +640,7 @@ namespace DTXMania
                                EDrumsMenu = new STDGBSValue<COptionLabel>();
                                ReturnToMenu = new STDGBSValue<COptionLabel>();
 
-                               CResources cr = CDTXMania.Instance.Resources;
+                               //CResources cr = CDTXMania.Instance.Resources;
                                for ( EPart i = EPart.Drums; i <= EPart.System; ++i )
                                {
                                        DisplayMenu[i] = new COptionLabel( "strCfgDisplayOption" );

diff --git a/DTXMania/コード/全体/CDTXMania.cs b/DTXMania/コード/全体/CDTXMania.cs
index 7690602..da4d047 100644 (file)
--- a/DTXMania/コード/全体/CDTXMania.cs
+++ b/DTXMania/コード/全体/CDTXMania.cs
@@ -363,6 +363,7 @@ namespace DTXMania
                                        FDK.CSound管理.strRecordInputDTXfilename = DTX2WAVmode.dtxfilename;
                                        FDK.CSound管理.strRecordOutFilename = DTX2WAVmode.outfilename;
                                        FDK.CSound管理.strRecordFileType = DTX2WAVmode.Format.ToString();
+                                       FDK.CSound管理.nBitrate = DTX2WAVmode.bitrate;
                                        for (int i = 0; i < (int)FDK.CSound.EInstType.Unknown; i++)
                                        {
                                                FDK.CSound管理.nMixerVolume[ i ] = DTX2WAVmode.nMixerVolume[ i ];
@@ -381,19 +382,19 @@ namespace DTXMania
                                        // エンコーダーのパス設定 (=DLLフォルダ)
                                        FDK.CSound管理.strEncoderPath = Path.Combine(strEXEのあるフォルダ, "DLL");
 
-                                       CDTXMania.Instance.ConfigIni.nSoundDeviceType.Value = ESoundDeviceTypeForConfig.WASAPI_Exclusive;
-                                       CDTXMania.Instance.ConfigIni.bEventDrivenWASAPI.Value = false;
+                                       CDTXMania.instance.ConfigIni.nSoundDeviceType.Value = ESoundDeviceTypeForConfig.WASAPI_Exclusive;
+                                       CDTXMania.instance.ConfigIni.bEventDrivenWASAPI.Value = false;
 
-                                       CDTXMania.Instance.ConfigIni.bVSyncWait.Value = false;
-                                       CDTXMania.Instance.ConfigIni.bTimeStretch.Value = false;
-                                       CDTXMania.Instance.ConfigIni.eActiveInst.Value = EActiveInstrument.Both;
+                                       CDTXMania.instance.ConfigIni.bVSyncWait.Value = false;
+                                       CDTXMania.instance.ConfigIni.bTimeStretch.Value = false;
+                                       CDTXMania.instance.ConfigIni.eActiveInst.Value = EActiveInstrument.Both;
 
-                                       CDTXMania.Instance.ConfigIni.bFullScreen.Value = false;
-                                       CDTXMania.Instance.ConfigIni.rcWindow_backup = CDTXMania.Instance.ConfigIni.rcWindow;
-                                       CDTXMania.Instance.ConfigIni.rcWindow.W = CDTXMania.Instance.ConfigIni.rcViewerWindow.W;
-                                       CDTXMania.Instance.ConfigIni.rcWindow.H = CDTXMania.Instance.ConfigIni.rcViewerWindow.H;
-                                       CDTXMania.Instance.ConfigIni.rcWindow.X = CDTXMania.Instance.ConfigIni.rcViewerWindow.X;
-                                       CDTXMania.Instance.ConfigIni.rcWindow.Y = CDTXMania.Instance.ConfigIni.rcViewerWindow.Y;
+                                       CDTXMania.instance.ConfigIni.bFullScreen.Value = false;
+                                       CDTXMania.instance.ConfigIni.rcWindow_backup = CDTXMania.Instance.ConfigIni.rcWindow;
+                                       CDTXMania.instance.ConfigIni.rcWindow.W = CDTXMania.Instance.ConfigIni.rcViewerWindow.W;
+                                       CDTXMania.instance.ConfigIni.rcWindow.H = CDTXMania.Instance.ConfigIni.rcViewerWindow.H;
+                                       CDTXMania.instance.ConfigIni.rcWindow.X = CDTXMania.Instance.ConfigIni.rcViewerWindow.X;
+                                       CDTXMania.instance.ConfigIni.rcWindow.Y = CDTXMania.Instance.ConfigIni.rcViewerWindow.Y;
 
                                        //全オート
                                        CDTXMania.instance.ConfigIni.bAutoPlay.LC.Value = true;
@@ -479,9 +480,9 @@ namespace DTXMania
                                        CDTXMania.instance.ConfigIni.bDrumsHitSound.Value = true;
 
                                        //パート強調オフ
-                                       CDTXMania.Instance.ConfigIni.bEmphasizePlaySound.Drums.Value = false;
-                                       CDTXMania.Instance.ConfigIni.bEmphasizePlaySound.Guitar.Value = false;
-                                       CDTXMania.Instance.ConfigIni.bEmphasizePlaySound.Bass.Value = false;
+                                       CDTXMania.instance.ConfigIni.bEmphasizePlaySound.Drums.Value = false;
+                                       CDTXMania.instance.ConfigIni.bEmphasizePlaySound.Guitar.Value = false;
+                                       CDTXMania.instance.ConfigIni.bEmphasizePlaySound.Bass.Value = false;
 
                                        // パッド入力等、基本操作の無効化 (ESCを除く)
                                        //CDTXMania.Instance.ConfigIni.KeyAssign[][];

diff --git a/FDK/コード/03.サウンド/CSound.cs b/FDK/コード/03.サウンド/CSound.cs
index 7ad1234..5e14b27 100644 (file)
--- a/FDK/コード/03.サウンド/CSound.cs
+++ b/FDK/コード/03.サウンド/CSound.cs
@@ -216,6 +216,17 @@ namespace FDK
                /// </summary>
                public static string strEncoderPath;
 
+               /// <summary>
+               /// 録音機能で使う、サンプリング周波数
+               /// </summary>
+               public static int nFreq;
+
+               /// <summary>
+               /// 録音機能で使う、ビットレート(OGG時は、Q値(-1～10)
+               /// </summary>
+               public static int nBitrate;
+
+
                #endregion
 
 

diff --git a/FDK/コード/03.サウンド/CSoundDeviceWASAPI.cs b/FDK/コード/03.サウンド/CSoundDeviceWASAPI.cs
index cdb55aa..362158b 100644 (file)
--- a/FDK/コード/03.サウンド/CSoundDeviceWASAPI.cs
+++ b/FDK/コード/03.サウンド/CSoundDeviceWASAPI.cs
@@ -458,13 +458,7 @@ Trace.TraceInformation("WASAPI Device #{0}: {1}: IsDefault={2}, defPeriod={3}s,
                                this.bIsBASSFree = true;
                                throw new Exception( string.Format( "BASSミキサ(mixing)の作成に失敗しました。[{0}]", errcode ) );
                        }
-//                     if (strRecordFileType != "")
-//                     {
-//                             // DTX2WAV時には、マスターボリュームをここで設定する
-//                             // 
-//                             Bass.BASS_ChannelSetAttribute(this.hMixer, BASSAttribute.BASS_ATTRIB_VOL, CSound管理.nMixerVolume[5] / 100.0f);
-//Trace.TraceInformation("Vol5: {0}", CSound管理.nMixerVolume[5]);
-//                     }
+
 
                        for (int i = 0; i <= (int)CSound.EInstType.Unknown; i++)
                        {
@@ -548,7 +542,7 @@ Trace.TraceInformation("WASAPI Device #{0}: {1}: IsDefault={2}, defPeriod={3}s,
                                                        var e = new EncoderOGG(this.hMixer_DeviceOut);
                                                        e.EncoderDirectory = strEncoderPath;
                                                        e.OGG_UseQualityMode = true;
-                                                       e.OGG_Quality = 8.0f;
+                                                       e.OGG_Quality = (float)CSound管理.nBitrate;
                                                        //e.OGG_Bitrate = 128;
                                                        //e.OGG_MinBitrate = 0;
                                                        //e.OGG_MaxBitrate = 0;
@@ -561,7 +555,7 @@ Trace.TraceInformation("WASAPI Device #{0}: {1}: IsDefault={2}, defPeriod={3}s,
                                                        var e = new EncoderLAME(this.hMixer_DeviceOut);
                                                        e.EncoderDirectory = strEncoderPath;
                                                        e.LAME_UseVBR = false;
-                                                       e.LAME_Bitrate = 192;
+                                                       e.LAME_Bitrate = CSound管理.nBitrate;
                                                        encoder = e;
                                                }
                                                break;