WinGui:

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

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index a6044b2..a4bd1c1 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -38,6 +38,19 @@ namespace Handbrake.Functions
             }\r
         }\r
 \r
+        private string q_format;\r
+        /// <summary>\r
+        /// Returns a String \r
+        /// Full path of the destination.\r
+        /// </summary>\r
+        public string Format\r
+        {\r
+            get\r
+            {\r
+                return this.q_format;\r
+            }\r
+        }\r
+\r
         private int q_dvdTitle;\r
         /// <summary>\r
         /// Returns an Integer\r
@@ -469,6 +482,8 @@ namespace Handbrake.Functions
             Match source = r1.Match(input.Replace('"', '\"'));\r
             Match title = Regex.Match(input, @"-t ([0-9]*)");\r
             Match chapters = Regex.Match(input, @"-c ([0-9-]*)");\r
+            Match format = Regex.Match(input, @"-f ([a-z0-9a-z0-9a-z0-9]*)");\r
+            //-f mp4\r
 \r
             //Destination\r
             Regex r2 = new Regex(@"(-o)(?:\s\"")([a-zA-Z0-9:\\\s\.]+)(?:\"")");\r
@@ -532,6 +547,12 @@ namespace Handbrake.Functions
                      thisQuery.q_chaptersStart = int.Parse(actTitles[0]);\r
                      thisQuery.q_chaptersFinish = int.Parse(actTitles[1]);\r
                  }\r
+\r
+                 if (format.Success != false)\r
+                 {\r
+                     \r
+                     thisQuery.q_format = format.ToString().Replace("-f ", "");\r
+                 }\r
                 #endregion\r
 \r
                 //\r
@@ -562,7 +583,7 @@ namespace Handbrake.Functions
                         videoEncoderConvertion = "H.264 (iPod)";\r
                         break;\r
                     default:\r
-                        videoEncoderConvertion = "H.264";\r
+                        videoEncoderConvertion = "Mpeg 4";\r
                         break;\r
                  }\r
                  thisQuery.q_videoEncoder = videoEncoderConvertion;\r
@@ -617,6 +638,7 @@ namespace Handbrake.Functions
                  thisQuery.q_detelecine = detelecine.Success;\r
                  thisQuery.q_deBlock = deblock.Success;\r
 \r
+                 thisQuery.q_deinterlace = "None";\r
                  if (deinterlace.Success != false)\r
                  {\r
                      switch (deinterlace.ToString().Replace("--deinterlace=", ""))\r
@@ -638,7 +660,8 @@ namespace Handbrake.Functions
                              break;\r
                      }\r
                  }\r
-                 \r
+\r
+                 thisQuery.q_denoise = "None";\r
                  if (denoise.Success != false)\r
                  {\r
                      switch (denoise.ToString().Replace("--denoise=", ""))\r
@@ -687,6 +710,7 @@ namespace Handbrake.Functions
                 if (videoQuality.Success != false)\r
                 {\r
                     qConvert = double.Parse(videoQuality.ToString().Replace("-q ", "")) * 100;\r
+                    qConvert = System.Math.Ceiling(qConvert);\r
                     thisQuery.q_videoQuality = int.Parse(qConvert.ToString());\r
                 }\r
                 thisQuery.q_crf = CRF.Success;\r
@@ -708,7 +732,12 @@ namespace Handbrake.Functions
                 {\r
                     thisQuery.q_audioTrack1 = audioChannel.ToString().Replace("-a ", "");\r
                 }\r
-     \r
+                else\r
+                {\r
+                    thisQuery.q_audioTrack1 = "Automatic";\r
+                }\r
+\r
+                thisQuery.q_audioTrackMix = "Automatic";\r
                 if (audioChannelsMix.Success != false)\r
                 {\r
                     switch (audioChannelsMix.ToString().Replace("-6 ", "").Replace(" ",""))\r
@@ -729,7 +758,7 @@ namespace Handbrake.Functions
                             thisQuery.q_audioTrackMix = "6 Channel Discrete";\r
                             break;\r
                         default:\r
-                            thisQuery.q_audioTrackMix = "Automatic2";\r
+                            thisQuery.q_audioTrackMix = "Automatic";\r
                             break;\r
                     }\r
                    \r
@@ -738,6 +767,10 @@ namespace Handbrake.Functions
                 {\r
                     thisQuery.q_subtitles = subtitles.ToString().Replace("-s ", "");\r
                 }\r
+                else\r
+                {\r
+                    thisQuery.q_subtitles = "None";\r
+                }\r
                 #endregion\r
 \r
                 //\r