OSDN Git Service

#28263 DTX2WAV 002。
authoryyagi <yyagi.dtxmania@gmail.com>
Tue, 23 Jan 2018 15:08:38 +0000 (00:08 +0900)
committeryyagi <yyagi.dtxmania@gmail.com>
Tue, 23 Jan 2018 15:08:38 +0000 (00:08 +0900)
 * 各パートの音量バランス変更機能を搭載。DrumsやBGMなどの音量比率を個別に変更可能。
 * ボリューム設定の保持機能。アプリを再起動しても設定が保持され、次回起動時に復元される。アプリのバージョンアップ時も、古い設定値をそのまま引き継ぐ。

12 files changed:
DTX2WAV/App.config
DTX2WAV/Form1.Designer.cs
DTX2WAV/Form1.cs
DTX2WAV/Form1.resx
DTX2WAV/Properties/AssemblyInfo.cs
DTX2WAV/Properties/Settings.Designer.cs
DTX2WAV/Properties/Settings.settings
DTXMania/コード/全体/CDTX2WAVmode.cs
DTXMania/コード/全体/CDTXMania.cs
DTXMania/コード/全体/cmdparse.cs
FDK/コード/03.サウンド/CSound.cs
FDK/コード/03.サウンド/CSoundDeviceWASAPI.cs

index 016d28f..13e2572 100644 (file)
@@ -1,6 +1,42 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="DTX2WAV.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
     </startup>
+    <userSettings>
+        <DTX2WAV.Properties.Settings>
+            <setting name="nVol_BGM" serializeAs="String">
+                <value>100</value>
+            </setting>
+            <setting name="nVol_SE" serializeAs="String">
+                <value>100</value>
+            </setting>
+            <setting name="nVol_Drums" serializeAs="String">
+                <value>100</value>
+            </setting>
+            <setting name="nVol_Guitar" serializeAs="String">
+                <value>100</value>
+            </setting>
+            <setting name="nVol_Bass" serializeAs="String">
+                <value>100</value>
+            </setting>
+            <setting name="nVol_Unknown" serializeAs="String">
+                <value>100</value>
+            </setting>
+            <setting name="nVol_Master" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="bMonitorSound" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="IsUpgrade" serializeAs="String">
+                <value>False</value>
+            </setting>
+        </DTX2WAV.Properties.Settings>
+    </userSettings>
 </configuration>
\ No newline at end of file
index 3ba7135..30a3efe 100644 (file)
                        this.button_Cancel = new System.Windows.Forms.Button();
                        this.button_Convert = new System.Windows.Forms.Button();
                        this.groupBox2 = new System.Windows.Forms.GroupBox();
-                       this.label10 = new System.Windows.Forms.Label();
-                       this.checkBox1 = new System.Windows.Forms.CheckBox();
+                       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);
                        this.label9 = new System.Windows.Forms.Label();
                        this.trackBar_Master = new System.Windows.Forms.TrackBar();
                        this.numericUpDown_Bass = new System.Windows.Forms.NumericUpDown();
+                       this.bindingSource_Bass = new System.Windows.Forms.BindingSource(this.components);
                        this.label8 = new System.Windows.Forms.Label();
                        this.trackBar_Bass = new System.Windows.Forms.TrackBar();
                        this.numericUpDown_Guitar = new System.Windows.Forms.NumericUpDown();
+                       this.bindingSource_Guitar = new System.Windows.Forms.BindingSource(this.components);
                        this.label7 = new System.Windows.Forms.Label();
                        this.trackBar_Guitar = new System.Windows.Forms.TrackBar();
                        this.numericUpDown_Drums = new System.Windows.Forms.NumericUpDown();
+                       this.bindingSource_Drums = new System.Windows.Forms.BindingSource(this.components);
                        this.label6 = new System.Windows.Forms.Label();
                        this.trackBar_Drums = new System.Windows.Forms.TrackBar();
                        this.numericUpDown_SE = new System.Windows.Forms.NumericUpDown();
-                       this.bindingSource_BGM = new System.Windows.Forms.BindingSource(this.components);
+                       this.bindingSource_SE = new System.Windows.Forms.BindingSource(this.components);
                        this.label5 = new System.Windows.Forms.Label();
                        this.trackBar_SE = new System.Windows.Forms.TrackBar();
                        this.numericUpDown_BGM = new System.Windows.Forms.NumericUpDown();
+                       this.bindingSource_BGM = new System.Windows.Forms.BindingSource(this.components);
                        this.label4 = new System.Windows.Forms.Label();
                        this.trackBar_BGM = new System.Windows.Forms.TrackBar();
                        this.tabPage2 = new System.Windows.Forms.TabPage();
                        this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
                        this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-                       this.bindingSource_SE = new System.Windows.Forms.BindingSource(this.components);
-                       this.bindingSource_Drums = new System.Windows.Forms.BindingSource(this.components);
-                       this.bindingSource_Guitar = new System.Windows.Forms.BindingSource(this.components);
-                       this.bindingSource_Bass = new System.Windows.Forms.BindingSource(this.components);
-                       this.bindingSource_Master = new System.Windows.Forms.BindingSource(this.components);
                        this.menuStrip1.SuspendLayout();
                        this.groupBox1.SuspendLayout();
                        this.tabControl1.SuspendLayout();
                        this.tabPage1.SuspendLayout();
                        this.groupBox2.SuspendLayout();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Master)).BeginInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Master)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_Master)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Bass)).BeginInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Bass)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_Bass)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Guitar)).BeginInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Guitar)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_Guitar)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Drums)).BeginInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Drums)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_Drums)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_SE)).BeginInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_BGM)).BeginInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_SE)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_SE)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_BGM)).BeginInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_BGM)).BeginInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_BGM)).BeginInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_SE)).BeginInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Drums)).BeginInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Guitar)).BeginInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Bass)).BeginInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Master)).BeginInit();
                        this.SuspendLayout();
                        // 
                        // menuStrip1
                        // 
                        // groupBox2
                        // 
-                       this.groupBox2.Controls.Add(this.label10);
-                       this.groupBox2.Controls.Add(this.checkBox1);
+                       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.Name = "groupBox2";
                        this.groupBox2.TabStop = false;
                        // 
-                       // label10
-                       // 
-                       resources.ApplyResources(this.label10, "label10");
-                       this.label10.Name = "label10";
-                       // 
-                       // checkBox1
+                       // checkBox_MonitorSound
                        // 
-                       resources.ApplyResources(this.checkBox1, "checkBox1");
-                       this.checkBox1.Checked = true;
-                       this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
-                       this.checkBox1.Name = "checkBox1";
-                       this.checkBox1.UseVisualStyleBackColor = true;
+                       resources.ApplyResources(this.checkBox_MonitorSound, "checkBox_MonitorSound");
+                       this.checkBox_MonitorSound.Checked = true;
+                       this.checkBox_MonitorSound.CheckState = System.Windows.Forms.CheckState.Checked;
+                       this.checkBox_MonitorSound.Name = "checkBox_MonitorSound";
+                       this.checkBox_MonitorSound.UseVisualStyleBackColor = true;
                        // 
                        // numericUpDown_Master
                        // 
             0,
             0});
                        // 
+                       // bindingSource_Master
+                       // 
+                       this.bindingSource_Master.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
+                       // 
                        // label9
                        // 
                        resources.ApplyResources(this.label9, "label9");
             0,
             0});
                        // 
+                       // bindingSource_Bass
+                       // 
+                       this.bindingSource_Bass.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
+                       // 
                        // label8
                        // 
                        resources.ApplyResources(this.label8, "label8");
             0,
             0});
                        // 
+                       // bindingSource_Guitar
+                       // 
+                       this.bindingSource_Guitar.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
+                       // 
                        // label7
                        // 
                        resources.ApplyResources(this.label7, "label7");
             0,
             0});
                        // 
+                       // bindingSource_Drums
+                       // 
+                       this.bindingSource_Drums.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
+                       // 
                        // label6
                        // 
                        resources.ApplyResources(this.label6, "label6");
             0,
             0});
                        // 
-                       // bindingSource_BGM
+                       // bindingSource_SE
                        // 
-                       this.bindingSource_BGM.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
+                       this.bindingSource_SE.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
                        // 
                        // label5
                        // 
             0,
             0});
                        // 
+                       // bindingSource_BGM
+                       // 
+                       this.bindingSource_BGM.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
+                       // 
                        // label4
                        // 
                        resources.ApplyResources(this.label4, "label4");
                        this.tabPage2.Name = "tabPage2";
                        this.tabPage2.UseVisualStyleBackColor = true;
                        // 
-                       // bindingSource_SE
-                       // 
-                       this.bindingSource_SE.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
-                       // 
-                       // bindingSource_Drums
-                       // 
-                       this.bindingSource_Drums.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
-                       // 
-                       // bindingSource_Guitar
-                       // 
-                       this.bindingSource_Guitar.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
-                       // 
-                       // bindingSource_Bass
-                       // 
-                       this.bindingSource_Bass.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
-                       // 
-                       // bindingSource_Master
-                       // 
-                       this.bindingSource_Master.DataSource = typeof(DTX2WAV.Main.VolumeSlider);
-                       // 
                        // Main
                        // 
                        resources.ApplyResources(this, "$this");
                        this.Controls.Add(this.menuStrip1);
                        this.MainMenuStrip = this.menuStrip1;
                        this.Name = "Main";
+                       this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
                        this.Shown += new System.EventHandler(this.Main_Shown);
                        this.menuStrip1.ResumeLayout(false);
                        this.menuStrip1.PerformLayout();
                        this.groupBox2.ResumeLayout(false);
                        this.groupBox2.PerformLayout();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Master)).EndInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Master)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_Master)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Bass)).EndInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Bass)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_Bass)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Guitar)).EndInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Guitar)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_Guitar)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Drums)).EndInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Drums)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_Drums)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_SE)).EndInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_BGM)).EndInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_SE)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_SE)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_BGM)).EndInit();
+                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_BGM)).EndInit();
                        ((System.ComponentModel.ISupportInitialize)(this.trackBar_BGM)).EndInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_SE)).EndInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Drums)).EndInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Guitar)).EndInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Bass)).EndInit();
-                       ((System.ComponentModel.ISupportInitialize)(this.bindingSource_Master)).EndInit();
                        this.ResumeLayout(false);
                        this.PerformLayout();
 
                private System.Windows.Forms.TabPage tabPage2;
                private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
                private System.Windows.Forms.GroupBox groupBox2;
-               private System.Windows.Forms.CheckBox checkBox1;
+               private System.Windows.Forms.CheckBox checkBox_MonitorSound;
                private System.Windows.Forms.NumericUpDown numericUpDown_Master;
                private System.Windows.Forms.Label label9;
                private System.Windows.Forms.TrackBar trackBar_Master;
                private System.Windows.Forms.BindingSource bindingSource_BGM;
                private System.Windows.Forms.Button button_Cancel;
                private System.Windows.Forms.Button button_Convert;
-               private System.Windows.Forms.Label label10;
                private System.Windows.Forms.BindingSource bindingSource_SE;
                private System.Windows.Forms.BindingSource bindingSource_Drums;
                private System.Windows.Forms.BindingSource bindingSource_Guitar;
index f0af21e..b3cd7ee 100644 (file)
@@ -30,15 +30,48 @@ namespace DTX2WAV
                /// <summary>
                /// メインウインドウの表示時に実行
                /// タイトルバーに、アプリ名とリリース番号を表示する
+               /// 設定値の復元
                /// </summary>
                /// <param name="sender"></param>
                /// <param name="e"></param>
                private void Main_Shown(object sender, EventArgs e)
                {
+                       #region [ タイトルバーの設定 ]
                        System.Reflection.Assembly asm = System.Reflection.Assembly.GetExecutingAssembly();
                        int ver_asm_major = asm.GetName().Version.Major;
-
                        this.Text = "DTX2WAV Rel" + ver_asm_major.ToString("D3");
+                       #endregion
+
+                       #region [ 設定値の復元 ]
+                       // アプリのverup時は旧バージョンの設定を引き継ぐ。
+                       // さもなくば、前回終了時の設定値を引き継ぐ。
+                       if (Properties.Settings.Default.IsUpgrade == false)
+                       {
+                               // Upgradeを実行する
+                               Properties.Settings.Default.Upgrade();
+
+                               // 「Upgradeを実行した」という情報を設定する
+                               Properties.Settings.Default.IsUpgrade = true;
+
+                               // 現行バージョンの設定を保存する
+                               Properties.Settings.Default.Save();
+                       }
+                       else
+                       {
+                               // 設定値の復元
+                               Properties.Settings.Default.Reload();
+                       }
+                       #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;
+                       #endregion
                }
 
                private void button_browseDTX_Click(object sender, EventArgs e)
@@ -142,7 +175,9 @@ namespace DTX2WAV
 
                        //アプリ名と引数の情報を設定
                        p.StartInfo.FileName = "DTXManiaGR.exe";
-                       p.StartInfo.Arguments = $"-E{comboBox_AudioFormat.Text.ToUpper()},48000,192,\"{textBox_BrowseAudio.Text}\",\"{textBox_BrowseDTX.Text}\"";
+                       p.StartInfo.Arguments = $"-E{comboBox_AudioFormat.Text.ToUpper()},48000,192,";
+                       p.StartInfo.Arguments += $"{numericUpDown_BGM.Value},{numericUpDown_SE.Value},{numericUpDown_Drums.Value},{numericUpDown_Guitar.Value},{numericUpDown_Bass.Value},{numericUpDown_Master.Value},";
+                       p.StartInfo.Arguments += $"\"{textBox_BrowseAudio.Text}\",\"{textBox_BrowseDTX.Text}\"";
 
                        //起動する
                        p.Start();
@@ -246,6 +281,27 @@ namespace DTX2WAV
                        }
 
                }
+
+               /// <summary>
+               /// アプリ終了時に、設定値を保存
+               /// </summary>
+               /// <param name="sender"></param>
+               /// <param name="e"></param>
+               private void Main_FormClosing(object sender, FormClosingEventArgs e)
+               {
+
+                       #region [ Formの設定値を、Propertiesに退避する ]
+                       Properties.Settings.Default.nVol_BGM      = (int)numericUpDown_BGM.Value;
+                       Properties.Settings.Default.nVol_SE       = (int)numericUpDown_SE.Value;
+                       Properties.Settings.Default.nVol_Drums    = (int)numericUpDown_Drums.Value;
+                       Properties.Settings.Default.nVol_Guitar   = (int)numericUpDown_Guitar.Value;
+                       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;
+                       #endregion
+
+                       Properties.Settings.Default.Save();
+               }
        }
        
 }
index 653d41a..9b73351 100644 (file)
   <data name="&gt;&gt;button_Convert.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="label10.AutoSize" type="System.Boolean, mscorlib">
+  <data name="checkBox_MonitorSound.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="label10.Font" type="System.Drawing.Font, System.Drawing">
-    <value>MS UI Gothic, 48pt</value>
-  </data>
-  <data name="label10.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label10.Location" type="System.Drawing.Point, System.Drawing">
-    <value>114, 34</value>
-  </data>
-  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>405, 128</value>
-  </data>
-  <data name="label10.TabIndex" type="System.Int32, mscorlib">
-    <value>19</value>
-  </data>
-  <data name="label10.Text" xml:space="preserve">
-    <value>使えませんねん
-亀は万年</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>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="checkBox1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="checkBox1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+  <data name="checkBox_MonitorSound.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
-  <data name="checkBox1.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="checkBox_MonitorSound.Location" type="System.Drawing.Point, System.Drawing">
     <value>22, 227</value>
   </data>
-  <data name="checkBox1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="checkBox_MonitorSound.Size" type="System.Drawing.Size, System.Drawing">
     <value>522, 16</value>
   </data>
-  <data name="checkBox1.TabIndex" type="System.Int32, mscorlib">
+  <data name="checkBox_MonitorSound.TabIndex" type="System.Int32, mscorlib">
     <value>18</value>
   </data>
-  <data name="checkBox1.Text" xml:space="preserve">
+  <data name="checkBox_MonitorSound.Text" xml:space="preserve">
     <value>録音中の音をスピーカーに出力する(しかし実現方法不明。WASAPI排他じゃなければやりようがあるのだが)</value>
   </data>
-  <data name="&gt;&gt;checkBox1.Name" xml:space="preserve">
-    <value>checkBox1</value>
+  <data name="&gt;&gt;checkBox_MonitorSound.Name" xml:space="preserve">
+    <value>checkBox_MonitorSound</value>
   </data>
-  <data name="&gt;&gt;checkBox1.Type" xml:space="preserve">
+  <data name="&gt;&gt;checkBox_MonitorSound.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;checkBox1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;checkBox_MonitorSound.Parent" xml:space="preserve">
     <value>groupBox2</value>
   </data>
-  <data name="&gt;&gt;checkBox1.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <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>groupBox2</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Master.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>1</value>
   </data>
   <data name="label9.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
     <value>20, 188</value>
   </data>
   <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>86, 12</value>
+    <value>100, 12</value>
   </data>
   <data name="label9.TabIndex" type="System.Int32, mscorlib">
     <value>16</value>
   </data>
   <data name="label9.Text" xml:space="preserve">
-    <value>マスターボリューム</value>
+    <value>マスターボリューム(%)</value>
   </data>
   <data name="&gt;&gt;label9.Name" xml:space="preserve">
     <value>label9</value>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;label9.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <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>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;trackBar_Master.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <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>groupBox2</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Bass.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>4</value>
   </data>
   <data name="label8.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
     <value>20, 135</value>
   </data>
   <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>65, 12</value>
+    <value>79, 12</value>
   </data>
   <data name="label8.TabIndex" type="System.Int32, mscorlib">
     <value>13</value>
   </data>
   <data name="label8.Text" xml:space="preserve">
-    <value>Bassの音量</value>
+    <value>Bassの音量(%)</value>
   </data>
   <data name="&gt;&gt;label8.Name" xml:space="preserve">
     <value>label8</value>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>5</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>
   <data name="trackBar_Bass.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;trackBar_Bass.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <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>groupBox2</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Guitar.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>7</value>
   </data>
   <data name="label7.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
     <value>20, 107</value>
   </data>
   <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>70, 12</value>
+    <value>84, 12</value>
   </data>
   <data name="label7.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
   </data>
   <data name="label7.Text" xml:space="preserve">
-    <value>Guitarの音量</value>
+    <value>Guitarの音量(%)</value>
   </data>
   <data name="&gt;&gt;label7.Name" xml:space="preserve">
     <value>label7</value>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>8</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>
-  </metadata>
   <data name="trackBar_Guitar.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;trackBar_Guitar.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <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>groupBox2</value>
   </data>
   <data name="&gt;&gt;numericUpDown_Drums.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>10</value>
   </data>
   <data name="label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
     <value>20, 79</value>
   </data>
   <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>72, 12</value>
+    <value>86, 12</value>
   </data>
   <data name="label6.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
   </data>
   <data name="label6.Text" xml:space="preserve">
-    <value>Drumsの音量</value>
+    <value>Drumsの音量(%)</value>
   </data>
   <data name="&gt;&gt;label6.Name" xml:space="preserve">
     <value>label6</value>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>11</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>
-  </metadata>
   <data name="trackBar_Drums.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;trackBar_Drums.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <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>groupBox2</value>
   </data>
   <data name="&gt;&gt;numericUpDown_SE.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>13</value>
   </data>
   <data name="label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
     <value>20, 51</value>
   </data>
   <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
+    <value>67, 12</value>
   </data>
   <data name="label5.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
   <data name="label5.Text" xml:space="preserve">
-    <value>SEの音量</value>
+    <value>SEの音量(%)</value>
   </data>
   <data name="&gt;&gt;label5.Name" xml:space="preserve">
     <value>label5</value>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>14</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>
-  </metadata>
   <data name="trackBar_SE.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;trackBar_SE.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <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>groupBox2</value>
   </data>
   <data name="&gt;&gt;numericUpDown_BGM.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>16</value>
   </data>
   <data name="label4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
     <value>20, 23</value>
   </data>
   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 12</value>
+    <value>78, 12</value>
   </data>
   <data name="label4.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
   <data name="label4.Text" xml:space="preserve">
-    <value>BGMの音量</value>
+    <value>BGMの音量(%)</value>
   </data>
   <data name="&gt;&gt;label4.Name" xml:space="preserve">
     <value>label4</value>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>17</value>
   </data>
   <data name="trackBar_BGM.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;trackBar_BGM.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>18</value>
   </data>
   <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 150</value>
   <data name="&gt;&gt;tabControl1.ZOrder" xml:space="preserve">
     <value>0</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>
-  </metadata>
-  <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>388, 17</value>
+  <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>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>524, 17</value>
+  <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_SE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>783, 17</value>
+  <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_Guitar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1069, 17</value>
+  <metadata name="bindingSource_SE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>783, 17</value>
   </metadata>
-  <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 name="bindingSource_BGM.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>621, 17</value>
   </metadata>
-  <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 name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>388, 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>
   </metadata>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>681, 535</value>
   </data>
-  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>DTX2WAV</value>
   </data>
   <data name="&gt;&gt;openFileDialog1.Type" xml:space="preserve">
     <value>System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;bindingSource_BGM.Name" xml:space="preserve">
-    <value>bindingSource_BGM</value>
+  <data name="&gt;&gt;bindingSource_Master.Name" xml:space="preserve">
+    <value>bindingSource_Master</value>
   </data>
-  <data name="&gt;&gt;bindingSource_BGM.Type" xml:space="preserve">
+  <data name="&gt;&gt;bindingSource_Master.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>
-  <data name="&gt;&gt;saveFileDialog1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;toolTip1.Name" xml:space="preserve">
-    <value>toolTip1</value>
+  <data name="&gt;&gt;bindingSource_Bass.Name" xml:space="preserve">
+    <value>bindingSource_Bass</value>
   </data>
-  <data name="&gt;&gt;toolTip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;bindingSource_Bass.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_SE.Name" xml:space="preserve">
-    <value>bindingSource_SE</value>
+  <data name="&gt;&gt;bindingSource_Guitar.Name" xml:space="preserve">
+    <value>bindingSource_Guitar</value>
   </data>
-  <data name="&gt;&gt;bindingSource_SE.Type" xml:space="preserve">
+  <data name="&gt;&gt;bindingSource_Guitar.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_Drums.Name" xml:space="preserve">
   <data name="&gt;&gt;bindingSource_Drums.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_Guitar.Name" xml:space="preserve">
-    <value>bindingSource_Guitar</value>
+  <data name="&gt;&gt;bindingSource_SE.Name" xml:space="preserve">
+    <value>bindingSource_SE</value>
   </data>
-  <data name="&gt;&gt;bindingSource_Guitar.Type" xml:space="preserve">
+  <data name="&gt;&gt;bindingSource_SE.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_Bass.Name" xml:space="preserve">
-    <value>bindingSource_Bass</value>
+  <data name="&gt;&gt;bindingSource_BGM.Name" xml:space="preserve">
+    <value>bindingSource_BGM</value>
   </data>
-  <data name="&gt;&gt;bindingSource_Bass.Type" xml:space="preserve">
+  <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_Master.Name" xml:space="preserve">
-    <value>bindingSource_Master</value>
+  <data name="&gt;&gt;saveFileDialog1.Name" xml:space="preserve">
+    <value>saveFileDialog1</value>
   </data>
-  <data name="&gt;&gt;bindingSource_Master.Type" xml:space="preserve">
-    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;saveFileDialog1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;toolTip1.Name" xml:space="preserve">
+    <value>toolTip1</value>
+  </data>
+  <data name="&gt;&gt;toolTip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>Main</value>
index 46410d2..c2e9838 100644 (file)
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]
index 91e6aa2..128365a 100644 (file)
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     このコードはツールによって生成されました。
+//     ランタイム バージョン:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
+//     コードが再生成されるときに損失したりします。
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DTX2WAV.Properties
-{
-
-
-       [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-       [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-       internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-       {
-
-               private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-               public static Settings Default
-               {
-                       get
-                       {
-                               return defaultInstance;
-                       }
-               }
-       }
+namespace DTX2WAV.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("100")]
+        public int nVol_BGM {
+            get {
+                return ((int)(this["nVol_BGM"]));
+            }
+            set {
+                this["nVol_BGM"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("100")]
+        public int nVol_SE {
+            get {
+                return ((int)(this["nVol_SE"]));
+            }
+            set {
+                this["nVol_SE"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("100")]
+        public int nVol_Drums {
+            get {
+                return ((int)(this["nVol_Drums"]));
+            }
+            set {
+                this["nVol_Drums"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("100")]
+        public int nVol_Guitar {
+            get {
+                return ((int)(this["nVol_Guitar"]));
+            }
+            set {
+                this["nVol_Guitar"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("100")]
+        public int nVol_Bass {
+            get {
+                return ((int)(this["nVol_Bass"]));
+            }
+            set {
+                this["nVol_Bass"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("100")]
+        public int nVol_Unknown {
+            get {
+                return ((int)(this["nVol_Unknown"]));
+            }
+            set {
+                this["nVol_Unknown"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public int nVol_Master {
+            get {
+                return ((int)(this["nVol_Master"]));
+            }
+            set {
+                this["nVol_Master"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool bMonitorSound {
+            get {
+                return ((bool)(this["bMonitorSound"]));
+            }
+            set {
+                this["bMonitorSound"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool IsUpgrade {
+            get {
+                return ((bool)(this["IsUpgrade"]));
+            }
+            set {
+                this["IsUpgrade"] = value;
+            }
+        }
+    }
 }
index 3964565..e5f7c87 100644 (file)
@@ -1,7 +1,33 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="DTX2WAV.Properties" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="nVol_BGM" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">100</Value>
+    </Setting>
+    <Setting Name="nVol_SE" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">100</Value>
+    </Setting>
+    <Setting Name="nVol_Drums" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">100</Value>
+    </Setting>
+    <Setting Name="nVol_Guitar" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">100</Value>
+    </Setting>
+    <Setting Name="nVol_Bass" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">100</Value>
+    </Setting>
+    <Setting Name="nVol_Unknown" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">100</Value>
+    </Setting>
+    <Setting Name="nVol_Master" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="bMonitorSound" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="IsUpgrade" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+  </Settings>
+</SettingsFile>
\ No newline at end of file
index e6a75fc..6735158 100644 (file)
@@ -49,6 +49,7 @@ namespace DTXMania
             set;
         }
 
+               public int[] nMixerVolume = { 100, 100, 100, 100, 100, 100 };
 
         /// <summary>
         /// コンストラクタ
index 51ae75d..1d6eed7 100644 (file)
@@ -358,9 +358,16 @@ namespace DTXMania
                                else if (DTX2WAVmode.Enabled)
                                {
                                        strコンパクトモードファイル = DTX2WAVmode.dtxfilename;
+                                       #region [ FDKへの録音設定 ]
                                        FDK.CSound管理.strRecordInputDTXfilename = DTX2WAVmode.dtxfilename;
                                        FDK.CSound管理.strRecordOutFilename = DTX2WAVmode.outfilename;
                                        FDK.CSound管理.strRecordFileType = DTX2WAVmode.Format.ToString();
+                                       for (int i = 0; i < (int)FDK.CSound.EInstType.Unknown; i++)
+                                       {
+                                               FDK.CSound管理.nMixerVolume[ i ] = DTX2WAVmode.nMixerVolume[ i ];
+                                       }
+                                       ConfigIni.nMasterVolume.Value = DTX2WAVmode.nMixerVolume[(int)FDK.CSound.EInstType.Unknown];    // [5](Unknown)のところにMasterVolumeが入ってくるので注意
+                                       #endregion
                                        #region [ 録音用の本体設定 ]
                                        CDTXMania.Instance.ConfigIni.nSoundDeviceType.Value = ESoundDeviceTypeForConfig.WASAPI_Exclusive;
                                        CDTXMania.Instance.ConfigIni.bEventDrivenWASAPI.Value = false;
index 67b0ebf..34e016a 100644 (file)
@@ -36,13 +36,14 @@ namespace DTXMania
         /// <remarks>DTXモードとして使う場合、内部でEnabled, nStartBar, Command, NeedReload, filename, last_path, last_timestampを設定する</remarks>
         public ECommandType ParseArguments(string arg, ref CDTXVmode cdtxv, ref CDTX2WAVmode cdtx2wav)
         {
-            // -Vvvv,ppp,"soundfilename"    サウンドファイルの再生 vvv=volume, ppp=pan
-            // -S                           DTXV再生停止
-            // -D(サウンドモード)(YかNが3文字続く) Viewerの設定
-            //                              (サウンドモード) WE=WASAPI Exclusive, WS=WASAPI Shared, A1=ASIO(数値はデバイス番号), D=DSound
-            //                              YYY, YNYなど  1文字目=GRmode, 2文字目=TmeStretch, 3文字目=VSyncWait
-            // -Nxxx                        再生開始小節番号
-            // -Etype,freq,bitrate,"outfilename","dtxfilename"   DTX2WAVとして使用 type="WAV"or"MP3"or"OGG", freq=48000など, bitrate=192 (kHzなど)
+                       // -Vvvv,ppp,"soundfilename"    サウンドファイルの再生 vvv=volume, ppp=pan
+                       // -S                           DTXV再生停止
+                       // -D(サウンドモード)(YかNが3文字続く) Viewerの設定
+                       //                              (サウンドモード) WE=WASAPI Exclusive, WS=WASAPI Shared, A1=ASIO(数値はデバイス番号), D=DSound
+                       //                              YYY, YNYなど  1文字目=GRmode, 2文字目=TmeStretch, 3文字目=VSyncWait
+                       // -Nxxx                        再生開始小節番号
+                       // -Etype,freq,bitrate,volBGM,volSE,volDrums,volGuitar,volBassmvolMaster,"outfilename","dtxfilename"
+                       //  DTX2WAVとして使用 type="WAV"or"MP3"or"OGG", freq=48000など, bitrate=192 (kHzなど)
 
             ECommandType ret = ECommandType.DTXMania;
             bool analyzing = true;
@@ -226,7 +227,9 @@ namespace DTXMania
                                                arg = arg.Substring(2);
 
                                                Regex re = new Regex(
-                                                       "(?<type>.+?),(?<freq>.+?),(?<bitrate>.+?),(?<outfile>\"?.+\"??),(?<dtxfile>\"?.+\"??)",
+                                                       "(?<type>.+?),(?<freq>.+?),(?<bitrate>.+?)," +
+                                                       "(?<volBGM>.+?),(?<volSE>.+?),(?<volDrums>.+?),(?<volGuitar>.+?),(?<volBass>.+?),(?<volMaster>.+?)," +
+                                                       "(?<outfile>\"?.+\"??),(?<dtxfile>\"?.+\"??)",
                                                        RegexOptions.IgnoreCase
                                                );
                                                Match m = re.Match(arg);
@@ -248,6 +251,12 @@ namespace DTXMania
                                                                break;
                                                }
                                                Trace.TraceInformation("cdtx2wav.Format=" + cdtx2wav.Format.ToString());
+                                               cdtx2wav.nMixerVolume[ 0 ] = Convert.ToInt32(m.Groups["volBGM"].Value);
+                                               cdtx2wav.nMixerVolume[ 1 ] = Convert.ToInt32(m.Groups["volSE"].Value);
+                                               cdtx2wav.nMixerVolume[ 2 ] = Convert.ToInt32(m.Groups["volDrums"].Value);
+                                               cdtx2wav.nMixerVolume[ 3 ] = Convert.ToInt32(m.Groups["volGuitar"].Value);
+                                               cdtx2wav.nMixerVolume[ 4 ] = Convert.ToInt32(m.Groups["volBass"].Value);
+                                               cdtx2wav.nMixerVolume[ 5 ] = Convert.ToInt32(m.Groups["volMaster"].Value);
 
                                                cdtx2wav.freq = Convert.ToInt32(m.Groups["freq"].Value);
                                                cdtx2wav.bitrate = Convert.ToInt32(m.Groups["bitrate"].Value);
index 56a0972..d80ea07 100644 (file)
@@ -204,6 +204,12 @@ namespace FDK
                /// 録音機能で使うファイルタイプ
                /// </summary>
                public static string strRecordFileType;
+
+
+               /// <summary>
+               /// 録音機能で使うミキサーボリューム
+               /// </summary>
+               public static int[] nMixerVolume = { 100, 100, 100, 100, 100, 100 };    // BGM,SE,Drums,Guitar,Bass,Unknown
                #endregion
 
 
index b61aab4..b605023 100644 (file)
@@ -459,6 +459,10 @@ namespace FDK
                                        throw new Exception(string.Format("BASSミキサ(楽器[{1}]ごとのmixing)の作成に失敗しました。[{0}]", errcode, i));
                                }
 
+                               // Mixerのボリューム設定
+                               Bass.BASS_ChannelSetAttribute(this.hMixer_Chips[ i ], BASSAttribute.BASS_ATTRIB_VOL, CSound管理.nMixerVolume[ i ] / 100.0f );
+Trace.TraceInformation("Vol{0}: {1}", i, CSound管理.nMixerVolume[i]);
+
                                bool b1 = BassMix.BASS_Mixer_StreamAddChannel(this.hMixer, this.hMixer_Chips[i], BASSFlag.BASS_DEFAULT);
                                if (!b1)
                                {
@@ -508,8 +512,6 @@ namespace FDK
                                };
                        }
 
-                       //Bass.BASS_ChannelSetAttribute(this.hMixer_Chips[(int)CSound.EInstType.Guitar], BASSAttribute.BASS_ATTRIB_VOL, 1.50f);
-
 
                        // 録音設定(DTX2WAV)
                        encoder = new EncoderWAV(this.hMixer_DeviceOut);