WinGui: Fix subtitle forced for foreign scan. Set it to "scan" instead of "Forced"

[handbrake-jp/handbrake-jp-git.git] / win / C# / Functions / QueryGenerator.cs

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 58e59cd..2d2bd2a 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -21,7 +21,7 @@ namespace Handbrake.Functions
         /// <param name="duration"></param>\r
         /// <param name="preview"></param>\r
         /// <returns></returns>\r
-        public string generateCLIQuery(frmMain mainWindow, int duration, string preview)\r
+        public string GenerateCLIQuery(frmMain mainWindow, int duration, string preview)\r
         {\r
             string query = "";\r
 \r
@@ -35,13 +35,14 @@ namespace Handbrake.Functions
                 query += " -t " + titleInfo[0];\r
             }\r
 \r
-            if (Properties.Settings.Default.dvdnav)\r
+            if (!Properties.Settings.Default.noDvdNav)\r
                 if (mainWindow.drop_angle.Items.Count != 0)\r
                     query += " --angle " + mainWindow.drop_angle.SelectedItem;\r
 \r
 \r
             if (duration != 0 && preview != null) // Preivew Query\r
             {\r
+                query += " --previews " + Properties.Settings.Default.previewScanCount + " ";\r
                 query += " --start-at-preview " + preview;\r
                 query += " --stop-at duration:" + duration + " ";\r
 \r
@@ -61,7 +62,7 @@ namespace Handbrake.Functions
                     query += " -o " + '"' + mainWindow.text_destination.Text + '"';\r
             }\r
 \r
-            query += generateTabbedComponentsQuery(mainWindow);\r
+            query += GenerateTabbedComponentsQuery(mainWindow);\r
 \r
             return query;\r
         }\r
@@ -71,7 +72,7 @@ namespace Handbrake.Functions
         /// </summary>\r
         /// <param name="mainWindow"></param>\r
         /// <returns></returns>\r
-        public static string generateTabbedComponentsQuery(frmMain mainWindow)\r
+        public static string GenerateTabbedComponentsQuery(frmMain mainWindow)\r
         {\r
             string query = "";\r
 \r
@@ -149,7 +150,13 @@ namespace Handbrake.Functions
                     break;\r
                 case 3:\r
                     query += " --custom-anamorphic ";\r
-                    query += " --display-width " + mainWindow.PictureSettings.updownDisplayWidth.Text + " ";\r
+\r
+                    if (mainWindow.PictureSettings.drp_modulus.SelectedIndex != 0)\r
+                        query += " --modulus " + mainWindow.PictureSettings.drp_modulus.SelectedItem;\r
+\r
+                    if (mainWindow.PictureSettings.check_KeepAR.Checked)\r
+                        query += " --display-width " + mainWindow.PictureSettings.updownDisplayWidth.Text + " ";\r
+\r
                     if (mainWindow.PictureSettings.check_KeepAR.Checked)\r
                         query += " --keep-display-aspect ";\r
 \r
@@ -192,9 +199,7 @@ namespace Handbrake.Functions
             // Video Quality Setting\r
             if (mainWindow.radio_cq.Checked)\r
             {\r
-                double cqStep;\r
-                double.TryParse(Properties.Settings.Default.x264cqstep, out cqStep);\r
-\r
+                double cqStep = Properties.Settings.Default.x264cqstep;\r
                 double value;\r
                 switch (mainWindow.drp_videoEncoder.Text)\r
                 {\r
@@ -261,7 +266,7 @@ namespace Handbrake.Functions
 \r
                 // Sample Rate (-R)\r
                 if (row.SubItems[4].Text != String.Empty)\r
-                    samplerates.Add(row.SubItems[4].Text.Replace("Auto", "Auto"));\r
+                    samplerates.Add(row.SubItems[4].Text);\r
 \r
                 // Audio Bitrate (-B)\r
                 if (row.SubItems[5].Text != String.Empty)\r
@@ -347,8 +352,9 @@ namespace Handbrake.Functions
             firstLoop = true; audioItems = ""; // Reset for another pass.\r
 \r
             // DRC (-D)\r
-            foreach (String item in drcs)\r
+            foreach (var itm in drcs)\r
             {\r
+                string item = itm.ToString(new CultureInfo("en-US"));\r
                 if (firstLoop)\r
                 {\r
                     audioItems = item; firstLoop = false;\r
@@ -371,7 +377,7 @@ namespace Handbrake.Functions
                 string subtitleForced = String.Empty;\r
                 string subtitleBurn = String.Empty;\r
                 string subtitleDefault = String.Empty;\r
-\r
+ \r
                 // SRT\r
                 string srtFile = String.Empty;\r
                 string srtCodeset = String.Empty;\r
@@ -380,29 +386,26 @@ namespace Handbrake.Functions
                 string srtDefault = String.Empty;\r
                 int srtCount = 0;\r
 \r
-                foreach (ListViewItem item in mainWindow.Subtitles.lv_subList.Items)\r
+                List<Controls.SubtitleInfo> SubList = mainWindow.Subtitles.GetSubtitleInfoList();\r
+\r
+                foreach (var item in SubList)\r
                 {\r
                     string itemToAdd, trackID;\r
 \r
-                    if (item.SubItems.Count != 5) // We have an SRT file\r
+                    if (item.SrtPath != "-") // We have an SRT file\r
                     {\r
                         srtCount++; // SRT track id.\r
-                        string[] trackData = item.SubItems[1].Text.Split(',');\r
-                        if (trackData != null)\r
-                        {\r
-                            string charCode = trackData[1].Replace("(", "").Replace(")", "").Trim();\r
-                            string realLangCode = langMap[trackData[0].Trim()];\r
 \r
-                            srtLang += srtLang == "" ? realLangCode : "," + realLangCode;\r
-                            srtCodeset += srtCodeset == "" ? charCode : "," + charCode;\r
-                        }\r
-                        if (item.SubItems[4].Text == "Yes") // default\r
+                        srtLang += srtLang == "" ? langMap[item.SrtLang] : "," + langMap[item.SrtLang];\r
+                        srtCodeset += srtCodeset == "" ? item.SrtCharCode : "," + item.SrtCharCode;\r
+\r
+                        if (item.Default == "Yes") // default\r
                             srtDefault = srtCount.ToString();\r
 \r
-                        itemToAdd = item.SubItems[5].Text;\r
+                        itemToAdd = item.SrtPath;\r
                         srtFile += srtFile == "" ? itemToAdd : "," + itemToAdd;\r
 \r
-                        itemToAdd = item.SubItems[6].Text;\r
+                        itemToAdd = item.SrtOffset.ToString();\r
                         srtOffset += srtOffset == "" ? itemToAdd : "," + itemToAdd;\r
                     }\r
                     else // We have Bitmap or CC\r
@@ -410,11 +413,11 @@ namespace Handbrake.Functions
                         string[] tempSub;\r
 \r
                         // Find --subtitle <string>\r
-                        if (item.SubItems[1].Text.Contains("Foreign Audio Search"))\r
+                        if (item.Track.Contains("Foreign Audio Search"))\r
                             itemToAdd = "scan";\r
                         else\r
                         {\r
-                            tempSub = item.SubItems[1].Text.Split(' ');\r
+                            tempSub = item.Track.Split(' ');\r
                             itemToAdd = tempSub[0];\r
                         }\r
 \r
@@ -422,26 +425,25 @@ namespace Handbrake.Functions
 \r
                         // Find --subtitle-forced\r
                         itemToAdd = "";\r
-                        tempSub = item.SubItems[1].Text.Split(' ');\r
+                        tempSub = item.Track.Split(' ');\r
                         trackID = tempSub[0];\r
 \r
-                        if (item.SubItems[2].Text == "Yes")\r
-                            itemToAdd = trackID;\r
+                        if (item.Forced == "Yes")\r
+                            itemToAdd = "scan";\r
 \r
                         if (itemToAdd != "")\r
                             subtitleForced += subtitleForced == "" ? itemToAdd : "," + itemToAdd;\r
 \r
                         // Find --subtitle-burn and --subtitle-default\r
-                        tempSub = item.SubItems[1].Text.Split(' ');\r
                         trackID = tempSub[0];\r
 \r
                         if (trackID.Trim() == "Foreign")\r
                             trackID = "scan";\r
 \r
-                        if (item.SubItems[3].Text == "Yes") // burn\r
+                        if (item.Burned == "Yes") // burn\r
                             subtitleBurn = trackID;\r
 \r
-                        if (item.SubItems[4].Text == "Yes") // default\r
+                        if (item.Default == "Yes") // default\r
                             subtitleDefault = trackID;\r
                     }\r
                 }\r
@@ -452,11 +454,11 @@ namespace Handbrake.Functions
                     query += " --subtitle " + subtitleTracks;\r
 \r
                     if (subtitleForced != "")\r
-                        query += " --subtitle-forced " + subtitleForced;\r
+                        query += " --subtitle-forced=" + subtitleForced;\r
                     if (subtitleBurn != "")\r
-                        query += " --subtitle-burn " + subtitleBurn;\r
+                        query += " --subtitle-burn=" + subtitleBurn;\r
                     if (subtitleDefault != "")\r
-                        query += " --subtitle-default " + subtitleDefault;\r
+                        query += " --subtitle-default=" + subtitleDefault;\r
                 }\r
 \r
                 if (srtFile != "") // SRTs\r
@@ -470,7 +472,7 @@ namespace Handbrake.Functions
                     if (srtLang != "")\r
                         query += " --srt-lang " + srtLang;\r
                     if (srtDefault != "")\r
-                        query += " --subtitle-default " + srtDefault;\r
+                        query += " --srt-default=" + srtDefault;\r
                 }\r
 \r
             }\r
@@ -519,8 +521,8 @@ namespace Handbrake.Functions
 \r
             query += " -v " + Properties.Settings.Default.verboseLevel;\r
 \r
-            if (Properties.Settings.Default.dvdnav)\r
-                query += " --dvdnav";\r
+            if (Properties.Settings.Default.noDvdNav)\r
+                query += " --no-dvdnav";\r
             #endregion\r
 \r
             return query;\r