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 3b34cd5..2d2bd2a 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -42,6 +42,7 @@ namespace Handbrake.Functions
 \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
@@ -265,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
@@ -351,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
@@ -375,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
@@ -427,7 +429,7 @@ namespace Handbrake.Functions
                         trackID = tempSub[0];\r
 \r
                         if (item.Forced == "Yes")\r
-                            itemToAdd = trackID;\r
+                            itemToAdd = "scan";\r
 \r
                         if (itemToAdd != "")\r
                             subtitleForced += subtitleForced == "" ? itemToAdd : "," + itemToAdd;\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