OSDN Git Service

LinGui: make Help->Guide work on windows/mingw
[handbrake-jp/handbrake-jp-git.git] / win / C# / Functions / QueryGenerator.cs
index 3c15f73..e4557df 100644 (file)
@@ -1,35 +1,48 @@
 /*  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
+    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 full CLI query for either encoding or previe encoeds if duration and preview are defined.\r
         /// </summary>\r
-        /// <param name="mainWindow"></param>\r
-        /// <param name="mode"></param>\r
-        /// <param name="duration"></param>\r
-        /// <param name="preview"></param>\r
-        /// <returns></returns>\r
-        public string GenerateCLIQuery(frmMain mainWindow, int mode, int duration, string preview)\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
-            string query = "";\r
-            \r
-            if (!string.IsNullOrEmpty(mainWindow.sourcePath) && mainWindow.sourcePath.Trim() != "Select \"Source\" to continue")\r
+            string query = string.Empty;\r
+\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 != "")\r
+            if (mainWindow.drp_dvdtitle.Text != string.Empty)\r
             {\r
                 string[] titleInfo = mainWindow.drp_dvdtitle.Text.Split(' ');\r
                 query += " -t " + titleInfo[0];\r
@@ -42,10 +55,13 @@ namespace Handbrake.Functions
             switch (mode)\r
             {\r
                 case 0: // Chapters\r
-                    if (mainWindow.drop_chapterFinish.Text == mainWindow.drop_chapterStart.Text && mainWindow.drop_chapterStart.Text != "")\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 != "" && mainWindow.drop_chapterFinish.Text != "")\r
-                        query += string.Format(" -c {0}-{1}", mainWindow.drop_chapterStart.Text, mainWindow.drop_chapterFinish.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
@@ -67,7 +83,7 @@ namespace Handbrake.Functions
                     query += " --start-at-preview " + preview;\r
                     query += " --stop-at duration:" + duration + " ";\r
 \r
-                    if (mainWindow.text_destination.Text != "")\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
@@ -84,14 +100,15 @@ namespace Handbrake.Functions
         /// <summary>\r
         /// Generates part of the CLI query, for the tabbed components only.\r
         /// </summary>\r
-        /// <param name="mainWindow"></param>\r
-        /// <returns></returns>\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
             #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
@@ -102,38 +119,18 @@ namespace Handbrake.Functions
 \r
             if (mainWindow.check_optimiseMP4.Checked)\r
                 query += " -O ";\r
+\r
             #endregion\r
 \r
             #region Picture Settings Tab\r
 \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
+            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
-            // 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
+            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.PictureSettings.crop_top.Text;\r
             string cropBottom = mainWindow.PictureSettings.crop_bottom.Text;\r
@@ -156,11 +153,17 @@ namespace Handbrake.Functions
 \r
             switch (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex)\r
             {\r
+                case 0:\r
+                    if (mainWindow.PictureSettings.drp_modulus.SelectedIndex != 0)\r
+                        query += " --modulus " + mainWindow.PictureSettings.drp_modulus.SelectedItem;\r
+                    break;\r
                 case 1:\r
                     query += " --strict-anamorphic ";\r
                     break;\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
                 case 3:\r
                     query += " --custom-anamorphic ";\r
@@ -175,16 +178,18 @@ namespace Handbrake.Functions
                         query += " --keep-display-aspect ";\r
 \r
                     if (!mainWindow.PictureSettings.check_KeepAR.Checked)\r
-                        if (mainWindow.PictureSettings.updownParWidth.Text != "" && mainWindow.PictureSettings.updownParHeight.Text != "")\r
-                            query += " --pixel-aspect " + mainWindow.PictureSettings.updownParWidth.Text + ":" + mainWindow.PictureSettings.updownParHeight.Text + " ";\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
-            #endregion\r
 \r
-            #region Filters\r
-            query += mainWindow.Filters.getCLIQuery;\r
             #endregion\r
 \r
+            // Filters Panel\r
+            query += mainWindow.Filters.GetCliQuery;\r
+\r
             #region Video Settings Tab\r
 \r
             switch (mainWindow.drp_videoEncoder.Text)\r
@@ -223,7 +228,7 @@ namespace Handbrake.Functions
                         break;\r
                     case "H.264 (x264)":\r
                         CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");\r
-                        value = 51 - mainWindow.slider_videoQuality.Value * cqStep;\r
+                        value = 51 - (mainWindow.slider_videoQuality.Value * cqStep);\r
                         value = Math.Round(value, 2);\r
                         query += " -q " + value.ToString(culture);\r
                         break;\r
@@ -242,11 +247,12 @@ namespace Handbrake.Functions
 \r
             if (mainWindow.drp_videoFramerate.Text != "Same as source")\r
                 query += " -r " + mainWindow.drp_videoFramerate.Text;\r
+\r
             #endregion\r
 \r
             #region Audio Settings Tab\r
 \r
-            ListView audioTracks = mainWindow.AudioSettings.GetAudioPanel();\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
@@ -255,115 +261,124 @@ namespace Handbrake.Functions
             List<string> drcs = new List<string>();\r
 \r
             // No Audio\r
-            if (audioTracks.Items.Count == 0)\r
+            if (audioTracks.Rows.Count == 0)\r
                 query += " -a none ";\r
 \r
             // Gather information about each audio track and store them in the declared lists.\r
-            foreach (ListViewItem row in audioTracks.Items)\r
+            foreach (DataGridViewRow row in audioTracks.Rows)\r
             {\r
                 // Audio Track (-a)\r
-                if (row.SubItems[1].Text == "Automatic")\r
+                if (row.Cells[1].Value.ToString() == "Automatic")\r
                     tracks.Add("1");\r
-                else if (row.Text != "None")\r
+                else if (row.Cells[1].Value.ToString() != "None")\r
                 {\r
-                    string[] tempSub = row.SubItems[1].Text.Split(' ');\r
+                    string[] tempSub = row.Cells[1].Value.ToString().Split(' ');\r
                     tracks.Add(tempSub[0]);\r
                 }\r
 \r
                 // Audio Codec (-E)\r
-                if (row.SubItems[2].Text != String.Empty)\r
-                    codecs.Add(GetAudioEncoder(row.SubItems[2].Text));\r
+                if (row.Cells[2].Value.ToString() != String.Empty)\r
+                    codecs.Add(GetAudioEncoder(row.Cells[2].Value.ToString()));\r
 \r
                 // Audio Mixdown (-6)\r
-                if (row.SubItems[3].Text != String.Empty)\r
-                    mixdowns.Add(GetMixDown(row.SubItems[3].Text));\r
+                if (row.Cells[3].Value.ToString() != String.Empty)\r
+                    mixdowns.Add(GetMixDown(row.Cells[3].Value.ToString()));\r
 \r
                 // Sample Rate (-R)\r
-                if (row.SubItems[4].Text != String.Empty)\r
-                    samplerates.Add(row.SubItems[4].Text);\r
+                if (row.Cells[4].Value.ToString() != String.Empty)\r
+                    samplerates.Add(row.Cells[4].Value.ToString());\r
 \r
                 // Audio Bitrate (-B)\r
-                if (row.SubItems[5].Text != String.Empty)\r
-                    bitrates.Add(row.SubItems[5].Text.Replace("Auto", "auto"));\r
+                if (row.Cells[5].Value.ToString() != String.Empty)\r
+                    bitrates.Add(row.Cells[5].Value.ToString().Replace("Auto", "auto"));\r
 \r
                 // DRC (-D)\r
-                if (row.SubItems[6].Text != String.Empty)\r
-                    drcs.Add(row.SubItems[6].Text);\r
+                if (row.Cells[6].Value.ToString() != String.Empty)\r
+                    drcs.Add(row.Cells[6].Value.ToString());\r
             }\r
 \r
             // Audio Track (-a)\r
-            String audioItems = "";\r
-            Boolean firstLoop = true;\r
+            string audioItems = string.Empty;\r
+            bool firstLoop = true;\r
 \r
-            foreach (String item in tracks)\r
+            foreach (string item in tracks)\r
             {\r
                 if (firstLoop)\r
                 {\r
-                    audioItems = item; firstLoop = false;\r
+                    audioItems = item;\r
+                    firstLoop = false;\r
                 }\r
                 else\r
                     audioItems += "," + item;\r
             }\r
             if (audioItems.Trim() != String.Empty)\r
                 query += " -a " + audioItems;\r
-            firstLoop = true; audioItems = ""; // Reset for another pass.\r
+            firstLoop = true;\r
+            audioItems = string.Empty; // Reset for another pass.\r
 \r
             // Audio Codec (-E)\r
-            foreach (String item in codecs)\r
+            foreach (string item in codecs)\r
             {\r
-\r
                 if (firstLoop)\r
                 {\r
-                    audioItems = item; firstLoop = false;\r
+                    audioItems = item;\r
+                    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
+            firstLoop = true;\r
+            audioItems = string.Empty; // Reset for another pass.\r
 \r
             // Audio Mixdown (-6)\r
-            foreach (String item in mixdowns)\r
+            foreach (string item in mixdowns)\r
             {\r
                 if (firstLoop)\r
                 {\r
-                    audioItems = item; firstLoop = false;\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; audioItems = ""; // Reset for another pass.\r
+            firstLoop = true;\r
+            audioItems = string.Empty; // Reset for another pass.\r
 \r
             // Sample Rate (-R)\r
-            foreach (String item in samplerates)\r
+            foreach (string item in samplerates)\r
             {\r
                 if (firstLoop)\r
                 {\r
-                    audioItems = item; firstLoop = false;\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; audioItems = ""; // Reset for another pass.\r
+            firstLoop = true;\r
+            audioItems = string.Empty; // Reset for another pass.\r
 \r
             // Audio Bitrate (-B)\r
-            foreach (String item in bitrates)\r
+            foreach (string item in bitrates)\r
             {\r
                 if (firstLoop)\r
                 {\r
-                    audioItems = item; firstLoop = false;\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; audioItems = ""; // Reset for another pass.\r
+            firstLoop = true;\r
+            audioItems = string.Empty; // Reset for another pass.\r
 \r
             // DRC (-D)\r
             foreach (var itm in drcs)\r
@@ -371,7 +386,8 @@ namespace Handbrake.Functions
                 string item = itm.ToString(new CultureInfo("en-US"));\r
                 if (firstLoop)\r
                 {\r
-                    audioItems = item; firstLoop = false;\r
+                    audioItems = item;\r
+                    firstLoop = false;\r
                 }\r
                 else\r
                     audioItems += "," + item;\r
@@ -381,139 +397,31 @@ namespace Handbrake.Functions
 \r
             #endregion\r
 \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
-                // 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
-                // SRT\r
-                string srtFile = String.Empty;\r
-                string srtCodeset = String.Empty;\r
-                string srtOffset = String.Empty;\r
-                string srtLang = String.Empty;\r
-                string srtDefault = String.Empty;\r
-                int srtCount = 0;\r
-\r
-                List<Controls.SubtitleInfo> SubList = mainWindow.Subtitles.GetSubtitleInfoList();\r
-\r
-                foreach (var item in SubList)\r
-                {\r
-                    string itemToAdd, trackID;\r
-\r
-                    if (item.SrtPath != "-") // We have an SRT file\r
-                    {\r
-                        srtCount++; // SRT track id.\r
-\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.SrtPath;\r
-                        srtFile += srtFile == "" ? itemToAdd : "," + itemToAdd;\r
-\r
-                        itemToAdd = item.SrtOffset.ToString();\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.Track.Contains("Foreign Audio Search"))\r
-                            itemToAdd = "scan";\r
-                        else\r
-                        {\r
-                            tempSub = item.Track.Split(' ');\r
-                            itemToAdd = tempSub[0];\r
-                        }\r
-\r
-                        subtitleTracks += subtitleTracks == "" ? itemToAdd : "," + itemToAdd;\r
-\r
-                        // Find --subtitle-forced\r
-                        itemToAdd = "";\r
-                        tempSub = item.Track.Split(' ');\r
-                        trackID = tempSub[0];\r
-\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
-                        trackID = tempSub[0];\r
-\r
-                        if (trackID.Trim() == "Foreign")\r
-                            trackID = "scan";\r
-\r
-                        if (item.Burned == "Yes") // burn\r
-                            subtitleBurn = trackID;\r
-\r
-                        if (item.Default == "Yes") // default\r
-                            subtitleDefault = trackID;\r
-                    }\r
-                }\r
-\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
-                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
-                    if (srtDefault != "")\r
-                        query += " --srt-default=" + srtDefault;\r
-                }\r
-\r
-            }\r
-            #endregion\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[] 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
+            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 && mainWindow.Check_ChapterMarkers.Enabled)\r
             {\r
-                if (dest_name.Trim() != String.Empty)\r
+                if (destName.Trim() != String.Empty)\r
                 {\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
+                    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
@@ -521,27 +429,27 @@ namespace Handbrake.Functions
                 else\r
                     query += " -m";\r
             }\r
-            #endregion\r
 \r
-            #region  H264 Tab\r
-            if (mainWindow.x264Panel.x264Query != "")\r
-                query += " -x " + mainWindow.x264Panel.x264Query;\r
             #endregion\r
 \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
+            // Verbosity Level\r
             query += " -v " + Properties.Settings.Default.verboseLevel;\r
 \r
+            // LibDVDNav\r
             if (Properties.Settings.Default.noDvdNav)\r
                 query += " --no-dvdnav";\r
-            #endregion\r
 \r
             return query;\r
         }\r
 \r
+        /// <summary>\r
+        /// Return the CLI Mixdown name\r
+        /// </summary>\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
@@ -562,6 +470,16 @@ namespace Handbrake.Functions
                     return "auto";\r
             }\r
         }\r
+\r
+        /// <summary>\r
+        /// Get the CLI Audio Encoder name\r
+        /// </summary>\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
@@ -577,20 +495,27 @@ namespace Handbrake.Functions
                 case "DTS Passthru":\r
                     return "dts";\r
                 default:\r
-                    return "";\r
+                    return string.Empty;\r
             }\r
         }\r
-        private static Boolean ChapterCSVSave(frmMain mainWindow, string filePathName)\r
+\r
+        /// <summary>\r
+        /// Create a CSV file with the data from the Main Window Chapters tab\r
+        /// </summary>\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
-                string csv = "";\r
+                string csv = string.Empty;\r
 \r
                 foreach (DataGridViewRow row in mainWindow.data_chpt.Rows)\r
                 {\r
                     csv += row.Cells[0].Value.ToString();\r
                     csv += ",";\r
-                    csv += row.Cells[1].Value.ToString().Replace(",","\\,");\r
+                    csv += row.Cells[1].Value.ToString().Replace(",", "\\,");\r
                     csv += Environment.NewLine;\r
                 }\r
                 StreamWriter file = new StreamWriter(filePathName);\r