OSDN Git Service

WinGui:
[handbrake-jp/handbrake-jp-git.git] / win / C# / Functions / QueryGenerator.cs
index aa4bdd3..a6c59ee 100644 (file)
@@ -1,9 +1,14 @@
-using System;\r
-using System.Collections;\r
-using System.Text;\r
+/*  QueryGenerator.cs $\r
+       \r
+          This file is part of the HandBrake source code.\r
+          Homepage: <http://handbrake.fr/>.\r
+          It may be used under the terms of the GNU General Public License. */\r
+\r
+using System;\r
 using System.Windows.Forms;\r
 using System.Globalization;\r
 using System.IO;\r
+using System.Collections.Generic;\r
 \r
 namespace Handbrake.Functions\r
 {\r
@@ -14,13 +19,14 @@ namespace Handbrake.Functions
         /// </summary>\r
         /// <param name="mainWindow"></param>\r
         /// <returns>The CLI String</returns>\r
-        public string GenerateTheQuery(frmMain mainWindow)\r
+        public string generateTheQuery(frmMain mainWindow)\r
         {\r
             // Source tab\r
             string query = "";\r
 \r
-            if ((mainWindow.text_source.Text != "") && (mainWindow.text_source.Text.Trim() != "Click 'Source' to continue"))\r
-                query = " -i " + '"' + mainWindow.text_source.Text + '"';\r
+            if (!string.IsNullOrEmpty(mainWindow.sourcePath))\r
+                if (mainWindow.sourcePath.Trim() != "Select \"Source\" to continue")\r
+                    query = " -i " + '"' + mainWindow.sourcePath + '"';\r
 \r
             if (mainWindow.drp_dvdtitle.Text != "Automatic")\r
             {\r
@@ -28,6 +34,10 @@ namespace Handbrake.Functions
                 query += " -t " + titleInfo[0];\r
             }\r
 \r
+            if (Properties.Settings.Default.dvdnav)\r
+                if (mainWindow.drop_angle.Items.Count != 0)\r
+                    query += " --angle " + mainWindow.drop_angle.SelectedItem;\r
+\r
             if (mainWindow.drop_chapterFinish.Text == mainWindow.drop_chapterStart.Text && mainWindow.drop_chapterStart.Text != "Auto")\r
                 query += " -c " + mainWindow.drop_chapterStart.Text;\r
             else if (mainWindow.drop_chapterStart.Text == "Auto" && mainWindow.drop_chapterFinish.Text != "Auto")\r
@@ -48,14 +58,20 @@ namespace Handbrake.Functions
         /// This basically forces a shortened version of the encdode.\r
         /// </summary>\r
         /// <param name="mainWindow"></param>\r
+        /// <param name="duration">Duration</param>\r
+        /// <param name="preview">Start at preview</param>\r
         /// <returns>Returns a CLI query String.</returns>\r
-        public string GeneratePreviewQuery(frmMain mainWindow)\r
+        public string generatePreviewQuery(frmMain mainWindow, string duration, string preview)\r
         {\r
+            int seconds;\r
+            int.TryParse(duration, out seconds);\r
+\r
             // Source tab\r
             string query = "";\r
 \r
-            if ((mainWindow.text_source.Text != "") && (mainWindow.text_source.Text.Trim() != "Click 'Source' to continue"))\r
-                query = " -i " + '"' + mainWindow.text_source.Text + '"';\r
+            if (!string.IsNullOrEmpty(mainWindow.sourcePath))\r
+                if (mainWindow.sourcePath.Trim() != "Select \"Source\" to continue")\r
+                    query = " -i " + '"' + mainWindow.sourcePath + '"';\r
 \r
             if (mainWindow.drp_dvdtitle.Text != "Automatic")\r
             {\r
@@ -63,11 +79,15 @@ namespace Handbrake.Functions
                 query += " -t " + titleInfo[0];\r
             }\r
 \r
-            query += " -c 2";\r
+            if (mainWindow.drop_angle.SelectedIndex != 0)\r
+                query += " --angle " + mainWindow.drop_angle.SelectedItem;\r
+\r
+            query += " --start-at-preview " + preview;\r
+            query += " --stop-at duration:" + duration + " ";\r
 \r
             // Destination tab\r
             if (mainWindow.text_destination.Text != "")\r
-                query += " -o " + '"' + mainWindow.text_destination.Text.Replace(".m", "_sample.m").Replace(".avi", "_sample.avi").Replace(".ogm", "_sample.ogm") + '"';\r
+                query += " -o " + '"' + mainWindow.text_destination.Text.Replace(".m", "_sample.m") + '"';\r
 \r
             query += generateTabbedComponentsQuery(mainWindow);\r
             return query;\r
@@ -77,13 +97,11 @@ namespace Handbrake.Functions
         /// Generates part of the CLI query, for the tabbed components only.\r
         /// </summary>\r
         /// <param name="mainWindow"></param>\r
-        /// <param name="source"></param>\r
         /// <returns></returns>\r
-        public string generateTabbedComponentsQuery(frmMain mainWindow)\r
+        public static string generateTabbedComponentsQuery(frmMain mainWindow)\r
         {\r
             string query = "";\r
 \r
-            // The Output Settings box above the tabbed section.\r
             #region Output Settings Box\r
             query += " -f " + mainWindow.drop_format.Text.ToLower().Replace(" file", "");\r
 \r
@@ -98,78 +116,79 @@ namespace Handbrake.Functions
                 query += " -O ";\r
             #endregion\r
 \r
-            // Picture Settings Tab\r
             #region Picture Settings Tab\r
 \r
-            if (mainWindow.text_width.Text != "")\r
-                query += " -w " + mainWindow.text_width.Text;\r
+            // Use MaxWidth for built-in presets and width for user settings.\r
+            if (mainWindow.PictureSettings.PresetMaximumResolution.Width == 0)\r
+            {\r
+                if (mainWindow.PictureSettings.text_width.Value != 0)\r
+                    if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex != 1) // Prevent usage for strict anamorphic\r
+                        query += " -w " + mainWindow.PictureSettings.text_width.Text;\r
+            }\r
+            else\r
+            {\r
+                if (mainWindow.PictureSettings.text_width.Value != 0)\r
+                    if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex != 1)\r
+                    query += " -X " + mainWindow.PictureSettings.text_width.Text;\r
+            }\r
 \r
-            if (mainWindow.text_height.Text != "")\r
-                query += " -l " + mainWindow.text_height.Text;\r
+            // Use MaxHeight for built-in presets and height for user settings.\r
+            if (mainWindow.PictureSettings.PresetMaximumResolution.Height == 0)\r
+            {\r
+                if (mainWindow.PictureSettings.text_height.Value != 0)\r
+                    if (mainWindow.PictureSettings.text_height.Text != "")\r
+                        if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic\r
+                            query += " -l " + mainWindow.PictureSettings.text_height.Text;\r
+            }\r
+            else\r
+            {\r
+                if (mainWindow.PictureSettings.text_height.Value != 0)\r
+                    if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 3)\r
+                        query += " -Y " + mainWindow.PictureSettings.text_height.Text;\r
+            }\r
 \r
-            string cropTop = mainWindow.text_top.Text;\r
-            string cropBottom = mainWindow.text_bottom.Text;\r
-            string cropLeft = mainWindow.text_left.Text;\r
-            string cropRight = mainWindow.text_right.Text;\r
+            string cropTop = mainWindow.PictureSettings.crop_top.Text;\r
+            string cropBottom = mainWindow.PictureSettings.crop_bottom.Text;\r
+            string cropLeft = mainWindow.PictureSettings.crop_left.Text;\r
+            string cropRight = mainWindow.PictureSettings.crop_right.Text;\r
 \r
-            if (mainWindow.check_customCrop.Checked)\r
+            if (mainWindow.PictureSettings.check_customCrop.Checked)\r
             {\r
-                if (mainWindow.text_top.Text == string.Empty)\r
+                if (mainWindow.PictureSettings.crop_top.Text == string.Empty)\r
                     cropTop = "0";\r
-                if (mainWindow.text_bottom.Text == string.Empty)\r
+                if (mainWindow.PictureSettings.crop_bottom.Text == string.Empty)\r
                     cropBottom = "0";\r
-                if (mainWindow.text_left.Text == string.Empty)\r
+                if (mainWindow.PictureSettings.crop_left.Text == string.Empty)\r
                     cropLeft = "0";\r
-                if (mainWindow.text_right.Text == string.Empty)\r
+                if (mainWindow.PictureSettings.crop_right.Text == string.Empty)\r
                     cropRight = "0";\r
 \r
                 query += " --crop " + cropTop + ":" + cropBottom + ":" + cropLeft + ":" + cropRight;\r
             }\r
 \r
-            switch (mainWindow.drp_deInterlace_option.Text)\r
+            switch (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex)\r
             {\r
-                case "None":\r
-                    query += "";\r
+                case 1:\r
+                    query += " --strict-anamorphic ";\r
                     break;\r
-                case "Fast":\r
-                    query += " --deinterlace=\"fast\"";\r
+                case 2:\r
+                    query += " --loose-anamorphic ";\r
                     break;\r
-                case "Slow":\r
-                    query += " --deinterlace=\"slow\"";\r
-                    break;\r
-                case "Slower":\r
-                    query += " --deinterlace=\"slower\"";\r
-                    break;\r
-                case "Slowest":\r
-                    query += " --deinterlace=\"slowest\"";\r
-                    break;\r
-                default:\r
-                    query += "";\r
+                case 3:\r
+                    query += " --custom-anamorphic ";\r
+                    query += " --display-width " + mainWindow.PictureSettings.updownDisplayWidth.Text + " ";\r
+                    if (mainWindow.PictureSettings.check_KeepAR.Checked)\r
+                        query += " --keep-display-aspect ";\r
+                    if (mainWindow.PictureSettings.updownParWidth.Text != "" && mainWindow.PictureSettings.updownParHeight.Text != "")\r
+                        query += " --pixel-aspect " + mainWindow.PictureSettings.updownParWidth.Text + ":" + mainWindow.PictureSettings.updownParHeight.Text + " ";\r
                     break;\r
             }\r
+            #endregion\r
 \r
-            if (mainWindow.check_decomb.Checked)\r
-            {\r
-                string decombValue = Properties.Settings.Default.decomb;\r
-                if (decombValue != "" && decombValue != Properties.Settings.Default.default_decomb)\r
-                    query += " --decomb=\"" + decombValue + "\"";\r
-                else\r
-                    query += " --decomb ";\r
-            }\r
-\r
-            if (mainWindow.drp_anamorphic.SelectedIndex == 1)\r
-                query += " -p ";\r
-            else if (mainWindow.drp_anamorphic.SelectedIndex == 2)\r
-                query += " -P ";\r
-\r
-            if (mainWindow.slider_deblock.Value != 4)\r
-                query += " --deblock=" + mainWindow.slider_deblock.Value;\r
-\r
-            if (mainWindow.check_detelecine.Checked)\r
-                query += " --detelecine";\r
+            #region Filters\r
+            query += mainWindow.Filters.getCLIQuery;\r
             #endregion\r
 \r
-            // Video Settings Tab\r
             #region Video Settings Tab\r
 \r
             switch (mainWindow.drp_videoEncoder.Text)\r
@@ -177,9 +196,6 @@ namespace Handbrake.Functions
                 case "MPEG-4 (FFmpeg)":\r
                     query += " -e ffmpeg";\r
                     break;\r
-                case "MPEG-4 (XviD)":\r
-                    query += " -e xvid";\r
-                    break;\r
                 case "H.264 (x264)":\r
                     query += " -e x264";\r
                     break;\r
@@ -191,22 +207,34 @@ namespace Handbrake.Functions
                     break;\r
             }\r
 \r
-            if (mainWindow.check_grayscale.Checked)\r
-                query += " -g ";\r
-\r
             // Video Settings\r
-            if (mainWindow.text_bitrate.Text != "")\r
+            if (mainWindow.radio_avgBitrate.Checked)\r
                 query += " -b " + mainWindow.text_bitrate.Text;\r
 \r
-            if (mainWindow.text_filesize.Text != "")\r
+            if (mainWindow.radio_targetFilesize.Checked)\r
                 query += " -S " + mainWindow.text_filesize.Text;\r
 \r
             // Video Quality Setting\r
-            double videoQuality = mainWindow.slider_videoQuality.Value;\r
-            if (videoQuality != 0)\r
+            if (mainWindow.radio_cq.Checked)\r
             {\r
-                videoQuality = videoQuality / 100;\r
-                query += " -q " + videoQuality.ToString(new CultureInfo("en-US"));\r
+                double value;\r
+                switch (mainWindow.drp_videoEncoder.Text)\r
+                {\r
+                    case "MPEG-4 (FFmpeg)":\r
+                        value = 31 - (mainWindow.slider_videoQuality.Value - 1);\r
+                        query += " -q " + value.ToString(new CultureInfo("en-US"));\r
+                        break;\r
+                    case "H.264 (x264)":\r
+                        CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");\r
+                        value = 51 - mainWindow.slider_videoQuality.Value * Properties.Settings.Default.x264cqstep;\r
+                        value = Math.Round(value, 2);\r
+                        query += " -q " + value.ToString(culture);\r
+                        break;\r
+                    case "VP3 (Theora)":\r
+                        value = mainWindow.slider_videoQuality.Value;\r
+                        query += " -q " + value.ToString(new CultureInfo("en-US"));\r
+                        break;\r
+                }\r
             }\r
 \r
             if (mainWindow.check_2PassEncode.Checked)\r
@@ -217,249 +245,260 @@ namespace Handbrake.Functions
 \r
             if (mainWindow.drp_videoFramerate.Text != "Same as source")\r
                 query += " -r " + mainWindow.drp_videoFramerate.Text;\r
-\r
-            switch (mainWindow.drp_deNoise.Text)\r
-            {\r
-                case "None":\r
-                    query += "";\r
-                    break;\r
-                case "Weak":\r
-                    query += " --denoise=\"weak\"";\r
-                    break;\r
-                case "Medium":\r
-                    query += " --denoise=\"medium\"";\r
-                    break;\r
-                case "Strong":\r
-                    query += " --denoise=\"strong\"";\r
-                    break;\r
-                default:\r
-                    query += "";\r
-                    break;\r
-            }\r
             #endregion\r
 \r
-            // Audio Settings Tab\r
             #region Audio Settings Tab\r
-            // Track 1\r
-            string track1 = mainWindow.drp_track1Audio.Text;\r
-            string aencoder1 = mainWindow.drp_audenc_1.Text;\r
-            string audioBitrate1 = mainWindow.drp_audbit_1.Text;\r
-            string audioSampleRate1 = mainWindow.drp_audsr_1.Text;\r
-            string Mixdown1 = mainWindow.drp_audmix_1.Text;\r
-            string drc1 = mainWindow.trackBar1.Value.ToString();\r
-\r
-            // Track 2\r
-            string track2 = mainWindow.drp_track2Audio.Text;\r
-            string aencoder2 = mainWindow.drp_audenc_2.Text;\r
-            string audioBitrate2 = mainWindow.drp_audbit_2.Text;\r
-            string audioSampleRate2 = mainWindow.drp_audsr_2.Text;\r
-            string Mixdown2 = mainWindow.drp_audmix_2.Text;\r
-            string drc2 = mainWindow.trackBar2.Value.ToString();\r
-\r
-            // Track 3\r
-            string track3 = mainWindow.drp_track3Audio.Text;\r
-            string aencoder3 = mainWindow.drp_audenc_3.Text;\r
-            string audioBitrate3 = mainWindow.drp_audbit_3.Text;\r
-            string audioSampleRate3 = mainWindow.drp_audsr_3.Text;\r
-            string Mixdown3 = mainWindow.drp_audmix_3.Text;\r
-            string drc3 = mainWindow.trackBar3.Value.ToString();\r
-\r
-            // Track 4\r
-            string track4 = mainWindow.drp_track4Audio.Text;\r
-            string aencoder4 = mainWindow.drp_audenc_4.Text;\r
-            string audioBitrate4 = mainWindow.drp_audbit_4.Text;\r
-            string audioSampleRate4 = mainWindow.drp_audsr_4.Text;\r
-            string Mixdown4 = mainWindow.drp_audmix_4.Text;\r
-            string drc4 = mainWindow.trackBar4.Value.ToString();\r
-\r
-            //\r
-            // Audio Track Selections\r
-            //\r
-            if (track1 == "Automatic")\r
-                query += " -a 1";\r
-            else if (track1 != "None")\r
-            {\r
-                string[] tempSub = track1.Split(' ');\r
-                query += " -a " + tempSub[0];\r
-            }\r
 \r
-            if (track2 == "Automatic")\r
-                query += ",1";\r
-            else if (track2 != "None")\r
-            {\r
-                string[] tempSub;\r
-                tempSub = track2.Split(' ');\r
+            ListView audioTracks = mainWindow.AudioSettings.getAudioPanel();\r
+            List<string> tracks = new List<string>();\r
+            List<string> codecs = new List<string>();\r
+            List<string> mixdowns = new List<string>();\r
+            List<string> samplerates = new List<string>();\r
+            List<string> bitrates = new List<string>();\r
+            List<string> drcs = new List<string>();\r
 \r
-                if (track1 == "None")\r
-                    query += " -a none," + tempSub[0];\r
-                else\r
-                    query += "," + tempSub[0];\r
-            }\r
+            // No Audio\r
+            if (audioTracks.Items.Count == 0)\r
+                query += " -a none ";\r
 \r
-            if (track3 != "None")\r
+            // Gather information about each audio track and store them in the declared lists.\r
+            foreach (ListViewItem row in audioTracks.Items)\r
             {\r
-                string[] tempSub;\r
-                tempSub = track3.Split(' ');\r
-                query += "," + tempSub[0];\r
-            }\r
+                // Audio Track (-a)\r
+                if (row.SubItems[1].Text == "Automatic")\r
+                    tracks.Add("1");\r
+                else if (row.Text != "None")\r
+                {\r
+                    string[] tempSub = row.SubItems[1].Text.Split(' ');\r
+                    tracks.Add(tempSub[0]);\r
+                }\r
 \r
-            if (track4 != "None")\r
-            {\r
-                string[] tempSub;\r
-                tempSub = track4.Split(' ');\r
-                query += "," + tempSub[0];\r
-            }\r
+                // Audio Codec (-E)\r
+                if (row.SubItems[2].Text != String.Empty)\r
+                    codecs.Add(getAudioEncoder(row.SubItems[2].Text));\r
 \r
-            //\r
-            // Audio Encoder\r
-            //\r
-            if (aencoder1 != "")\r
-                query += " -E " + getAudioEncoder(aencoder1);\r
+                // Audio Mixdown (-6)\r
+                if (row.SubItems[3].Text != String.Empty)\r
+                    mixdowns.Add(getMixDown(row.SubItems[3].Text));\r
 \r
-            if (aencoder2 != "")\r
-            {\r
-                if (aencoder1 == string.Empty)\r
-                    query += " -E faac," + getAudioEncoder(aencoder2);\r
-                else\r
-                    query += "," + getAudioEncoder(aencoder2);\r
-            }\r
+                // Sample Rate (-R)\r
+                if (row.SubItems[4].Text != String.Empty)\r
+                    samplerates.Add(row.SubItems[4].Text.Replace("Auto", "Auto"));\r
 \r
-            if (aencoder3 != "")\r
-                query += "," + getAudioEncoder(aencoder3);\r
+                // Audio Bitrate (-B)\r
+                if (row.SubItems[5].Text != String.Empty)\r
+                    bitrates.Add(row.SubItems[5].Text.Replace("Auto", "auto"));\r
 \r
-            if (aencoder4 != "")\r
-                query += "," + getAudioEncoder(aencoder4);\r
+                // DRC (-D)\r
+                if (row.SubItems[6].Text != String.Empty)\r
+                    drcs.Add(row.SubItems[6].Text);\r
+            }\r
 \r
-            //\r
-            // Audio Bitrate Selections\r
-            //\r
-            if (audioBitrate1 != "")\r
-                query += " -B " + audioBitrate1;\r
+            // Audio Track (-a)\r
+            String audioItems = "";\r
+            Boolean firstLoop = true;\r
 \r
-            if (audioBitrate2 != "")\r
+            foreach (String item in tracks)\r
             {\r
-                if (audioBitrate1 == string.Empty)\r
-                    query += " -B 160," + audioBitrate2;\r
+                if (firstLoop)\r
+                {\r
+                    audioItems = item; firstLoop = false;\r
+                }\r
                 else\r
-                    query += "," + audioBitrate2;\r
+                    audioItems += "," + item;\r
             }\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -a " + audioItems;\r
+            firstLoop = true; audioItems = ""; // Reset for another pass.\r
 \r
-            if (audioBitrate3 != "")\r
-                query += "," + audioBitrate3;\r
-\r
-            if (audioBitrate4 != "")\r
-                query += "," + audioBitrate4;\r
-\r
+            // Audio Codec (-E)\r
+            foreach (String item in codecs)\r
+            {\r
 \r
-            //Audio Sample Rate   - audioSampleRate\r
-            if (audioSampleRate1 != "")\r
-                query += " -R " + audioSampleRate1.Replace("Auto", "0");\r
+                if (firstLoop)\r
+                {\r
+                    audioItems = item; firstLoop = false;\r
+                }\r
+                else\r
+                    audioItems += "," + item;\r
+            }\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -E " + audioItems;\r
+            firstLoop = true; audioItems = ""; // Reset for another pass.\r
 \r
-            if (audioSampleRate2 != "")\r
+            // Audio Mixdown (-6)\r
+            foreach (String item in mixdowns)\r
             {\r
-                if (audioSampleRate1 == string.Empty)\r
-                    query += " -R 0," + audioSampleRate2.Replace("Auto", "0");\r
+                if (firstLoop)\r
+                {\r
+                    audioItems = item; firstLoop = false;\r
+                }\r
                 else\r
-                    query += "," + audioSampleRate2.Replace("Auto", "0");\r
+                    audioItems += "," + item;\r
             }\r
-            else\r
-            {\r
-                // All this is a hack, because when AppleTV is selected, there is no sample rate selected. so just add a 48\r
-                // It should probably be setup later so the GUI widget has the value 48 in it.\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -6 " + audioItems;\r
+            firstLoop = true; audioItems = ""; // Reset for another pass.\r
 \r
-                if ((track2 != "") && (track2 != "None"))\r
+            // Sample Rate (-R)\r
+            foreach (String item in samplerates)\r
+            {\r
+                if (firstLoop)\r
                 {\r
-                    if (audioSampleRate1 == string.Empty)\r
-                        query += " -R 0,0";\r
-                    else\r
-                        query += ",0";\r
+                    audioItems = item; firstLoop = false;\r
                 }\r
+                else\r
+                    audioItems += "," + item;\r
             }\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -R " + audioItems;\r
+            firstLoop = true; audioItems = ""; // Reset for another pass.\r
 \r
-            if (audioSampleRate3 != "")\r
-                query += "," + audioSampleRate3.Replace("Auto", "0");\r
-\r
-            if (audioSampleRate4 != "")\r
-                query += "," + audioSampleRate4.Replace("Auto", "0");\r
+            // Audio Bitrate (-B)\r
+            foreach (String item in bitrates)\r
+            {\r
+                if (firstLoop)\r
+                {\r
+                    audioItems = item; firstLoop = false;\r
+                }\r
+                else\r
+                    audioItems += "," + item;\r
+            }\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -B " + audioItems;\r
+            firstLoop = true; audioItems = ""; // Reset for another pass.\r
 \r
-            //\r
-            // Audio Mixdown Selections\r
-            //\r
+            // DRC (-D)\r
+            foreach (String item in drcs)\r
+            {\r
+                if (firstLoop)\r
+                {\r
+                    audioItems = item; firstLoop = false;\r
+                }\r
+                else\r
+                    audioItems += "," + item;\r
+            }\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -D " + audioItems;\r
 \r
-            if (Mixdown1 != "")\r
-                query += " -6 " + getMixDown(Mixdown1);\r
-            else\r
-                query += " -6 dpl2";\r
+            #endregion\r
 \r
-            if (Mixdown2 != "" && track2 != "None")\r
-                query += "," + getMixDown(Mixdown2);\r
+            #region Subtitles Tab\r
+            if (mainWindow.Subtitles.lv_subList.Items.Count != 0) // If we have subtitle tracks\r
+            {\r
+                IDictionary<string, string> langMap = Main.mapLanguages();\r
 \r
-            if (Mixdown3 != "" && track3 != "None" && track2 != "None")\r
-                query += "," + getMixDown(Mixdown3);\r
+                // BitMap and CC's\r
+                string subtitleTracks = String.Empty;\r
+                string subtitleForced = String.Empty;\r
+                string subtitleBurn = String.Empty;\r
+                string subtitleDefault = String.Empty;\r
 \r
-            if (Mixdown4 != "" && track4 != "None" && track3 != "None")\r
-                query += "," + getMixDown(Mixdown4);\r
+                // SRT\r
+                string srtFile = String.Empty; \r
+                string srtCodeset = String.Empty;\r
+                string srtOffset = String.Empty; \r
+                string srtLang = String.Empty; \r
 \r
+                foreach (ListViewItem item in mainWindow.Subtitles.lv_subList.Items)\r
+                {\r
+                    string itemToAdd, trackID;\r
+\r
+                    if (item.SubItems.Count != 5) // We have an SRT file\r
+                    {\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
+\r
+                        itemToAdd = item.SubItems[5].Text;\r
+                        srtFile += srtFile == "" ? itemToAdd : "," + itemToAdd;\r
+\r
+                        itemToAdd = item.SubItems[6].Text;\r
+                        srtOffset += srtOffset == "" ? itemToAdd : "," + itemToAdd;\r
+                    }\r
+                    else // We have Bitmap or CC\r
+                    {\r
+                        string[] tempSub;\r
+        \r
+                        // Find --subtitle <string>\r
+                        if (item.SubItems[1].Text.Contains("Foreign Audio Search"))\r
+                            itemToAdd = "scan";\r
+                        else\r
+                        {\r
+                            tempSub = item.SubItems[1].Text.Split(' ');\r
+                            itemToAdd = tempSub[0];\r
+                        }\r
+\r
+                        subtitleTracks += subtitleTracks == "" ? itemToAdd : "," + itemToAdd;\r
+\r
+                        // Find --subtitle-forced\r
+                        itemToAdd = "";\r
+                        tempSub = item.SubItems[1].Text.Split(' ');\r
+                        trackID = tempSub[0];\r
+\r
+                        if (item.SubItems[2].Text == "Yes")\r
+                            itemToAdd = trackID;\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
+                            subtitleBurn = trackID;\r
+\r
+                        if (item.SubItems[4].Text == "Yes") // default\r
+                            subtitleDefault = trackID;\r
+                    }\r
+                }\r
 \r
-            //\r
-            // DRC\r
-            //\r
-            double value = 0;\r
+                // Build The CLI Subtitles Query\r
+                if (subtitleTracks != "")\r
+                {\r
+                    query += " --subtitle " + subtitleTracks;\r
+\r
+                    if (subtitleForced != "")\r
+                        query += " --subtitle-forced " + subtitleForced;\r
+                    if (subtitleBurn != "")\r
+                        query += " --subtitle-burn " + subtitleBurn;\r
+                    if (subtitleDefault != "")\r
+                        query += " --subtitle-default " + subtitleDefault;\r
+                }\r
 \r
-            value = mainWindow.trackBar1.Value / 10.0;\r
-            value++;\r
+                if (srtFile != "") // SRTs\r
+                {\r
+                    query += " --srt-file " + srtFile;\r
+\r
+                    if (srtCodeset != "")\r
+                        query += " --srt-codeset " + srtCodeset;\r
+                    if (srtOffset != "")\r
+                        query += " --srt-offset " + srtOffset;\r
+                    if (srtLang != "")\r
+                        query += " --srt-lang " + srtLang;\r
+                }\r
 \r
-            if (value > 1.0)\r
-                query += " -D " + value;\r
-            else\r
-                query += " -D 1";\r
-\r
-            value = mainWindow.trackBar2.Value / 10.0;\r
-            value++;\r
-            if (track2 != "None" && drc2 != "0")\r
-                query += "," + value;\r
-            else if (track2 != "None" && drc2 == "0")\r
-                query += ",1";\r
-\r
-            value = mainWindow.trackBar3.Value / 10.0;\r
-            value++;\r
-            if (track3 != "None" && drc3 != "0")\r
-                query += "," + value;\r
-            else if (track3 != "None" && drc3 == "0")\r
-                query += ",1";\r
-\r
-            value = mainWindow.trackBar4.Value / 10.0;\r
-            value++;\r
-            if (track4 != "None" && drc4 != "0")\r
-                query += "," + value;\r
-            else if (track4 != "None" && drc4 == "0")\r
-                query += ",1";\r
-\r
-            // Subtitles\r
-            string subtitles = mainWindow.drp_subtitle.Text;\r
-            if (subtitles == "Autoselect")\r
-                query += " -U ";\r
-            else if (subtitles != "" && subtitles != "None")\r
-            {\r
-                string[] tempSub;\r
-                tempSub = subtitles.Split(' ');\r
-                query += " -s " + tempSub[0];\r
             }\r
-\r
-            if (mainWindow.check_forced.Checked)\r
-                query += " -F ";\r
-\r
             #endregion\r
 \r
-            // Chapter Markers Tab\r
             #region Chapter Markers\r
 \r
             // Attach Source name and dvd title to the start of the chapters.csv filename.\r
             // This is for the queue. It allows different chapter name files for each title.\r
-            string source_name = mainWindow.text_source.Text;\r
-            string[] sourceName = source_name.Split('\\');\r
-            source_name = sourceName[sourceName.Length - 1];\r
-            source_name = source_name.Replace("\"", "");\r
+            string[] destName = mainWindow.text_destination.Text.Split('\\');\r
+            string dest_name = destName[destName.Length - 1];\r
+            dest_name = dest_name.Replace("\"", "");\r
+            dest_name = dest_name.Replace(".mp4", "").Replace(".m4v", "").Replace(".mkv", "");\r
 \r
             string source_title = mainWindow.drp_dvdtitle.Text;\r
             string[] titlesplit = source_title.Split(' ');\r
@@ -467,13 +506,11 @@ namespace Handbrake.Functions
 \r
             if (mainWindow.Check_ChapterMarkers.Checked)\r
             {\r
-                if ((source_name.Trim() != "Click 'Source' to continue") && (source_name.Trim() != ""))\r
+                if (dest_name.Trim() != String.Empty)\r
                 {\r
-                    string path = "";\r
-                    if (source_title != "Automatic")\r
-                        path = Path.Combine(Path.GetTempPath(), source_name + "-" + source_title + "-chapters.csv");\r
-                    else\r
-                        path = Path.Combine(Path.GetTempPath(), source_name + "-chapters.csv");\r
+                    string path = source_title != "Automatic"\r
+                                      ? Path.Combine(Path.GetTempPath(), dest_name + "-" + source_title + "-chapters.csv")\r
+                                      : Path.Combine(Path.GetTempPath(), dest_name + "-chapters.csv");\r
 \r
                     if (chapterCSVSave(mainWindow, path) == false)\r
                         query += " -m ";\r
@@ -485,36 +522,31 @@ namespace Handbrake.Functions
             }\r
             #endregion\r
 \r
-            // H264 Tab\r
             #region  H264 Tab\r
-            if (mainWindow.rtf_x264Query.Text != "")\r
-                query += " -x " + mainWindow.rtf_x264Query.Text;\r
+            if (mainWindow.x264Panel.x264Query != "")\r
+                query += " -x " + mainWindow.x264Panel.x264Query;\r
             #endregion\r
 \r
-            // Other\r
             #region Processors / Other\r
             string processors = Properties.Settings.Default.Processors;\r
             if (processors != "Automatic")\r
                 query += " -C " + processors + " ";\r
 \r
-            query += " -v ";\r
+            query += " -v " + Properties.Settings.Default.verboseLevel;\r
+\r
+            if (Properties.Settings.Default.dvdnav)\r
+                query += " --dvdnav";\r
             #endregion\r
 \r
             return query;\r
         }\r
 \r
-        /// <summary>\r
-        /// Get the CLI equive of the audio mixdown from the widget name.\r
-        /// </summary>\r
-        /// <param name="selectedAudio"></param>\r
-        /// <returns></returns>\r
-        /// \r
-        private string getMixDown(string selectedAudio)\r
+        private static string getMixDown(string selectedAudio)\r
         {\r
             switch (selectedAudio)\r
             {\r
                 case "Automatic":\r
-                    return "dpl2";\r
+                    return "auto";\r
                 case "Mono":\r
                     return "mono";\r
                 case "Stereo":\r
@@ -526,55 +558,42 @@ namespace Handbrake.Functions
                 case "6 Channel Discrete":\r
                     return "6ch";\r
                 default:\r
-                    return "dpl2";\r
+                    return "auto";\r
             }\r
         }\r
-\r
-        /// <summary>\r
-        /// Get the CLI equiv of the audio encoder from the widget name.\r
-        /// </summary>\r
-        /// <param name="selectedEncoder"></param>\r
-        /// <returns></returns>\r
-        /// \r
-        private string getAudioEncoder(string selectedEncoder)\r
+        private static string getAudioEncoder(string selectedEncoder)\r
         {\r
             switch (selectedEncoder)\r
             {\r
-                case "AAC":\r
+                case "AAC (faac)":\r
                     return "faac";\r
-                case "MP3":\r
+                case "MP3 (lame)":\r
                     return "lame";\r
-                case "Vorbis":\r
+                case "Vorbis (vorbis)":\r
                     return "vorbis";\r
-                case "AC3":\r
+                case "AC3 Passthru":\r
                     return "ac3";\r
+                case "DTS Passthru":\r
+                    return "dts";\r
                 default:\r
                     return "";\r
             }\r
         }\r
-\r
-        /// <summary>\r
-        /// This function saves the data in the chapters tab, dataGridView into a CSV file called chapters.csv\r
-        /// in a directory specified by file_path_name\r
-        /// </summary>\r
-        /// <param name="mainWindow"></param>\r
-        /// <param name="file_path_name"></param>\r
-        /// <returns></returns>\r
-        private Boolean chapterCSVSave(frmMain mainWindow, string file_path_name)\r
+        private static Boolean chapterCSVSave(frmMain mainWindow, string filePathName)\r
         {\r
             try\r
             {\r
-                StringBuilder csv = new StringBuilder();\r
+                string csv = "";\r
 \r
                 foreach (DataGridViewRow row in mainWindow.data_chpt.Rows)\r
                 {\r
-                    csv.Append(row.Cells[0].Value.ToString());\r
-                    csv.Append(",");\r
-                    csv.Append(row.Cells[1].Value.ToString());\r
-                    csv.Append(Environment.NewLine);\r
+                    csv += row.Cells[0].Value.ToString();\r
+                    csv += ",";\r
+                    csv += row.Cells[1].Value.ToString();\r
+                    csv += Environment.NewLine;\r
                 }\r
-                StreamWriter file = new StreamWriter(file_path_name);\r
-                file.Write(csv.ToString());\r
+                StreamWriter file = new StreamWriter(filePathName);\r
+                file.Write(csv);\r
                 file.Close();\r
                 file.Dispose();\r
                 return true;\r
@@ -582,9 +601,9 @@ namespace Handbrake.Functions
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show("Unable to save Chapter Makrers file! \nChapter marker names will NOT be saved in your encode \n\n" + exc.ToString(), "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+                MessageBox.Show("Unable to save Chapter Makrers file! \nChapter marker names will NOT be saved in your encode \n\n" + exc, "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
                 return false;\r
             }\r
         }\r
     }\r
-}\r
+}
\ No newline at end of file