OSDN Git Service

LinGui: make Help->Guide work on windows/mingw
[handbrake-jp/handbrake-jp-git.git] / win / C# / Functions / QueryGenerator.cs
index aa4bdd3..e4557df 100644 (file)
-using System;\r
-using System.Collections;\r
-using System.Text;\r
-using System.Windows.Forms;\r
-using System.Globalization;\r
-using System.IO;\r
+/*  QueryGenerator.cs $\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
 namespace Handbrake.Functions\r
 {\r
-    class QueryGenerator\r
+    using System;\r
+    using System.Collections.Generic;\r
+    using System.Globalization;\r
+    using System.IO;\r
+    using System.Windows.Forms;\r
+\r
+    /// <summary>\r
+    /// Generate a CLI Query for HandBrakeCLI\r
+    /// </summary>\r
+    public class QueryGenerator\r
     {\r
         /// <summary>\r
-        /// Generates a CLI query based on the GUI widgets.\r
+        /// Generates a full CLI query for either encoding or previe encoeds if duration and preview are defined.\r
         /// </summary>\r
-        /// <param name="mainWindow"></param>\r
-        /// <returns>The CLI String</returns>\r
-        public string GenerateTheQuery(frmMain mainWindow)\r
+        /// <param name="mainWindow">\r
+        /// The Main Window\r
+        /// </param>\r
+        /// <param name="mode">\r
+        /// What Mode. (Point to Point Encoding)  Chapters, Seconds, Frames OR Preview Encode\r
+        /// </param>\r
+        /// <param name="duration">\r
+        /// Time in seconds for preview mode\r
+        /// </param>\r
+        /// <param name="preview">\r
+        /// Preview --start-at-preview (int) \r
+        /// </param>\r
+        /// <returns>\r
+        /// CLI Query \r
+        /// </returns>\r
+        public static string GenerateCliQuery(frmMain mainWindow, int mode, int duration, string preview)\r
         {\r
-            // Source tab\r
-            string query = "";\r
+            string query = string.Empty;\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
+                mainWindow.sourcePath.Trim() != "Select \"Source\" to continue")\r
+                query = " -i " + '"' + mainWindow.sourcePath + '"';\r
 \r
-            if (mainWindow.drp_dvdtitle.Text != "Automatic")\r
+            if (mainWindow.drp_dvdtitle.Text != string.Empty)\r
             {\r
                 string[] titleInfo = mainWindow.drp_dvdtitle.Text.Split(' ');\r
                 query += " -t " + titleInfo[0];\r
             }\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
-                query += " -c " + "0-" + mainWindow.drop_chapterFinish.Text;\r
-            else if (mainWindow.drop_chapterStart.Text != "Auto" && mainWindow.drop_chapterFinish.Text != "Auto")\r
-                query += " -c " + mainWindow.drop_chapterStart.Text + "-" + mainWindow.drop_chapterFinish.Text;\r
+            if (!Properties.Settings.Default.noDvdNav && mainWindow.drop_angle.Items.Count != 0)\r
+                query += " --angle " + mainWindow.drop_angle.SelectedItem;\r
 \r
-            // Destination tab\r
-            if (mainWindow.text_destination.Text != "")\r
-                query += " -o " + '"' + mainWindow.text_destination.Text + '"';\r
-\r
-            query += generateTabbedComponentsQuery(mainWindow);\r
-            return query;\r
-        }\r
+            // Decide what part of the video we want to encode.\r
+            switch (mode)\r
+            {\r
+                case 0: // Chapters\r
+                    if (mainWindow.drop_chapterFinish.Text == mainWindow.drop_chapterStart.Text &&\r
+                        mainWindow.drop_chapterStart.Text != string.Empty)\r
+                        query += string.Format(" -c {0}", mainWindow.drop_chapterStart.Text);\r
+                    else if (mainWindow.drop_chapterStart.Text != string.Empty &&\r
+                             mainWindow.drop_chapterFinish.Text != string.Empty)\r
+                        query += string.Format(" -c {0}-{1}", mainWindow.drop_chapterStart.Text,\r
+                                               mainWindow.drop_chapterFinish.Text);\r
+                    break;\r
+                case 1: // Seconds\r
+                    int start, end;\r
+                    int.TryParse(mainWindow.drop_chapterStart.Text, out start);\r
+                    int.TryParse(mainWindow.drop_chapterFinish.Text, out end);\r
+                    int calculatedDuration = end - start;\r
 \r
-        /// <summary>\r
-        /// Generates a CLI query for the preview function.\r
-        /// This basically forces a shortened version of the encdode.\r
-        /// </summary>\r
-        /// <param name="mainWindow"></param>\r
-        /// <returns>Returns a CLI query String.</returns>\r
-        public string GeneratePreviewQuery(frmMain mainWindow)\r
-        {\r
-            // Source tab\r
-            string query = "";\r
+                    query += string.Format(" --start-at duration:{0} --stop-at duration:{1}", mainWindow.drop_chapterStart.Text, calculatedDuration);\r
+                    break;\r
+                case 2: // Frames\r
+                    int.TryParse(mainWindow.drop_chapterStart.Text, out start);\r
+                    int.TryParse(mainWindow.drop_chapterFinish.Text, out end);\r
+                    calculatedDuration = end - start;\r
 \r
-            if ((mainWindow.text_source.Text != "") && (mainWindow.text_source.Text.Trim() != "Click 'Source' to continue"))\r
-                query = " -i " + '"' + mainWindow.text_source.Text + '"';\r
+                    query += string.Format(" --start-at frame:{0} --stop-at frame:{1}", mainWindow.drop_chapterStart.Text, calculatedDuration);\r
+                    break;\r
+                case 3: // Preview\r
+                    query += " --previews " + Properties.Settings.Default.previewScanCount + " ";\r
+                    query += " --start-at-preview " + preview;\r
+                    query += " --stop-at duration:" + duration + " ";\r
 \r
-            if (mainWindow.drp_dvdtitle.Text != "Automatic")\r
-            {\r
-                string[] titleInfo = mainWindow.drp_dvdtitle.Text.Split(' ');\r
-                query += " -t " + titleInfo[0];\r
+                    if (mainWindow.text_destination.Text != string.Empty)\r
+                        query += string.Format(" -o \"{0}\" ", mainWindow.text_destination.Text.Replace(".m", "_sample.m"));\r
+                    break;\r
+                default:\r
+                    break;\r
             }\r
+            if (mode != 3)\r
+                query += string.Format(" -o \"{0}\" ", mainWindow.text_destination.Text);\r
 \r
-            query += " -c 2";\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 += GenerateTabbedComponentsQuery(mainWindow);\r
 \r
-            query += generateTabbedComponentsQuery(mainWindow);\r
             return query;\r
         }\r
 \r
         /// <summary>\r
         /// 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
+        /// <param name="mainWindow">frmMain the main window</param>\r
+        /// <returns>The CLI Query for the Tab Screens on the main window</returns>\r
+        public static string GenerateTabbedComponentsQuery(frmMain mainWindow)\r
         {\r
-            string query = "";\r
+            string query = string.Empty;\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
+            query += " -f " + mainWindow.drop_format.Text.ToLower().Replace(" file", string.Empty);\r
 \r
             // These are output settings features\r
             if (mainWindow.check_largeFile.Checked)\r
@@ -96,80 +119,77 @@ namespace Handbrake.Functions
 \r
             if (mainWindow.check_optimiseMP4.Checked)\r
                 query += " -O ";\r
+\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
+            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
-            if (mainWindow.text_height.Text != "")\r
-                query += " -l " + mainWindow.text_height.Text;\r
+            if (mainWindow.PictureSettings.text_height.Value != 0 && mainWindow.PictureSettings.text_height.Text != string.Empty)\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
-            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
-                    break;\r
-                case "Fast":\r
-                    query += " --deinterlace=\"fast\"";\r
-                    break;\r
-                case "Slow":\r
-                    query += " --deinterlace=\"slow\"";\r
+                case 0:\r
+                    if (mainWindow.PictureSettings.drp_modulus.SelectedIndex != 0)\r
+                        query += " --modulus " + mainWindow.PictureSettings.drp_modulus.SelectedItem;\r
                     break;\r
-                case "Slower":\r
-                    query += " --deinterlace=\"slower\"";\r
+                case 1:\r
+                    query += " --strict-anamorphic ";\r
                     break;\r
-                case "Slowest":\r
-                    query += " --deinterlace=\"slowest\"";\r
-                    break;\r
-                default:\r
-                    query += "";\r
+                case 2:\r
+                    query += " --loose-anamorphic ";\r
+                    if (mainWindow.PictureSettings.drp_modulus.SelectedIndex != 0)\r
+                        query += " --modulus " + mainWindow.PictureSettings.drp_modulus.SelectedItem;\r
                     break;\r
-            }\r
+                case 3:\r
+                    query += " --custom-anamorphic ";\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
+                    if (mainWindow.PictureSettings.drp_modulus.SelectedIndex != 0)\r
+                        query += " --modulus " + mainWindow.PictureSettings.drp_modulus.SelectedItem;\r
 \r
-            if (mainWindow.drp_anamorphic.SelectedIndex == 1)\r
-                query += " -p ";\r
-            else if (mainWindow.drp_anamorphic.SelectedIndex == 2)\r
-                query += " -P ";\r
+                    if (mainWindow.PictureSettings.check_KeepAR.Checked)\r
+                        query += " --display-width " + mainWindow.PictureSettings.updownDisplayWidth.Text + " ";\r
 \r
-            if (mainWindow.slider_deblock.Value != 4)\r
-                query += " --deblock=" + mainWindow.slider_deblock.Value;\r
+                    if (mainWindow.PictureSettings.check_KeepAR.Checked)\r
+                        query += " --keep-display-aspect ";\r
+\r
+                    if (!mainWindow.PictureSettings.check_KeepAR.Checked)\r
+                        if (mainWindow.PictureSettings.updownParWidth.Text != string.Empty &&\r
+                            mainWindow.PictureSettings.updownParHeight.Text != string.Empty)\r
+                            query += " --pixel-aspect " + mainWindow.PictureSettings.updownParWidth.Text + ":" +\r
+                                     mainWindow.PictureSettings.updownParHeight.Text + " ";\r
+                    break;\r
+            }\r
 \r
-            if (mainWindow.check_detelecine.Checked)\r
-                query += " --detelecine";\r
             #endregion\r
 \r
-            // Video Settings Tab\r
+            // Filters Panel\r
+            query += mainWindow.Filters.GetCliQuery;\r
+\r
             #region Video Settings Tab\r
 \r
             switch (mainWindow.drp_videoEncoder.Text)\r
@@ -177,9 +197,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 +208,35 @@ 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 cqStep = Properties.Settings.Default.x264cqstep;\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 * cqStep);\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
@@ -218,264 +248,180 @@ namespace Handbrake.Functions
             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
+            DataGridView 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.Rows.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 (DataGridViewRow row in audioTracks.Rows)\r
             {\r
-                string[] tempSub;\r
-                tempSub = track3.Split(' ');\r
-                query += "," + tempSub[0];\r
-            }\r
+                // Audio Track (-a)\r
+                if (row.Cells[1].Value.ToString() == "Automatic")\r
+                    tracks.Add("1");\r
+                else if (row.Cells[1].Value.ToString() != "None")\r
+                {\r
+                    string[] tempSub = row.Cells[1].Value.ToString().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.Cells[2].Value.ToString() != String.Empty)\r
+                    codecs.Add(GetAudioEncoder(row.Cells[2].Value.ToString()));\r
 \r
-            //\r
-            // Audio Encoder\r
-            //\r
-            if (aencoder1 != "")\r
-                query += " -E " + getAudioEncoder(aencoder1);\r
+                // Audio Mixdown (-6)\r
+                if (row.Cells[3].Value.ToString() != String.Empty)\r
+                    mixdowns.Add(GetMixDown(row.Cells[3].Value.ToString()));\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.Cells[4].Value.ToString() != String.Empty)\r
+                    samplerates.Add(row.Cells[4].Value.ToString());\r
 \r
-            if (aencoder3 != "")\r
-                query += "," + getAudioEncoder(aencoder3);\r
+                // Audio Bitrate (-B)\r
+                if (row.Cells[5].Value.ToString() != String.Empty)\r
+                    bitrates.Add(row.Cells[5].Value.ToString().Replace("Auto", "auto"));\r
 \r
-            if (aencoder4 != "")\r
-                query += "," + getAudioEncoder(aencoder4);\r
+                // DRC (-D)\r
+                if (row.Cells[6].Value.ToString() != String.Empty)\r
+                    drcs.Add(row.Cells[6].Value.ToString());\r
+            }\r
 \r
-            //\r
-            // Audio Bitrate Selections\r
-            //\r
-            if (audioBitrate1 != "")\r
-                query += " -B " + audioBitrate1;\r
+            // Audio Track (-a)\r
+            string audioItems = string.Empty;\r
+            bool 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;\r
+                    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;\r
+            audioItems = string.Empty; // Reset for another pass.\r
 \r
-            if (audioBitrate3 != "")\r
-                query += "," + audioBitrate3;\r
-\r
-            if (audioBitrate4 != "")\r
-                query += "," + audioBitrate4;\r
-\r
-\r
-            //Audio Sample Rate   - audioSampleRate\r
-            if (audioSampleRate1 != "")\r
-                query += " -R " + audioSampleRate1.Replace("Auto", "0");\r
-\r
-            if (audioSampleRate2 != "")\r
+            // Audio Codec (-E)\r
+            foreach (string item in codecs)\r
             {\r
-                if (audioSampleRate1 == string.Empty)\r
-                    query += " -R 0," + audioSampleRate2.Replace("Auto", "0");\r
+                if (firstLoop)\r
+                {\r
+                    audioItems = item;\r
+                    firstLoop = false;\r
+                }\r
                 else\r
-                    query += "," + audioSampleRate2.Replace("Auto", "0");\r
+                    audioItems += "," + item;\r
             }\r
-            else\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -E " + audioItems;\r
+            firstLoop = true;\r
+            audioItems = string.Empty; // Reset for another pass.\r
+\r
+            // Audio Mixdown (-6)\r
+            foreach (string item in mixdowns)\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 (firstLoop)\r
+                {\r
+                    audioItems = item;\r
+                    firstLoop = false;\r
+                }\r
+                else\r
+                    audioItems += "," + item;\r
+            }\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -6 " + audioItems;\r
+            firstLoop = true;\r
+            audioItems = string.Empty; // 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;\r
+                    firstLoop = false;\r
                 }\r
+                else\r
+                    audioItems += "," + item;\r
             }\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -R " + audioItems;\r
+            firstLoop = true;\r
+            audioItems = string.Empty; // 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
-\r
-            //\r
-            // Audio Mixdown Selections\r
-            //\r
-\r
-            if (Mixdown1 != "")\r
-                query += " -6 " + getMixDown(Mixdown1);\r
-            else\r
-                query += " -6 dpl2";\r
-\r
-            if (Mixdown2 != "" && track2 != "None")\r
-                query += "," + getMixDown(Mixdown2);\r
-\r
-            if (Mixdown3 != "" && track3 != "None" && track2 != "None")\r
-                query += "," + getMixDown(Mixdown3);\r
-\r
-            if (Mixdown4 != "" && track4 != "None" && track3 != "None")\r
-                query += "," + getMixDown(Mixdown4);\r
-\r
-\r
-            //\r
-            // DRC\r
-            //\r
-            double value = 0;\r
-\r
-            value = mainWindow.trackBar1.Value / 10.0;\r
-            value++;\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
+            // Audio Bitrate (-B)\r
+            foreach (string item in bitrates)\r
             {\r
-                string[] tempSub;\r
-                tempSub = subtitles.Split(' ');\r
-                query += " -s " + tempSub[0];\r
+                if (firstLoop)\r
+                {\r
+                    audioItems = item;\r
+                    firstLoop = false;\r
+                }\r
+                else\r
+                    audioItems += "," + item;\r
             }\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -B " + audioItems;\r
+            firstLoop = true;\r
+            audioItems = string.Empty; // Reset for another pass.\r
 \r
-            if (mainWindow.check_forced.Checked)\r
-                query += " -F ";\r
+            // DRC (-D)\r
+            foreach (var itm in drcs)\r
+            {\r
+                string item = itm.ToString(new CultureInfo("en-US"));\r
+                if (firstLoop)\r
+                {\r
+                    audioItems = item;\r
+                    firstLoop = false;\r
+                }\r
+                else\r
+                    audioItems += "," + item;\r
+            }\r
+            if (audioItems.Trim() != String.Empty)\r
+                query += " -D " + audioItems;\r
 \r
             #endregion\r
 \r
-            // Chapter Markers Tab\r
+            // Subtitles Panel\r
+            query += mainWindow.Subtitles.GetCliQuery;\r
+\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[] destNameSplit = mainWindow.text_destination.Text.Split('\\');\r
+            string destName = destNameSplit[destNameSplit.Length - 1];\r
+            destName = destName.Replace("\"", string.Empty);\r
+            destName = destName.Replace(".mp4", string.Empty).Replace(".m4v", string.Empty).Replace(".mkv", string.Empty);\r
 \r
-            string source_title = mainWindow.drp_dvdtitle.Text;\r
-            string[] titlesplit = source_title.Split(' ');\r
-            source_title = titlesplit[0];\r
+            string sourceTitle = mainWindow.drp_dvdtitle.Text;\r
+            string[] titlesplit = sourceTitle.Split(' ');\r
+            sourceTitle = titlesplit[0];\r
 \r
-            if (mainWindow.Check_ChapterMarkers.Checked)\r
+            if (mainWindow.Check_ChapterMarkers.Checked && mainWindow.Check_ChapterMarkers.Enabled)\r
             {\r
-                if ((source_name.Trim() != "Click 'Source' to continue") && (source_name.Trim() != ""))\r
+                if (destName.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 = sourceTitle != "Automatic"\r
+                                      ? Path.Combine(Path.GetTempPath(), destName + "-" + sourceTitle + "-chapters.csv")\r
+                                      : Path.Combine(Path.GetTempPath(), destName + "-chapters.csv");\r
 \r
-                    if (chapterCSVSave(mainWindow, path) == false)\r
+                    if (ChapterCsvSave(mainWindow, path) == false)\r
                         query += " -m ";\r
                     else\r
                         query += " --markers=" + "\"" + path + "\"";\r
@@ -483,38 +429,33 @@ namespace Handbrake.Functions
                 else\r
                     query += " -m";\r
             }\r
-            #endregion\r
 \r
-            // H264 Tab\r
-            #region  H264 Tab\r
-            if (mainWindow.rtf_x264Query.Text != "")\r
-                query += " -x " + mainWindow.rtf_x264Query.Text;\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
+            // X264 Panel\r
+            query += " -x " + mainWindow.x264Panel.X264Query;\r
 \r
-            query += " -v ";\r
-            #endregion\r
+            // Verbosity Level\r
+            query += " -v " + Properties.Settings.Default.verboseLevel;\r
+\r
+            // LibDVDNav\r
+            if (Properties.Settings.Default.noDvdNav)\r
+                query += " --no-dvdnav";\r
 \r
             return query;\r
         }\r
 \r
         /// <summary>\r
-        /// Get the CLI equive of the audio mixdown from the widget name.\r
+        /// Return the CLI Mixdown name\r
         /// </summary>\r
-        /// <param name="selectedAudio"></param>\r
-        /// <returns></returns>\r
-        /// \r
-        private string getMixDown(string selectedAudio)\r
+        /// <param name="selectedAudio">GUI mixdown name</param>\r
+        /// <returns>CLI mixdown name</returns>\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,65 +467,68 @@ 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
+        /// Get the CLI Audio Encoder name\r
         /// </summary>\r
-        /// <param name="selectedEncoder"></param>\r
-        /// <returns></returns>\r
-        /// \r
-        private string getAudioEncoder(string selectedEncoder)\r
+        /// <param name="selectedEncoder">\r
+        /// String The GUI Encode name\r
+        /// </param>\r
+        /// <returns>\r
+        /// String CLI encoder name\r
+        /// </returns>\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
+                    return string.Empty;\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
+        /// Create a CSV file with the data from the Main Window Chapters tab\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
+        /// <param name="mainWindow">Main Window</param>\r
+        /// <param name="filePathName">Path to save the csv file</param>\r
+        /// <returns>True if successful </returns>\r
+        private static bool ChapterCsvSave(frmMain mainWindow, string filePathName)\r
         {\r
             try\r
             {\r
-                StringBuilder csv = new StringBuilder();\r
+                string csv = string.Empty;\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().Replace(",", "\\,");\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
-\r
             }\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