/* 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 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.sourcePath != "") && (mainWindow.sourcePath.Trim() != "Click 'Source' to continue"))\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 (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
- 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
-\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
+ if (!Properties.Settings.Default.noDvdNav && mainWindow.drop_angle.Items.Count != 0)\r
+ query += " --angle " + mainWindow.drop_angle.SelectedItem;\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
- /// <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, string duration, string preview)\r
- {\r
- int seconds;\r
- int.TryParse(duration, out seconds);\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
- // 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.sourcePath != "") && (mainWindow.sourcePath.Trim() != "Click 'Source' to continue"))\r
- query = " -i " + '"' + mainWindow.sourcePath + '"';\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
- 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") + '"';\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
- /// <returns></returns>\r
- public static 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
#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
\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.maxWidth == 0)\r
- {\r
-\r
- if (mainWindow.PictureSettings.text_width.Text != "")\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.Text != "")\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.maxHeight == 0)\r
- {\r
- if (mainWindow.PictureSettings.text_height.Text != "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.Text != "")\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
\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
- query += " --display-width " + mainWindow.PictureSettings.txt_displayWidth.Text + " ";\r
+\r
+ if (mainWindow.PictureSettings.drp_modulus.SelectedIndex != 0)\r
+ query += " --modulus " + mainWindow.PictureSettings.drp_modulus.SelectedItem;\r
+\r
+ if (mainWindow.PictureSettings.check_KeepAR.Checked)\r
+ query += " --display-width " + mainWindow.PictureSettings.updownDisplayWidth.Text + " ";\r
+\r
if (mainWindow.PictureSettings.check_KeepAR.Checked)\r
query += " --keep-display-aspect ";\r
- if (mainWindow.PictureSettings.txt_parWidth.Text != "" && mainWindow.PictureSettings.txt_parHeight.Text != "")\r
- query += " --pixel-aspect " + mainWindow.PictureSettings.txt_parWidth.Text + ":" + mainWindow.PictureSettings.txt_parHeight.Text + " ";\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
- #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
// Video Quality Setting\r
if (mainWindow.radio_cq.Checked)\r
{\r
+ double cqStep = Properties.Settings.Default.x264cqstep;\r
double value;\r
switch (mainWindow.drp_videoEncoder.Text)\r
{\r
query += " -q " + value.ToString(new CultureInfo("en-US"));\r
break;\r
case "H.264 (x264)":\r
- double divided = Properties.Settings.Default.x264cqstep;\r
- value = 51 - mainWindow.slider_videoQuality.Value * divided;\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(new CultureInfo("en-US"));\r
+ query += " -q " + value.ToString(culture);\r
break;\r
case "VP3 (Theora)":\r
value = mainWindow.slider_videoQuality.Value;\r
\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
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.Replace("Auto", "Auto"));\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 (String item in drcs)\r
+ foreach (var itm in drcs)\r
{\r
+ string item = itm.ToString(new CultureInfo("en-US"));\r
if (firstLoop)\r
{\r
- audioItems = item; firstLoop = false;\r
+ audioItems = item;\r
+ firstLoop = false;\r
}\r
else\r
audioItems += "," + item;\r
\r
#endregion\r
\r
- #region Subtitles Tab\r
-\r
- if (mainWindow.Subtitles.lv_subList.Items.Count != 0) // If we have subtitle tracks\r
- {\r
- // Find --subtitle <string>\r
- query += " --subtitle ";\r
- String subtitleTracks = "";\r
- String itemToAdd;\r
- foreach (ListViewItem item in mainWindow.Subtitles.lv_subList.Items)\r
- {\r
- if (item.SubItems[1].Text.Contains("Foreign Audio Search"))\r
- itemToAdd = "scan";\r
- else\r
- {\r
- string[] tempSub = item.SubItems[1].Text.Split(' ');\r
- itemToAdd = tempSub[0];\r
- }\r
-\r
- subtitleTracks += subtitleTracks == "" ? itemToAdd : "," + itemToAdd;\r
- }\r
- query += subtitleTracks;\r
-\r
-\r
- // Find --subtitle-forced\r
- String forcedTrack = "";\r
- foreach (ListViewItem item in mainWindow.Subtitles.lv_subList.Items)\r
- {\r
- itemToAdd = "";\r
- string[] tempSub = item.SubItems[1].Text.Split(' ');\r
- string trackID = tempSub[0];\r
-\r
- if (item.SubItems[2].Text == "Yes")\r
- itemToAdd = trackID;\r
-\r
- if (itemToAdd != "")\r
- forcedTrack += forcedTrack == "" ? itemToAdd : "," + itemToAdd;\r
- }\r
- if (forcedTrack != "")\r
- query += " --subtitle-forced " + forcedTrack;\r
-\r
-\r
- // Find --subtitle-burn and --subtitle-default\r
- String burned = "";\r
- String defaultTrack = "";\r
- foreach (ListViewItem item in mainWindow.Subtitles.lv_subList.Items)\r
- {\r
- string[] tempSub = item.SubItems[1].Text.Split(' ');\r
- string trackID = tempSub[0];\r
-\r
- if (trackID.Trim() == "Foreign")\r
- trackID = "scan";\r
-\r
- if (item.SubItems[3].Text == "Yes") // Burned\r
- burned = trackID;\r
-\r
- if (item.SubItems[4].Text == "Yes") // Burned\r
- defaultTrack = trackID;\r
-\r
- }\r
- if (burned != "")\r
- query += " --subtitle-burn " + burned;\r
-\r
- if (defaultTrack != "")\r
- query += " --subtitle-default " + defaultTrack;\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)\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
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
- if (Properties.Settings.Default.dvdnav)\r
- query += " --dvdnav";\r
- #endregion\r
+ // LibDVDNav\r
+ if (Properties.Settings.Default.noDvdNav)\r
+ query += " --no-dvdnav";\r
\r
return query;\r
}\r
\r
- private static string getMixDown(string selectedAudio)\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
{\r
return "auto";\r
}\r
}\r
- private static string getAudioEncoder(string selectedEncoder)\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
{\r
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();\r
+ csv += row.Cells[1].Value.ToString().Replace(",", "\\,");\r
csv += Environment.NewLine;\r
}\r
StreamWriter file = new StreamWriter(filePathName);\r
file.Close();\r
file.Dispose();\r
return true;\r
-\r
}\r
catch (Exception exc)\r
{\r
OSDN Git Service
