WinGui:

- Implement DRC 0, default 0
- Tidy up audio query generation a bit.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2127 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 85ccfd4444cfaa8bde4882119f1fc5d6657f394c..89647c8846a00e07c4cfa53969fefe08deea8c9e 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -1709,7 +1709,7 @@ namespace Handbrake
             this.lbl_drc.Name = "lbl_drc";\r
             this.lbl_drc.Size = new System.Drawing.Size(14, 13);\r
             this.lbl_drc.TabIndex = 15;\r
-            this.lbl_drc.Text = "1";\r
+            this.lbl_drc.Text = "0";\r
             // \r
             // label16\r
             // \r
@@ -1727,7 +1727,7 @@ namespace Handbrake
             this.tb_drc.LargeChange = 0;\r
             this.tb_drc.Location = new System.Drawing.Point(599, 47);\r
             this.tb_drc.Margin = new System.Windows.Forms.Padding(0);\r
-            this.tb_drc.Maximum = 30;\r
+            this.tb_drc.Maximum = 31;\r
             this.tb_drc.Name = "tb_drc";\r
             this.tb_drc.Size = new System.Drawing.Size(50, 42);\r
             this.tb_drc.TabIndex = 13;\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 3c77a8d1ad9e1bd37126e294f454683589decd8a..98d99f4a06b1ad7dda2178e80db1d3dfab1e6f86 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1283,7 +1283,11 @@ namespace Handbrake
         }\r
         private void tb_drc_Scroll(object sender, EventArgs e)\r
         {\r
-            double value = (tb_drc.Value / 10.0) + 1;\r
+            double value;\r
+            if (tb_drc.Value == 0) value = 0;\r
+            else\r
+                value = ((tb_drc.Value-1) / 10.0) + 1;\r
+            \r
             lbl_drc.Text = value.ToString();\r
 \r
             // Update an item in the Audio list if required.\r
@@ -1388,7 +1392,9 @@ namespace Handbrake
                 drp_audbit_1.Text = lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[4].Text;\r
                 double drcValue; int drcCalculated;\r
                 double.TryParse(lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[5].Text, out drcValue);\r
-                drcValue = (drcValue * 10) - 10;\r
+                if (drcValue == 0) drcCalculated = 0;\r
+                else\r
+                    drcValue = ((drcValue * 10)+1) -10;\r
                 int.TryParse(drcValue.ToString(), out drcCalculated);\r
                 tb_drc.Value = drcCalculated;\r
             }\r
@@ -2091,6 +2097,7 @@ namespace Handbrake
 \r
         #endregion\r
 \r
+\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain/QueryGenerator.cs b/win/C#/frmMain/QueryGenerator.cs
index 8d77dfcb8e40c2f674c535b7dd3d492cba7d9cfd..738bb2503a1798d78e77d837acace94a33b778d2 100644 (file)
--- a/win/C#/frmMain/QueryGenerator.cs
+++ b/win/C#/frmMain/QueryGenerator.cs
@@ -295,7 +295,8 @@ namespace Handbrake
                 else\r
                     audioItems += "," + item;\r
             }\r
-            query += " -E " + audioItems;\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -E " + audioItems;\r
             firstLoop = true; audioItems = ""; // Reset for another pass.\r
 \r
             // Audio Mixdown (-6)\r
@@ -308,7 +309,8 @@ namespace Handbrake
                 else\r
                     audioItems += "," + item;\r
             }\r
-            query += " -6 " + audioItems;\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -6 " + audioItems;\r
             firstLoop = true; audioItems = ""; // Reset for another pass.\r
 \r
             // Sample Rate (-R)\r
@@ -321,7 +323,8 @@ namespace Handbrake
                 else\r
                     audioItems += "," + item;\r
             }\r
-            query += " -R " + audioItems;\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -R " + audioItems;\r
             firstLoop = true; audioItems = ""; // Reset for another pass.\r
 \r
             // Audio Bitrate (-B)\r
@@ -334,7 +337,8 @@ namespace Handbrake
                 else\r
                     audioItems += "," + item;\r
             }\r
-            query += " -B " + audioItems;\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -B " + audioItems;\r
             firstLoop = true; audioItems = ""; // Reset for another pass.\r
 \r
             // DRC (-D)\r
@@ -347,7 +351,8 @@ namespace Handbrake
                 else\r
                     audioItems += "," + item;\r
             }\r
-            query += " -D " + audioItems;\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -D " + audioItems;\r
 \r
             // Subtitles\r
             string subtitles = mainWindow.drp_subtitle.Text;\r