/// <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="duration"></param>\r
- /// <param name="preview"></param>\r
- /// <returns></returns>\r
- public string generateCLIQuery(frmMain mainWindow, int duration, string preview)\r
+ /// <param name="mainWindow">The Main Window</param>\r
+ /// <param name="mode">What Mode. (Point to Point Encoding) Chapters, Seconds, Frames OR Preview Encode</param>\r
+ /// <param name="duration">time in seconds for preview mode</param>\r
+ /// <param name="preview"> --start-at-preview (int) </param>\r
+ /// <returns>CLI Query </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))\r
- if (mainWindow.sourcePath.Trim() != "Select \"Source\" to continue")\r
- query = " -i " + '"' + mainWindow.sourcePath + '"';\r
+ \r
+ if (!string.IsNullOrEmpty(mainWindow.sourcePath) && mainWindow.sourcePath.Trim() != "Select \"Source\" to continue")\r
+ query = " -i " + '"' + mainWindow.sourcePath + '"';\r
\r
if (mainWindow.drp_dvdtitle.Text != "")\r
{\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 (!Properties.Settings.Default.noDvdNav && mainWindow.drop_angle.Items.Count != 0)\r
+ query += " --angle " + mainWindow.drop_angle.SelectedItem;\r
\r
- if (duration != 0 && preview != null) // Preivew Query\r
+ // Decide what part of the video we want to encode.\r
+ switch (mode)\r
{\r
- query += " --start-at-preview " + preview;\r
- query += " --stop-at duration:" + duration + " ";\r
+ case 0: // Chapters\r
+ if (mainWindow.drop_chapterFinish.Text == mainWindow.drop_chapterStart.Text && mainWindow.drop_chapterStart.Text != "")\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
+ 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
- if (mainWindow.text_destination.Text != "")\r
- query += " -o " + '"' + mainWindow.text_destination.Text.Replace(".m", "_sample.m") + '"';\r
- }\r
- else // Non Preview Query\r
- {\r
- if (mainWindow.drop_chapterFinish.Text == mainWindow.drop_chapterStart.Text && mainWindow.drop_chapterStart.Text != "")\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" && mainWindow.drop_chapterStart.Text != "")\r
- query += " -c " + mainWindow.drop_chapterStart.Text + "-" + mainWindow.drop_chapterFinish.Text;\r
-\r
- if (mainWindow.text_destination.Text != "")\r
- query += " -o " + '"' + mainWindow.text_destination.Text + '"';\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
+ 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.text_destination.Text != "")\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 += generateTabbedComponentsQuery(mainWindow);\r
+ query += GenerateTabbedComponentsQuery(mainWindow);\r
\r
return query;\r
}\r
/// </summary>\r
/// <param name="mainWindow"></param>\r
/// <returns></returns>\r
- public static string generateTabbedComponentsQuery(frmMain mainWindow)\r
+ public static string GenerateTabbedComponentsQuery(frmMain mainWindow)\r
{\r
string query = "";\r
\r
break;\r
case 3:\r
query += " --custom-anamorphic ";\r
- query += " --display-width " + mainWindow.PictureSettings.updownDisplayWidth.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
\r
#endregion\r
\r
#region Filters\r
- query += mainWindow.Filters.getCLIQuery;\r
+ query += mainWindow.Filters.GetCLIQuery;\r
#endregion\r
\r
#region Video Settings Tab\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
break;\r
case "H.264 (x264)":\r
CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");\r
- value = 51 - mainWindow.slider_videoQuality.Value * Properties.Settings.Default.x264cqstep;\r
+ value = 51 - mainWindow.slider_videoQuality.Value * cqStep;\r
value = Math.Round(value, 2);\r
query += " -q " + value.ToString(culture);\r
break;\r
\r
#region Audio Settings Tab\r
\r
- ListView audioTracks = mainWindow.AudioSettings.getAudioPanel();\r
+ ListView audioTracks = mainWindow.AudioSettings.GetAudioPanel();\r
List<string> tracks = new List<string>();\r
List<string> codecs = new List<string>();\r
List<string> mixdowns = new List<string>();\r
\r
// Audio Codec (-E)\r
if (row.SubItems[2].Text != String.Empty)\r
- codecs.Add(getAudioEncoder(row.SubItems[2].Text));\r
+ codecs.Add(GetAudioEncoder(row.SubItems[2].Text));\r
\r
// Audio Mixdown (-6)\r
if (row.SubItems[3].Text != String.Empty)\r
- mixdowns.Add(getMixDown(row.SubItems[3].Text));\r
+ mixdowns.Add(GetMixDown(row.SubItems[3].Text));\r
\r
// Sample Rate (-R)\r
if (row.SubItems[4].Text != String.Empty)\r
- samplerates.Add(row.SubItems[4].Text.Replace("Auto", "Auto"));\r
+ samplerates.Add(row.SubItems[4].Text);\r
\r
// Audio Bitrate (-B)\r
if (row.SubItems[5].Text != String.Empty)\r
firstLoop = true; audioItems = ""; // 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
#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
+ IDictionary<string, string> langMap = Main.MapLanguages();\r
\r
// BitMap and CC's\r
string subtitleTracks = String.Empty;\r
string srtDefault = String.Empty;\r
int srtCount = 0;\r
\r
- foreach (ListViewItem item in mainWindow.Subtitles.lv_subList.Items)\r
+ List<Controls.SubtitleInfo> SubList = mainWindow.Subtitles.GetSubtitleInfoList();\r
+\r
+ foreach (var item in SubList)\r
{\r
string itemToAdd, trackID;\r
\r
- if (item.SubItems.Count != 5) // We have an SRT file\r
+ if (item.SrtPath != "-") // We have an SRT file\r
{\r
srtCount++; // SRT track id.\r
- string[] trackData = item.SubItems[1].Text.Split(',');\r
- if (trackData != null)\r
- {\r
- string charCode = trackData[1].Replace("(", "").Replace(")", "").Trim();\r
- string realLangCode = langMap[trackData[0].Trim()];\r
\r
- srtLang += srtLang == "" ? realLangCode : "," + realLangCode;\r
- srtCodeset += srtCodeset == "" ? charCode : "," + charCode;\r
- }\r
- if (item.SubItems[4].Text == "Yes") // default\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.SubItems[5].Text;\r
+ itemToAdd = item.SrtPath;\r
srtFile += srtFile == "" ? itemToAdd : "," + itemToAdd;\r
\r
- itemToAdd = item.SubItems[6].Text;\r
+ itemToAdd = item.SrtOffset.ToString();\r
srtOffset += srtOffset == "" ? itemToAdd : "," + itemToAdd;\r
}\r
else // We have Bitmap or CC\r
string[] tempSub;\r
\r
// Find --subtitle <string>\r
- if (item.SubItems[1].Text.Contains("Foreign Audio Search"))\r
+ if (item.Track.Contains("Foreign Audio Search"))\r
itemToAdd = "scan";\r
else\r
{\r
- tempSub = item.SubItems[1].Text.Split(' ');\r
+ tempSub = item.Track.Split(' ');\r
itemToAdd = tempSub[0];\r
}\r
\r
\r
// Find --subtitle-forced\r
itemToAdd = "";\r
- tempSub = item.SubItems[1].Text.Split(' ');\r
+ tempSub = item.Track.Split(' ');\r
trackID = tempSub[0];\r
\r
- if (item.SubItems[2].Text == "Yes")\r
- itemToAdd = trackID;\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
- tempSub = item.SubItems[1].Text.Split(' ');\r
trackID = tempSub[0];\r
\r
if (trackID.Trim() == "Foreign")\r
trackID = "scan";\r
\r
- if (item.SubItems[3].Text == "Yes") // burn\r
+ if (item.Burned == "Yes") // burn\r
subtitleBurn = trackID;\r
\r
- if (item.SubItems[4].Text == "Yes") // default\r
+ if (item.Default == "Yes") // default\r
subtitleDefault = trackID;\r
}\r
}\r
query += " --subtitle " + subtitleTracks;\r
\r
if (subtitleForced != "")\r
- query += " --subtitle-forced " + subtitleForced;\r
+ query += " --subtitle-forced=" + subtitleForced;\r
if (subtitleBurn != "")\r
- query += " --subtitle-burn " + subtitleBurn;\r
+ query += " --subtitle-burn=" + subtitleBurn;\r
if (subtitleDefault != "")\r
- query += " --subtitle-default " + subtitleDefault;\r
+ query += " --subtitle-default=" + subtitleDefault;\r
}\r
\r
if (srtFile != "") // SRTs\r
{\r
- query += " --srt-file " + srtFile;\r
+ query += " --srt-file " + "\"" + srtFile + "\"";\r
\r
if (srtCodeset != "")\r
query += " --srt-codeset " + srtCodeset;\r
if (srtLang != "")\r
query += " --srt-lang " + srtLang;\r
if (srtDefault != "")\r
- query += " --subtitle-default " + srtDefault;\r
+ query += " --srt-default=" + srtDefault;\r
}\r
\r
}\r
string[] titlesplit = source_title.Split(' ');\r
source_title = 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
{\r
? Path.Combine(Path.GetTempPath(), dest_name + "-" + source_title + "-chapters.csv")\r
: Path.Combine(Path.GetTempPath(), dest_name + "-chapters.csv");\r
\r
- if (chapterCSVSave(mainWindow, path) == false)\r
+ if (ChapterCSVSave(mainWindow, path) == false)\r
query += " -m ";\r
else\r
query += " --markers=" + "\"" + path + "\"";\r
\r
query += " -v " + Properties.Settings.Default.verboseLevel;\r
\r
- if (Properties.Settings.Default.dvdnav)\r
- query += " --dvdnav";\r
+ if (Properties.Settings.Default.noDvdNav)\r
+ query += " --no-dvdnav";\r
#endregion\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">string The GUI Encode name</param>\r
+ /// <returns>string CLI encoder name</returns>\r
+ private static string GetAudioEncoder(string selectedEncoder)\r
{\r
switch (selectedEncoder)\r
{\r
return "";\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 Boolean ChapterCSVSave(frmMain mainWindow, string filePathName)\r
{\r
try\r
{\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
OSDN Git Service
