public partial class frmMain : Form\r
{\r
// Objects which may be used by one or more other objects *************\r
- QueueHandler encodeQueue = new QueueHandler();\r
+ EncodeAndQueueHandler encodeQueue = new EncodeAndQueueHandler();\r
PresetsHandler presetHandler = new PresetsHandler();\r
QueryGenerator queryGen = new QueryGenerator();\r
\r
private DVD thisDVD;\r
private frmQueue queueWindow;\r
private frmPreview qtpreview;\r
+ private frmActivityWindow ActivityWindow;\r
private Form splash;\r
public string sourcePath;\r
+ private string lastAction;\r
+ private SourceType selectedSourceType;\r
+ private string dvdDrivePath;\r
+ private string dvdDriveLabel;\r
\r
// Delegates **********************************************************\r
private delegate void UpdateWindowHandler();\r
{\r
// Load and setup the splash screen in this thread\r
splash = new frmSplashScreen();\r
- splash.Show();\r
+ splash.Show(this);\r
Label lblStatus = new Label { Size = new Size(150, 20), Location = new Point(182, 102) };\r
splash.Controls.Add(lblStatus);\r
\r
tabs_panel.TabPages.RemoveAt(7); // Remove the query editor tab if the user does not want it enabled.\r
\r
// Load the user's default settings or Normal Preset\r
- if (Properties.Settings.Default.defaultSettings && Properties.Settings.Default.defaultPreset != "")\r
+ if (Properties.Settings.Default.defaultPreset != "")\r
{\r
- if (presetHandler.getPreset(Properties.Settings.Default.defaultPreset) != null)\r
+ if (presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null)\r
{\r
- string query = presetHandler.getPreset(Properties.Settings.Default.defaultPreset).Query;\r
- Boolean loadPictureSettings = presetHandler.getPreset(Properties.Settings.Default.defaultPreset).PictureSettings;\r
+ string query = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).Query;\r
+ Boolean loadPictureSettings = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).PictureSettings;\r
\r
if (query != null)\r
{\r
if (Properties.Settings.Default.tooltipEnable)\r
ToolTip.Active = true;\r
\r
+ // Register with Growl (if not using Growl for the encoding completion action, this wont hurt anything)\r
+ GrowlCommunicator.Register();\r
+\r
//Finished Loading\r
lblStatus.Text = "Loading Complete!";\r
Application.DoEvents();\r
catch (Exception ex)\r
{\r
if ((bool)result.AsyncState)\r
- MessageBox.Show("Unable to check for updates, Please try again later. \n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+ MessageBox.Show("Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
}\r
}\r
\r
// Startup Functions \r
private void queueRecovery()\r
{\r
- if (Main.check_queue_recovery())\r
+ if (Main.checkQueueRecovery())\r
{\r
DialogResult result = MessageBox.Show("HandBrake has detected unfinished items on the queue from the last time the application was launched. Would you like to recover these?", "Queue Recovery Possible", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
\r
if (result == DialogResult.Yes)\r
- encodeQueue.recoverQueue("hb_queue_recovery.xml"); // Start Recovery\r
+ encodeQueue.LoadQueueFromFile("hb_queue_recovery.xml"); // Start Recovery\r
else\r
{\r
// Remove the Queue recovery file if the user doesn't want to recovery the last queue.\r
}\r
#endregion\r
\r
+ #region Properties\r
+ public string SourceName\r
+ {\r
+ get\r
+ {\r
+ if (this.selectedSourceType == SourceType.DvdDrive)\r
+ {\r
+ return this.dvdDriveLabel;\r
+ }\r
+\r
+ return Path.GetFileNameWithoutExtension(this.sourcePath);\r
+ }\r
+ }\r
+ #endregion\r
+\r
#region Events\r
// Encoding Events for setting up the GUI\r
private void events()\r
{\r
// Handle Widget changes when preset is selected.\r
- registerPresetEventHandler();\r
+ RegisterPresetEventHandler();\r
\r
// Handle Window Resize\r
if (Properties.Settings.Default.MainWindowMinimize)\r
this.Resize += new EventHandler(frmMain_Resize);\r
\r
// Handle Encode Start / Finish / Pause\r
- encodeQueue.OnEncodeEnded += new EventHandler(encodeEnded);\r
- encodeQueue.OnPaused += new EventHandler(encodePaused);\r
- encodeQueue.OnEncodeStart += new EventHandler(encodeStarted);\r
+ encodeQueue.CurrentJobCompleted += new EventHandler(encodeEnded);\r
+ encodeQueue.QueuePauseRequested += new EventHandler(encodePaused);\r
+ encodeQueue.NewJobStarted += new EventHandler(encodeStarted);\r
\r
// Handle a file being draged onto the GUI.\r
this.DragEnter += new DragEventHandler(frmMain_DragEnter);\r
}\r
\r
// Change the preset label to custom when a user changes a setting. Don't want to give the impression that users can change settings and still be using a preset\r
- public void registerPresetEventHandler()\r
+ private void RegisterPresetEventHandler()\r
{\r
// Output Settings\r
drop_format.SelectedIndexChanged += new EventHandler(changePresetLabel);\r
check_optimiseMP4.CheckedChanged += new EventHandler(changePresetLabel);\r
\r
// Picture Settings\r
- PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel);\r
+ //PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel);\r
\r
// Filter Settings\r
Filters.FilterSettingsChanged += new EventHandler(changePresetLabel);\r
// Advanced Tab\r
x264Panel.rtf_x264Query.TextChanged += new EventHandler(changePresetLabel);\r
}\r
- public void unRegisterPresetEventHandler()\r
+ private void UnRegisterPresetEventHandler()\r
{\r
// Output Settings \r
drop_format.SelectedIndexChanged -= new EventHandler(changePresetLabel);\r
check_optimiseMP4.CheckedChanged -= new EventHandler(changePresetLabel);\r
\r
// Picture Settings\r
- PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel);\r
+ //PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel);\r
\r
// Filter Settings\r
Filters.FilterSettingsChanged -= new EventHandler(changePresetLabel);\r
\r
// Video Tab\r
- drp_videoEncoder.SelectedIndexChanged -= new EventHandler(changePresetLabel);\r
- check_2PassEncode.CheckedChanged -= new EventHandler(changePresetLabel);\r
- check_turbo.CheckedChanged -= new EventHandler(changePresetLabel);\r
- text_filesize.TextChanged -= new EventHandler(changePresetLabel);\r
- text_bitrate.TextChanged -= new EventHandler(changePresetLabel);\r
- slider_videoQuality.ValueChanged -= new EventHandler(changePresetLabel);\r
+ drp_videoEncoder.SelectedIndexChanged -= new EventHandler(changePresetLabel);\r
+ check_2PassEncode.CheckedChanged -= new EventHandler(changePresetLabel);\r
+ check_turbo.CheckedChanged -= new EventHandler(changePresetLabel);\r
+ text_filesize.TextChanged -= new EventHandler(changePresetLabel);\r
+ text_bitrate.TextChanged -= new EventHandler(changePresetLabel);\r
+ slider_videoQuality.ValueChanged -= new EventHandler(changePresetLabel);\r
\r
// Audio Panel\r
- AudioSettings.AudioListChanged -= new EventHandler(changePresetLabel);\r
+ AudioSettings.AudioListChanged -= new EventHandler(changePresetLabel);\r
\r
// Advanced Tab\r
- x264Panel.rtf_x264Query.TextChanged -= new EventHandler(changePresetLabel); \r
+ x264Panel.rtf_x264Query.TextChanged -= new EventHandler(changePresetLabel);\r
}\r
private void changePresetLabel(object sender, EventArgs e)\r
{\r
- groupBox_output.Text = "Output Settings (Preset: Custom)";\r
+ labelPreset.Text = "Output Settings (Preset: Custom)";\r
}\r
\r
private static void frmMain_DragEnter(object sender, DragEventArgs e)\r
private void frmMain_DragDrop(object sender, DragEventArgs e)\r
{\r
string[] fileList = e.Data.GetData(DataFormats.FileDrop) as string[];\r
+ sourcePath = string.Empty;\r
+\r
if (fileList != null)\r
{\r
if (fileList[0].StartsWith("\\"))\r
- MessageBox.Show("Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+ {\r
+ MessageBox.Show(\r
+ "Sorry, HandBrake does not support UNC file paths. \nTry mounting the network share as a network drive in My Computer",\r
+ "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+ UpdateSourceLabel();\r
+ }\r
else\r
{\r
if (fileList[0] != "")\r
- {\r
- setupGUIforScan(fileList[0]);\r
startScan(fileList[0]);\r
- }\r
else\r
- lbl_source.Text = "Click 'Source' to continue";\r
+ UpdateSourceLabel();\r
}\r
}\r
+ else\r
+ UpdateSourceLabel();\r
}\r
private void encodeStarted(object sender, EventArgs e)\r
{\r
}\r
private void mnu_options_Click(object sender, EventArgs e)\r
{\r
- Form options = new frmOptions();\r
+ Form options = new frmOptions(this);\r
options.ShowDialog();\r
}\r
#endregion\r
#region Presets Menu\r
private void mnu_presetReset_Click(object sender, EventArgs e)\r
{\r
- presetHandler.updateBuiltInPresets();\r
+ presetHandler.UpdateBuiltInPresets();\r
loadPresetPanel();\r
if (treeView_presets.Nodes.Count == 0)\r
- MessageBox.Show("Unable to load the presets.xml file. Please select \"Update Built-in Presets\" from the Presets Menu \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+ MessageBox.Show("Unable to load the presets.xml file. Please select \"Update Built-in Presets\" from the Presets Menu. \nMake sure you are running the program in Admin mode if running on Vista. See Windows FAQ for details!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
else\r
MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
\r
}\r
private void mnu_delete_preset_Click(object sender, EventArgs e)\r
{\r
- // Empty the preset file\r
- string presetsFile = Application.StartupPath + "\\presets.xml";\r
- if (File.Exists(presetsFile))\r
- File.Delete(presetsFile);\r
-\r
- try\r
- {\r
- FileStream strm = new FileStream(presetsFile, FileMode.Create, FileAccess.Write);\r
- strm.Close();\r
- strm.Dispose();\r
- }\r
- catch (Exception exc)\r
- {\r
- MessageBox.Show("An error has occured during the preset removal process.\n If you are using Windows Vista, you may need to run under Administrator Mode to complete this task. \n" + exc);\r
- }\r
-\r
- // Reload the preset panel\r
- loadPresetPanel();\r
+ presetHandler.RemoveBuiltInPresets();\r
+ loadPresetPanel(); // Reload the preset panel\r
}\r
private void mnu_SelectDefault_Click(object sender, EventArgs e)\r
{\r
loadNormalPreset();\r
}\r
+ private void mnu_importMacPreset_Click(object sender, EventArgs e)\r
+ {\r
+ importPreset();\r
+ }\r
private void btn_new_preset_Click(object sender, EventArgs e)\r
{\r
- Form preset = new frmAddPreset(this, queryGen.generateTheQuery(this), presetHandler);\r
+ Form preset = new frmAddPreset(this, queryGen.GenerateCLIQuery(this, 0, null), presetHandler);\r
preset.ShowDialog();\r
}\r
#endregion\r
}\r
private void mnu_UpdateCheck_Click(object sender, EventArgs e)\r
{\r
+ lbl_updateCheck.Visible = true;\r
Main.BeginCheckForUpdates(new AsyncCallback(updateCheckDoneMenu), false);\r
}\r
private void updateCheckDoneMenu(IAsyncResult result)\r
Invoke(new MethodInvoker(() => updateCheckDoneMenu(result)));\r
return;\r
}\r
-\r
UpdateCheckInformation info;\r
-\r
try\r
{\r
// Get the information about the new build, if any, and close the window\r
info = Main.EndCheckForUpdates(result);\r
- lbl_updateCheck.Visible = true;\r
+\r
if (info.NewVersionAvailable && info.BuildInformation != null)\r
{\r
frmUpdater updateWindow = new frmUpdater(info.BuildInformation);\r
catch (Exception ex)\r
{\r
if ((bool)result.AsyncState)\r
- MessageBox.Show("Unable to check for updates, Please try again later. \n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+ MessageBox.Show("Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
}\r
}\r
private void mnu_about_Click(object sender, EventArgs e)\r
{\r
treeView_presets.CollapseAll();\r
}\r
+ private void pmnu_import_Click(object sender, EventArgs e)\r
+ {\r
+ importPreset();\r
+ }\r
private void pmnu_saveChanges_Click(object sender, EventArgs e)\r
{\r
DialogResult result = MessageBox.Show("Do you wish to include picture settings when updating the preset: " + treeView_presets.SelectedNode.Text, "Update Preset", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);\r
if (result == DialogResult.Yes)\r
- presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.generateTabbedComponentsQuery(this), true);\r
+ presetHandler.Update(treeView_presets.SelectedNode.Text, QueryGenerator.GenerateTabbedComponentsQuery(this), true);\r
else if (result == DialogResult.No)\r
- presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.generateTabbedComponentsQuery(this), false);\r
+ presetHandler.Update(treeView_presets.SelectedNode.Text, QueryGenerator.GenerateTabbedComponentsQuery(this), false);\r
}\r
private void pmnu_delete_click(object sender, EventArgs e)\r
{\r
if (treeView_presets.SelectedNode != null)\r
{\r
- presetHandler.remove(treeView_presets.SelectedNode.Text);\r
- treeView_presets.Nodes.Remove(treeView_presets.SelectedNode); \r
+ presetHandler.Remove(treeView_presets.SelectedNode.Text);\r
+ treeView_presets.Nodes.Remove(treeView_presets.SelectedNode);\r
}\r
treeView_presets.Select();\r
}\r
\r
// Now enable the save menu if the selected preset is a user preset\r
if (treeView_presets.SelectedNode != null)\r
- if (presetHandler.checkIfUserPresetExists(treeView_presets.SelectedNode.Text))\r
+ if (presetHandler.CheckIfUserPresetExists(treeView_presets.SelectedNode.Text))\r
pmnu_saveChanges.Enabled = true;\r
\r
treeView_presets.Select();\r
// Presets Management\r
private void btn_addPreset_Click(object sender, EventArgs e)\r
{\r
- Form preset = new frmAddPreset(this, QueryGenerator.generateTabbedComponentsQuery(this), presetHandler);\r
+ Form preset = new frmAddPreset(this, QueryGenerator.GenerateTabbedComponentsQuery(this), presetHandler);\r
preset.ShowDialog();\r
}\r
private void btn_removePreset_Click(object sender, EventArgs e)\r
{\r
if (treeView_presets.SelectedNode != null)\r
{\r
- presetHandler.remove(treeView_presets.SelectedNode.Text);\r
+ presetHandler.Remove(treeView_presets.SelectedNode.Text);\r
treeView_presets.Nodes.Remove(treeView_presets.SelectedNode);\r
}\r
}\r
{\r
if (treeView_presets.GetNodeAt(e.Location) != null)\r
{\r
- if (groupBox_output.Text.Contains(treeView_presets.GetNodeAt(e.Location).Text))\r
+ if (labelPreset.Text.Contains(treeView_presets.GetNodeAt(e.Location).Text))\r
selectPreset();\r
}\r
}\r
if (result == DialogResult.Yes)\r
{\r
if (treeView_presets.SelectedNode != null)\r
- presetHandler.remove(treeView_presets.SelectedNode.Text);\r
+ presetHandler.Remove(treeView_presets.SelectedNode.Text);\r
\r
// Remember each nodes expanded status so we can reload it\r
List<Boolean> nodeStatus = new List<Boolean>();\r
{\r
// Ok, so, we've selected a preset. Now we want to load it.\r
string presetName = treeView_presets.SelectedNode.Text;\r
- if (presetHandler.getPreset(presetName) != null)\r
+ if (presetHandler.GetPreset(presetName) != null)\r
{\r
- string query = presetHandler.getPreset(presetName).Query;\r
- Boolean loadPictureSettings = presetHandler.getPreset(presetName).PictureSettings;\r
+ string query = presetHandler.GetPreset(presetName).Query;\r
+ Boolean loadPictureSettings = presetHandler.GetPreset(presetName).PictureSettings;\r
\r
if (query != null)\r
{\r
}\r
}\r
}\r
- } \r
+ }\r
private void loadNormalPreset()\r
{\r
foreach (TreeNode treenode in treeView_presets.Nodes)\r
}\r
}\r
}\r
+ private void importPreset()\r
+ {\r
+ Import imp = new Import();\r
+ if (openPreset.ShowDialog() == DialogResult.OK)\r
+ {\r
+ QueryParser parsed = imp.importMacPreset(openPreset.FileName);\r
+ if (presetHandler.CheckIfUserPresetExists(parsed.PresetName + " (Imported)"))\r
+ {\r
+ DialogResult result = MessageBox.Show("This preset appears to already exist. Would you like to overwrite it?", "Overwrite preset?",\r
+ MessageBoxButtons.YesNo, MessageBoxIcon.Warning);\r
+ if (result == DialogResult.Yes)\r
+ {\r
+ PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
+ presetHandler.Update(parsed.PresetName + " (Imported)", queryGen.GenerateCLIQuery(this, 0, null),\r
+ parsed.UsesPictureSettings);\r
+ }\r
+ }\r
+ else\r
+ {\r
+ PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);\r
+ presetHandler.Add(parsed.PresetName, queryGen.GenerateCLIQuery(this, 0, null), parsed.UsesPictureSettings);\r
+\r
+ if (presetHandler.Add(parsed.PresetName + " (Imported)", queryGen.GenerateCLIQuery(this, 0, null), parsed.UsesPictureSettings))\r
+ {\r
+ TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)") { ForeColor = Color.Black };\r
+ treeView_presets.Nodes.Add(preset_treeview);\r
+ }\r
+ }\r
+ }\r
+ }\r
#endregion\r
\r
#region ToolStrip\r
private void btn_source_Click(object sender, EventArgs e)\r
{\r
- if (Properties.Settings.Default.drive_detection)\r
- {\r
- mnu_dvd_drive.Visible = true;\r
- Thread driveInfoThread = new Thread(getDriveInfoThread);\r
- driveInfoThread.Start();\r
- }\r
- else\r
- mnu_dvd_drive.Visible = false;\r
+ mnu_dvd_drive.Visible = true;\r
+ Thread driveInfoThread = new Thread(getDriveInfoThread);\r
+ driveInfoThread.Start();\r
}\r
private void btn_start_Click(object sender, EventArgs e)\r
{\r
if (result == DialogResult.Yes)\r
{\r
// Pause The Queue\r
- encodeQueue.pauseEncodeQueue();\r
+ encodeQueue.RequestPause();\r
\r
// Allow the CLI to exit cleanly\r
- Win32.SetForegroundWindow((int)encodeQueue.encodeHandler.processHandle);\r
+ Win32.SetForegroundWindow((int)encodeQueue.processHandle);\r
SendKeys.Send("^C");\r
\r
// Update the GUI\r
}\r
else\r
{\r
- if (encodeQueue.count() != 0 || (lbl_source.Text != string.Empty && lbl_source.Text != "Click 'Source' to continue" && text_destination.Text != string.Empty))\r
+ if (encodeQueue.Count != 0 || (!string.IsNullOrEmpty(sourcePath) && !string.IsNullOrEmpty(text_destination.Text)))\r
{\r
- String query = rtf_query.Text != "" ? rtf_query.Text : queryGen.generateTheQuery(this);\r
+ string generatedQuery = queryGen.GenerateCLIQuery(this, 0, null);\r
+ string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : queryGen.GenerateCLIQuery(this, 0, null);\r
+ string query = string.Empty;\r
+\r
+ // Check to make sure the generated query matches the GUI settings\r
+ if (Properties.Settings.Default.PromptOnUnmatchingQueries && !string.IsNullOrEmpty(specifiedQuery) && generatedQuery != specifiedQuery)\r
+ {\r
+ DialogResult result = MessageBox.Show("The query under the \"Query Editor\" tab " +\r
+ "does not match the current GUI settings.\n\nBecause the manual query takes " +\r
+ "priority over the GUI, your recently updated settings will not be taken " +\r
+ "into account when encoding this job." + Environment.NewLine + Environment.NewLine +\r
+ "Do you want to replace the manual query with the updated GUI-generated query?",\r
+ "Manual Query does not Match GUI",\r
+ MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk,\r
+ MessageBoxDefaultButton.Button3);\r
+\r
+ switch (result)\r
+ {\r
+ case DialogResult.Yes:\r
+ // Replace the manual query with the generated one\r
+ query = generatedQuery;\r
+ rtf_query.Text = generatedQuery;\r
+ break;\r
+ case DialogResult.No:\r
+ // Use the manual query\r
+ query = specifiedQuery;\r
+ break;\r
+ case DialogResult.Cancel:\r
+ // Don't start the encode\r
+ return;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ query = specifiedQuery;\r
+ }\r
\r
DialogResult overwrite = DialogResult.Yes;\r
if (text_destination.Text != "")\r
\r
if (overwrite == DialogResult.Yes)\r
{\r
- if (encodeQueue.count() == 0)\r
- encodeQueue.add(query, lbl_source.Text, text_destination.Text);\r
+ if (encodeQueue.Count == 0)\r
+ encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));\r
\r
queueWindow.setQueue();\r
- if (encodeQueue.count() > 1)\r
+ if (encodeQueue.Count > 1)\r
queueWindow.Show(false);\r
\r
setEncodeStarted(); // Encode is running, so setup the GUI appropriately\r
- encodeQueue.startEncode(); // Start The Queue Encoding Process\r
+ encodeQueue.StartEncodeQueue(); // Start The Queue Encoding Process\r
lastAction = "encode"; // Set the last action to encode - Used for activity window.\r
+\r
+ if (ActivityWindow != null)\r
+ ActivityWindow.SetLogView(false);\r
+\r
}\r
this.Focus();\r
}\r
- else if (lbl_source.Text == string.Empty || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty)\r
- MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+ else if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))\r
+ MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
}\r
}\r
private void btn_add2Queue_Click(object sender, EventArgs e)\r
{\r
-\r
- if (lbl_source.Text == string.Empty || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == string.Empty)\r
- MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+ if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))\r
+ MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
else\r
{\r
- String query = queryGen.generateTheQuery(this);\r
+ String query = queryGen.GenerateCLIQuery(this, 0, null);\r
if (rtf_query.Text != "")\r
query = rtf_query.Text;\r
\r
- if (encodeQueue.checkDestinationPath(text_destination.Text))\r
+ if (encodeQueue.CheckForDestinationDuplicate(text_destination.Text))\r
{\r
DialogResult result = MessageBox.Show("There is already a queue item for this destination path. \n\n If you continue, the encode will be overwritten. Do you wish to continue?",\r
"Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);\r
if (result == DialogResult.Yes)\r
- encodeQueue.add(query, lbl_source.Text, text_destination.Text);\r
+ encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));\r
\r
}\r
else\r
- encodeQueue.add(query, lbl_source.Text, text_destination.Text);\r
+ encodeQueue.AddJob(query, sourcePath, text_destination.Text, (rtf_query.Text != ""));\r
+\r
+ lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue";\r
\r
queueWindow.Show();\r
}\r
private void btn_showQueue_Click(object sender, EventArgs e)\r
{\r
queueWindow.Show();\r
+ queueWindow.Activate();\r
}\r
private void tb_preview_Click(object sender, EventArgs e)\r
{\r
- if (lbl_source.Text == "" || lbl_source.Text == "Click 'Source' to continue" || text_destination.Text == "")\r
- MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+ if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text))\r
+ MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
else\r
{\r
if (qtpreview == null)\r
private void btn_ActivityWindow_Click(object sender, EventArgs e)\r
{\r
String file = lastAction == "scan" ? "last_scan_log.txt" : "last_encode_log.txt";\r
+ if (ActivityWindow == null)\r
+ ActivityWindow = new frmActivityWindow(file, encodeQueue, this);\r
+\r
+ ActivityWindow.SetLogView(!encodeQueue.isEncoding);\r
\r
- frmActivityWindow ActivityWindow = new frmActivityWindow(file, encodeQueue, this);\r
ActivityWindow.Show();\r
}\r
#endregion\r
//Source\r
private void btn_dvd_source_Click(object sender, EventArgs e)\r
{\r
- // Enable the creation of chapter markers.\r
- Check_ChapterMarkers.Enabled = true;\r
-\r
- // Set the last action to scan. \r
- // This is used for tracking which file to load in the activity window\r
- lastAction = "scan";\r
- lbl_source.Text = "";\r
-\r
if (DVD_Open.ShowDialog() == DialogResult.OK)\r
{\r
- String filename = DVD_Open.SelectedPath;\r
-\r
- if (filename.StartsWith("\\"))\r
- MessageBox.Show("Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
- else\r
- {\r
- if (filename != "")\r
- {\r
- lbl_source.Text = Path.GetFullPath(filename);\r
- setupGUIforScan(filename);\r
- startScan(filename);\r
- }\r
- else\r
- lbl_source.Text = "Click 'Source' to continue";\r
- }\r
+ this.selectedSourceType = SourceType.Folder;\r
+ selectSource(DVD_Open.SelectedPath);\r
}\r
else\r
- lbl_source.Text = "Click 'Source' to continue";\r
+ UpdateSourceLabel();\r
}\r
private void btn_file_source_Click(object sender, EventArgs e)\r
{\r
- // Set the last action to scan. \r
- // This is used for tracking which file to load in the activity window\r
- lastAction = "scan";\r
- lbl_source.Text = "";\r
-\r
if (ISO_Open.ShowDialog() == DialogResult.OK)\r
{\r
- String filename = ISO_Open.FileName;\r
- if (filename.StartsWith("\\"))\r
- MessageBox.Show(\r
- "Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer",\r
- "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
- else\r
- {\r
- if (filename != "")\r
- {\r
- lbl_source.Text = Path.GetFileName(filename);\r
- setupGUIforScan(filename);\r
- startScan(filename);\r
- }\r
- else\r
- lbl_source.Text = "Click 'Source' to continue";\r
- }\r
+ this.selectedSourceType = SourceType.VideoFile;\r
+ selectSource(ISO_Open.FileName);\r
}\r
else\r
- lbl_source.Text = "Click 'Source' to continue";\r
-\r
+ UpdateSourceLabel();\r
}\r
private void mnu_dvd_drive_Click(object sender, EventArgs e)\r
{\r
- // Enable the creation of chapter markers.\r
+ if (this.dvdDrivePath == null) return;\r
+ this.selectedSourceType = SourceType.DvdDrive;\r
+ selectSource(this.dvdDrivePath);\r
+ }\r
+ private void selectSource(string file)\r
+ {\r
Check_ChapterMarkers.Enabled = true;\r
-\r
- // Set the last action to scan. \r
- // This is used for tracking which file to load in the activity window\r
lastAction = "scan";\r
+ sourcePath = string.Empty;\r
\r
- if (mnu_dvd_drive.Text.Contains("VIDEO_TS"))\r
+ if (file == string.Empty) // Must have a file or path\r
{\r
- string[] path = mnu_dvd_drive.Text.Split(' ');\r
- String filename = path[0];\r
- lbl_source.Text = Path.GetFullPath(filename);\r
- setupGUIforScan(filename);\r
- startScan(filename);\r
+ UpdateSourceLabel();\r
+ return;\r
}\r
\r
- // If there are no titles in the dropdown menu then the scan has obviously failed. Display an error message explaining to the user.\r
- if (drp_dvdtitle.Items.Count == 0)\r
- MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.\nYour Source may be copy protected, badly mastered or a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+ if (file.StartsWith("\\")) // NO UNC Paths\r
+ {\r
+ MessageBox.Show(\r
+ "Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer",\r
+ "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+ UpdateSourceLabel();\r
+ return;\r
+ }\r
\r
- lbl_encode.Text = "";\r
+ sourcePath = Path.GetFileName(file);\r
+ startScan(file);\r
}\r
private void drp_dvdtitle_Click(object sender, EventArgs e)\r
{\r
}\r
private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)\r
{\r
- unRegisterPresetEventHandler();\r
- // Reset some values on the form\r
- PictureSettings.lbl_Aspect.Text = "Select a Title";\r
- //lbl_RecomendedCrop.Text = "Select a Title";\r
+ UnRegisterPresetEventHandler();\r
+\r
+ PictureSettings.lbl_Aspect.Text = "Select a Title"; // Reset some values on the form\r
drop_chapterStart.Items.Clear();\r
drop_chapterFinish.Items.Clear();\r
\r
{\r
selectedTitle = drp_dvdtitle.SelectedItem as Title;\r
lbl_duration.Text = selectedTitle.Duration.ToString();\r
- PictureSettings.setComponentsAfterScan(selectedTitle); // Setup Picture Settings Tab Control\r
+ PictureSettings.Source = selectedTitle; // Setup Picture Settings Tab Control\r
\r
// Populate the Angles dropdown\r
drop_angle.Items.Clear();\r
- if (Properties.Settings.Default.dvdnav)\r
+ if (!Properties.Settings.Default.noDvdNav)\r
{\r
drop_angle.Visible = true;\r
lbl_angle.Visible = true;\r
drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString();\r
\r
// Populate the Audio Channels Dropdown\r
- AudioSettings.setTrackList(selectedTitle);\r
+ AudioSettings.SetTrackList(selectedTitle);\r
\r
// Populate the Subtitles dropdown\r
Subtitles.drp_subtitleTracks.Items.Clear();\r
Subtitles.drp_subtitleTracks.Items.Add("Foreign Audio Search (Bitmap)");\r
Subtitles.drp_subtitleTracks.Items.AddRange(selectedTitle.Subtitles.ToArray());\r
Subtitles.drp_subtitleTracks.SelectedIndex = 0;\r
+ Subtitles.Clear();\r
+ Subtitles.SetSubtitleTrackAuto();\r
}\r
\r
// Run the autoName & chapterNaming functions\r
if (Properties.Settings.Default.autoNaming)\r
{\r
- string autoPath = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
+ string autoPath = Main.autoName(this);\r
if (autoPath != null)\r
text_destination.Text = autoPath;\r
else\r
- MessageBox.Show("You currently have automatic file naming enabled for the destination box, but you do not have a default direcotry set. You should set this in the program options (see Tools Menu)", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+ MessageBox.Show("You currently have \"Automatically name output files\" enabled for the destination file box, but you do not have a default directory set.\n\nYou should set a \"Default Path\" in HandBrakes preferences. (See 'Tools' menu -> 'Options' -> 'General' Tab -> 'Default Path')", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
}\r
\r
data_chpt.Rows.Clear();\r
data_chpt.Columns[0].Width = 166;\r
data_chpt.Columns[0].Width = 165;\r
\r
- registerPresetEventHandler();\r
+ RegisterPresetEventHandler();\r
}\r
- private void drop_chapterStart_SelectedIndexChanged(object sender, EventArgs e)\r
+ private void chapersChanged(object sender, EventArgs e)\r
{\r
- int c_start, c_end;\r
-\r
- if (drop_chapterFinish.Text == "Auto" && drop_chapterFinish.Items.Count != 0)\r
- drop_chapterFinish.SelectedIndex = drop_chapterFinish.Items.Count - 1;\r
-\r
- int.TryParse(drop_chapterStart.Text, out c_start);\r
- int.TryParse(drop_chapterFinish.Text, out c_end);\r
+ Control ctl = (Control)sender;\r
+ int chapterStart, chapterEnd;\r
+ int.TryParse(drop_chapterStart.Text, out chapterStart);\r
+ int.TryParse(drop_chapterFinish.Text, out chapterEnd);\r
\r
- if (c_end != 0)\r
+ switch (ctl.Name)\r
{\r
- if (c_start > c_end)\r
- drop_chapterFinish.Text = c_start.ToString();\r
- }\r
-\r
- lbl_duration.Text = Main.calculateDuration(drop_chapterStart.Text, drop_chapterFinish.Text, selectedTitle).ToString();\r
+ case "drop_chapterStart":\r
+ if (drop_chapterFinish.SelectedIndex == -1 && drop_chapterFinish.Items.Count != 0)\r
+ drop_chapterFinish.SelectedIndex = drop_chapterFinish.Items.Count - 1;\r
\r
- // Run the Autonaming function\r
- if (Properties.Settings.Default.autoNaming)\r
- text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
-\r
- // Disable chapter markers if only 1 chapter is selected.\r
- if (c_start == c_end)\r
- {\r
- Check_ChapterMarkers.Checked = false;\r
- Check_ChapterMarkers.Enabled = false;\r
- }\r
- else\r
- Check_ChapterMarkers.Enabled = true;\r
- }\r
- private void drop_chapterFinish_SelectedIndexChanged(object sender, EventArgs e)\r
- {\r
- int c_start, c_end;\r
+ if (chapterEnd != 0)\r
+ if (chapterStart > chapterEnd)\r
+ drop_chapterFinish.Text = chapterStart.ToString();\r
+ break;\r
+ case "drop_chapterFinish":\r
+ if (drop_chapterStart.Items.Count >= 1 && drop_chapterStart.SelectedIndex == -1)\r
+ drop_chapterStart.SelectedIndex = 0;\r
\r
- if (drop_chapterStart.Text == "Auto" && drop_chapterStart.Items.Count >= 1)\r
- drop_chapterStart.SelectedIndex = 1;\r
+ if (chapterStart != 0)\r
+ if (chapterEnd < chapterStart)\r
+ drop_chapterFinish.Text = chapterStart.ToString();\r
\r
- int.TryParse(drop_chapterStart.Text, out c_start);\r
- int.TryParse(drop_chapterFinish.Text, out c_end);\r
+ // Add more rows to the Chapter menu if needed.\r
+ if (Check_ChapterMarkers.Checked)\r
+ {\r
+ int i = data_chpt.Rows.Count, finish = 0;\r
+ int.TryParse(drop_chapterFinish.Text, out finish);\r
\r
- if (c_start != 0)\r
- {\r
- if (c_end < c_start)\r
- drop_chapterFinish.Text = c_start.ToString();\r
+ while (i < finish)\r
+ {\r
+ int n = data_chpt.Rows.Add();\r
+ data_chpt.Rows[n].Cells[0].Value = (i + 1);\r
+ data_chpt.Rows[n].Cells[1].Value = "Chapter " + (i + 1);\r
+ data_chpt.Rows[n].Cells[0].ValueType = typeof(int);\r
+ data_chpt.Rows[n].Cells[1].ValueType = typeof(string);\r
+ i++;\r
+ }\r
+ }\r
+ break;\r
}\r
\r
- lbl_duration.Text = Main.calculateDuration(drop_chapterStart.Text, drop_chapterFinish.Text, selectedTitle).ToString();\r
+ // Update the Duration\r
+ lbl_duration.Text = Main.calculateDuration(drop_chapterStart.SelectedIndex, drop_chapterFinish.SelectedIndex, selectedTitle).ToString();\r
\r
// Run the Autonaming function\r
if (Properties.Settings.Default.autoNaming)\r
- text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, lbl_source.Text, text_destination.Text, drop_format.SelectedIndex);\r
-\r
- // Add more rows to the Chapter menu if needed.\r
- if (Check_ChapterMarkers.Checked)\r
- {\r
- int i = data_chpt.Rows.Count, finish = 0;\r
-\r
- if (drop_chapterFinish.Text != "Auto")\r
- int.TryParse(drop_chapterFinish.Text, out finish);\r
-\r
- while (i < finish)\r
- {\r
- int n = data_chpt.Rows.Add();\r
- data_chpt.Rows[n].Cells[0].Value = (i + 1);\r
- data_chpt.Rows[n].Cells[1].Value = "Chapter " + (i + 1);\r
- data_chpt.Rows[n].Cells[0].ValueType = typeof(int);\r
- data_chpt.Rows[n].Cells[1].ValueType = typeof(string);\r
- i++;\r
- }\r
- }\r
+ text_destination.Text = Main.autoName(this);\r
\r
// Disable chapter markers if only 1 chapter is selected.\r
- if (c_start == c_end)\r
+ if (chapterStart == chapterEnd)\r
{\r
- Check_ChapterMarkers.Checked = false;\r
Check_ChapterMarkers.Enabled = false;\r
+ btn_importChapters.Enabled = false;\r
+ data_chpt.Enabled = false;\r
}\r
else\r
+ {\r
Check_ChapterMarkers.Enabled = true;\r
+ if (Check_ChapterMarkers.Checked)\r
+ {\r
+ btn_importChapters.Enabled = true;\r
+ data_chpt.Enabled = true;\r
+ }\r
+ }\r
}\r
\r
//Destination\r
case 1:\r
if (!Path.GetExtension(DVD_Save.FileName).Equals(".mp4", StringComparison.InvariantCultureIgnoreCase))\r
if (Properties.Settings.Default.useM4v)\r
- DVD_Save.FileName += ".m4v";\r
+ DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv", ".m4v");\r
else\r
- DVD_Save.FileName += ".mp4";\r
+ DVD_Save.FileName = DVD_Save.FileName.Replace(".m4v", ".mp4").Replace(".mkv", ".mp4");\r
break;\r
case 2:\r
if (!Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase))\r
- DVD_Save.FileName += ".mkv";\r
+ DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".mkv").Replace(".m4v", ".mkv");\r
break;\r
default:\r
//do nothing \r
\r
// Quicktime requires .m4v file for chapter markers to work. If checked, change the extension to .m4v (mp4 and m4v are the same thing)\r
if (Check_ChapterMarkers.Checked && DVD_Save.FilterIndex != 2)\r
- setExtension(".m4v");\r
+ SetExtension(".m4v");\r
}\r
}\r
}\r
switch (drop_format.SelectedIndex)\r
{\r
case 0:\r
- if (Properties.Settings.Default.useM4v)\r
- setExtension(".m4v");\r
+ if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())\r
+ SetExtension(".m4v");\r
else\r
- setExtension(".mp4");\r
+ SetExtension(".mp4");\r
break;\r
case 1:\r
- setExtension(".mkv");\r
+ SetExtension(".mkv");\r
break;\r
}\r
\r
- AudioSettings.setAudioByContainer(drop_format.Text);\r
- Subtitles.setContainer(drop_format.SelectedIndex);\r
+ AudioSettings.SetContainer(drop_format.Text);\r
+ Subtitles.SetContainer(drop_format.SelectedIndex);\r
\r
- if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V")))\r
+ if (drop_format.Text.Contains("MP4"))\r
{\r
if (drp_videoEncoder.Items.Contains("VP3 (Theora)"))\r
{\r
else if (drop_format.Text.Contains("MKV"))\r
drp_videoEncoder.Items.Add("VP3 (Theora)");\r
}\r
- private void setExtension(string newExtension)\r
+ public void SetExtension(string newExtension)\r
{\r
- text_destination.Text = text_destination.Text.Replace(".mp4", newExtension);\r
- text_destination.Text = text_destination.Text.Replace(".m4v", newExtension);\r
- text_destination.Text = text_destination.Text.Replace(".mkv", newExtension);\r
+ if (newExtension == ".mp4" || newExtension == ".m4v")\r
+ if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V())\r
+ newExtension = ".m4v";\r
+ else\r
+ newExtension = ".mp4";\r
+\r
+ if (Path.HasExtension(newExtension))\r
+ text_destination.Text = Path.ChangeExtension(text_destination.Text, newExtension);\r
}\r
\r
//Video Tab\r
slider_videoQuality.TickFrequency = 1;\r
\r
CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");\r
- double multiplier = 1.0 / Properties.Settings.Default.x264cqstep;\r
- double value = slider_videoQuality.Value*multiplier;\r
+ double cqStep = Properties.Settings.Default.x264cqstep;\r
+ double multiplier = 1.0 / cqStep;\r
+ double value = slider_videoQuality.Value * multiplier;\r
\r
switch (Properties.Settings.Default.x264cqstep.ToString(culture))\r
{\r
- case "0.20":\r
+ case "0.2":\r
slider_videoQuality.Maximum = 255;\r
break;\r
case "0.25":\r
slider_videoQuality.Maximum = 204;\r
break;\r
- case "0.50":\r
- slider_videoQuality.Maximum = 40;\r
+ case "0.5":\r
+ slider_videoQuality.Maximum = 102;\r
break;\r
- case "1.0":\r
+ case "1":\r
slider_videoQuality.Maximum = 51;\r
break;\r
default:\r
check_iPodAtom.Checked = false;\r
}\r
}\r
+ private double _cachedCqStep = Properties.Settings.Default.x264cqstep;\r
+ /// <summary>\r
+ /// Update the CQ slider for x264 for a new CQ step. This is set from option\r
+ /// </summary>\r
+ public void setQualityFromSlider()\r
+ {\r
+ // Work out the current RF value.\r
+ double cqStep = _cachedCqStep;\r
+ double rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
+\r
+ // Change the maximum value for the slider\r
+ switch (Properties.Settings.Default.x264cqstep.ToString(new CultureInfo("en-US")))\r
+ {\r
+ case "0.2":\r
+ slider_videoQuality.Maximum = 255;\r
+ break;\r
+ case "0.25":\r
+ slider_videoQuality.Maximum = 204;\r
+ break;\r
+ case "0.5":\r
+ slider_videoQuality.Maximum = 102;\r
+ break;\r
+ case "1":\r
+ slider_videoQuality.Maximum = 51;\r
+ break;\r
+ default:\r
+ slider_videoQuality.Maximum = 51;\r
+ break;\r
+ }\r
+\r
+ // Reset the CQ slider to RF0\r
+ slider_videoQuality.Value = slider_videoQuality.Maximum;\r
+\r
+ // Reset the CQ slider back to the previous value as close as possible\r
+ double cqStepNew = Properties.Settings.Default.x264cqstep;\r
+ double rfValueCurrent = 51.0 - slider_videoQuality.Value * cqStepNew;\r
+ while (rfValueCurrent < rfValue)\r
+ {\r
+ slider_videoQuality.Value--;\r
+ rfValueCurrent = 51.0 - slider_videoQuality.Value * cqStepNew;\r
+ }\r
+\r
+ // Cache the CQ step for the next calculation\r
+ _cachedCqStep = Properties.Settings.Default.x264cqstep;\r
+ }\r
private void slider_videoQuality_Scroll(object sender, EventArgs e)\r
{\r
+ double cqStep = Properties.Settings.Default.x264cqstep;\r
switch (drp_videoEncoder.Text)\r
{\r
case "MPEG-4 (FFmpeg)":\r
double max = slider_videoQuality.Maximum;\r
double min = slider_videoQuality.Minimum;\r
double val = ((max - min) - (rfValue - min)) / (max - min);\r
- SliderValue.Text = Math.Round((val * 100), 2) + "% QP:" + (32 - slider_videoQuality.Value);\r
+ SliderValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "% QP:" + (32 - slider_videoQuality.Value);\r
break;\r
case "H.264 (x264)":\r
- rfValue = 51.0 - slider_videoQuality.Value * Properties.Settings.Default.x264cqstep;\r
- max = slider_videoQuality.Maximum * Properties.Settings.Default.x264cqstep;\r
+ rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
+ max = slider_videoQuality.Maximum * cqStep;\r
min = slider_videoQuality.Minimum;\r
val = ((max - min) - (rfValue - min)) / (max - min);\r
rfValue = Math.Round(rfValue, 2);\r
- SliderValue.Text = Math.Round((val * 100), 2) + "% RF:" + rfValue;\r
+ SliderValue.Text = Math.Round((val * 100), 2).ToString(new CultureInfo("en-US")) + "% RF:" + rfValue.ToString(new CultureInfo("en-US"));\r
break;\r
case "VP3 (Theora)":\r
rfValue = slider_videoQuality.Value;\r
double value = rfValue / 63;\r
- SliderValue.Text = Math.Round((value * 100), 2) + "% QP:" + slider_videoQuality.Value;\r
+ SliderValue.Text = Math.Round((value * 100), 2).ToString(new CultureInfo("en-US")) + "% QP:" + slider_videoQuality.Value;\r
break;\r
}\r
}\r
{\r
if (Check_ChapterMarkers.Checked)\r
{\r
- if (drop_format.SelectedIndex != 1) \r
- setExtension(".m4v");\r
- data_chpt.Rows.Clear();\r
+ if (drop_format.SelectedIndex != 1)\r
+ SetExtension(".m4v");\r
data_chpt.Enabled = true;\r
- DataGridView chapterGridView = Main.chapterNaming(data_chpt, drop_chapterFinish.Text);\r
- if (chapterGridView != null)\r
- data_chpt = chapterGridView;\r
+ btn_importChapters.Enabled = true;\r
}\r
else\r
{\r
if (drop_format.SelectedIndex != 1 && !Properties.Settings.Default.useM4v)\r
- setExtension(".mp4");\r
- data_chpt.Rows.Clear();\r
+ SetExtension(".mp4");\r
data_chpt.Enabled = false;\r
+ btn_importChapters.Enabled = false;\r
+ }\r
+ }\r
+ private void btn_importChapters_Click(object sender, EventArgs e)\r
+ {\r
+ if (File_ChapterImport.ShowDialog() == DialogResult.OK)\r
+ {\r
+ String filename = File_ChapterImport.FileName;\r
+ DataGridView imported = Main.importChapterNames(data_chpt, filename);\r
+ if (imported != null)\r
+ data_chpt = imported;\r
+ }\r
+ }\r
+ private void mnu_resetChapters_Click(object sender, EventArgs e)\r
+ {\r
+ data_chpt.Rows.Clear();\r
+ DataGridView chapterGridView = Main.chapterNaming(data_chpt, drop_chapterFinish.Text);\r
+ if (chapterGridView != null)\r
+ {\r
+ data_chpt = chapterGridView;\r
}\r
}\r
\r
// Query Editor Tab\r
private void btn_generate_Query_Click(object sender, EventArgs e)\r
{\r
- rtf_query.Text = queryGen.generateTheQuery(this);\r
+ rtf_query.Text = queryGen.GenerateCLIQuery(this, 0, null);\r
}\r
private void btn_clear_Click(object sender, EventArgs e)\r
{\r
#region Source Scan\r
public Boolean isScanning { get; set; }\r
private static int scanProcessID { get; set; }\r
- private void setupGUIforScan(String filename)\r
+ private void startScan(String filename)\r
{\r
+ // Setup the GUI components for the scan.\r
sourcePath = filename;\r
foreach (Control ctrl in Controls)\r
- {\r
if (!(ctrl is StatusStrip || ctrl is MenuStrip || ctrl is ToolStrip))\r
ctrl.Enabled = false;\r
- }\r
+\r
lbl_encode.Visible = true;\r
lbl_encode.Text = "Scanning ...";\r
- //gb_source.Text = "Source: Scanning ...";\r
btn_source.Enabled = false;\r
btn_start.Enabled = false;\r
btn_showQueue.Enabled = false;\r
btn_add2Queue.Enabled = false;\r
tb_preview.Enabled = false;\r
mnu_killCLI.Visible = true;\r
- }\r
- private void startScan(String filename)\r
- {\r
+\r
+ // Start hte Scan Thread\r
try\r
{\r
- lbl_encode.Visible = true;\r
- lbl_encode.Text = "Scanning...";\r
+ if (ActivityWindow != null)\r
+ ActivityWindow.SetLogView(true);\r
isScanning = true;\r
- ThreadPool.QueueUserWorkItem(scanProcess, filename);\r
+ ThreadPool.QueueUserWorkItem(scanProcess);\r
}\r
catch (Exception exc)\r
{\r
{\r
try\r
{\r
- string inputFile = (string)state;\r
string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");\r
string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";\r
string dvdInfoPath = Path.Combine(logDir, "last_scan_log.txt");\r
File.Delete(dvdInfoPath);\r
\r
String dvdnav = string.Empty;\r
- if (Properties.Settings.Default.dvdnav)\r
- dvdnav = " --dvdnav";\r
- string strCmdLine = String.Format(@"cmd /c """"{0}"" -i ""{1}"" -t0 {2} -v >""{3}"" 2>&1""", handbrakeCLIPath, inputFile, dvdnav, dvdInfoPath);\r
+ if (Properties.Settings.Default.noDvdNav)\r
+ dvdnav = " --no-dvdnav";\r
+ string strCmdLine = String.Format(@"cmd /c """"{0}"" -i ""{1}"" -t0 {2} -v >""{3}"" 2>&1""", handbrakeCLIPath, sourcePath, dvdnav, dvdInfoPath);\r
\r
ProcessStartInfo hbParseDvd = new ProcessStartInfo("CMD.exe", strCmdLine) { WindowStyle = ProcessWindowStyle.Hidden };\r
\r
using (hbproc = Process.Start(hbParseDvd))\r
{\r
Process[] before = Process.GetProcesses(); // Get a list of running processes before starting.\r
- scanProcessID = Main.getCliProcess(before); \r
+ scanProcessID = Main.getCliProcess(before);\r
hbproc.WaitForExit();\r
if (hbproc.ExitCode != 0)\r
cleanExit = false;\r
if (cleanExit) // If 0 exit code, CLI exited cleanly.\r
{\r
if (!File.Exists(dvdInfoPath))\r
- {\r
- throw new Exception(\r
- "Unable to retrieve the DVD Info. last_scan_log.txt is missing. \nExpected location of last_scan_log.txt: \n" +\r
- dvdInfoPath);\r
- }\r
+ throw new Exception("Unable to retrieve the DVD Info. last_scan_log.txt is missing. \nExpected location of last_scan_log.txt: \n"\r
+ + dvdInfoPath);\r
\r
using (StreamReader sr = new StreamReader(dvdInfoPath))\r
{\r
drp_dvdtitle.Items.Clear();\r
if (thisDVD.Titles.Count != 0)\r
drp_dvdtitle.Items.AddRange(thisDVD.Titles.ToArray());\r
- drp_dvdtitle.Text = "Automatic";\r
- drop_chapterFinish.Text = "Auto";\r
- drop_chapterStart.Text = "Auto";\r
\r
// Now select the longest title\r
if (thisDVD.Titles.Count != 0)\r
- drp_dvdtitle.SelectedItem = Main.selectLongestTitle(drp_dvdtitle);\r
+ drp_dvdtitle.SelectedItem = Main.selectLongestTitle(thisDVD);\r
\r
// Enable the creation of chapter markers if the file is an image of a dvd.\r
- if (lbl_source.Text.ToLower().Contains(".iso") || lbl_source.Text.ToLower().Contains("VIDEO_TS"))\r
+ if (sourcePath.ToLower().Contains(".iso") || sourcePath.Contains("VIDEO_TS"))\r
Check_ChapterMarkers.Enabled = true;\r
else\r
{\r
\r
// If no titles were found, Display an error message\r
if (drp_dvdtitle.Items.Count == 0)\r
- MessageBox.Show("No Title(s) found. \n\nYour Source may be copy protected, badly mastered or a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+ {\r
+ MessageBox.Show(\r
+ "No Title(s) found. \n\nYour Source may be copy protected, badly mastered or in a format which HandBrake does not support. \nPlease refer to the Documentation and FAQ (see Help Menu).",\r
+ "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+ sourcePath = string.Empty;\r
+ }\r
+ UpdateSourceLabel();\r
\r
// Enable the GUI components and enable any disabled components\r
enableGUI();\r
if (InvokeRequired)\r
BeginInvoke(new UpdateWindowHandler(enableGUI));\r
lbl_encode.Text = "Scan Completed";\r
- //gb_source.Text = "Source";\r
foreach (Control ctrl in Controls)\r
ctrl.Enabled = true;\r
btn_start.Enabled = true;\r
private void resetGUI()\r
{\r
drp_dvdtitle.Items.Clear();\r
- drp_dvdtitle.Text = "Automatic";\r
drop_chapterStart.Items.Clear();\r
- drop_chapterStart.Text = "Auto";\r
drop_chapterFinish.Items.Clear();\r
- drop_chapterFinish.Text = "Auto";\r
lbl_duration.Text = "Select a Title";\r
PictureSettings.lbl_src_res.Text = "Select a Title";\r
PictureSettings.lbl_Aspect.Text = "Select a Title";\r
- lbl_source.Text = "Click 'Source' to continue";\r
- text_destination.Text = "";\r
+ sourcePath = String.Empty;\r
+ text_destination.Text = String.Empty;\r
thisDVD = null;\r
selectedTitle = null;\r
isScanning = false;\r
}\r
+ private void UpdateSourceLabel()\r
+ {\r
+ labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : this.SourceName;\r
+ }\r
#endregion\r
\r
#region GUI\r
}\r
\r
lbl_encode.Visible = true;\r
- lbl_encode.Text = "Encoding in Progress";\r
+ lbl_encode.Text = "Encoding with " + encodeQueue.Count + " encode(s) pending";\r
btn_start.Text = "Stop";\r
btn_start.ToolTipText = "Stop the encoding process.";\r
btn_start.Image = Properties.Resources.stop;\r
#endregion\r
\r
#region DVD Drive Detection\r
- private delegate void ProgressUpdateHandler();\r
private void getDriveInfoThread()\r
{\r
try\r
{\r
if (InvokeRequired)\r
{\r
- BeginInvoke(new ProgressUpdateHandler(getDriveInfoThread));\r
+ BeginInvoke(new UpdateWindowHandler(getDriveInfoThread));\r
return;\r
}\r
\r
{\r
if (File.Exists(curDrive.RootDirectory + "VIDEO_TS\\VIDEO_TS.IFO"))\r
{\r
- mnu_dvd_drive.Text = curDrive.RootDirectory + "VIDEO_TS (" + curDrive.VolumeLabel + ")";\r
+ this.dvdDrivePath = curDrive.RootDirectory + "VIDEO_TS";\r
+ this.dvdDriveLabel = curDrive.VolumeLabel;\r
+ mnu_dvd_drive.Text = this.dvdDrivePath + " (" + this.dvdDriveLabel + ")";\r
foundDrive = true;\r
break;\r
}\r
/// </summary>\r
public void loadPresetPanel()\r
{\r
- if (presetHandler.checkIfPresetsAreOutOfDate())\r
+ if (presetHandler.CheckIfPresetsAreOutOfDate())\r
if (!Properties.Settings.Default.presetNotification)\r
MessageBox.Show(splash,\r
"HandBrake has determined your built-in presets are out of date... These presets will now be updated.",\r
"Preset Update", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
\r
- presetHandler.getPresetPanel(ref treeView_presets);\r
+ presetHandler.GetPresetPanel(ref treeView_presets);\r
treeView_presets.Update();\r
}\r
-\r
- /// <summary>\r
- /// Either Encode or Scan was last performed.\r
- /// </summary>\r
- public string lastAction { get; set; }\r
#endregion\r
\r
#region Overrides\r
protected override void OnFormClosing(FormClosingEventArgs e)\r
{\r
// If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close.\r
- if ((encodeQueue.isEncoding) && (!encodeQueue.isPaused) && (encodeQueue.count() > 0))\r
+ if ((encodeQueue.isEncoding) && (!encodeQueue.PauseRequested) && (encodeQueue.Count > 0))\r
{\r
DialogResult result = MessageBox.Show("HandBrake has queue items to process. Closing HandBrake will not stop the current encoding, but will stop processing the queue.\n\nDo you want to close HandBrake?",\r
"Close HandBrake?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
#endregion\r
\r
#region In-GUI Encode Status (Experimental)\r
- \r
private void encodeMonitorThread()\r
{\r
try\r
{\r
- Parser encode = new Parser(encodeQueue.encodeHandler.hbProcess.StandardOutput.BaseStream);\r
+ Parser encode = new Parser(encodeQueue.hbProcess.StandardOutput.BaseStream);\r
encode.OnEncodeProgress += encodeOnEncodeProgress;\r
while (!encode.EndOfStream)\r
- {\r
encode.readEncodeStatus();\r
- }\r
}\r
catch (Exception exc)\r
{\r
- MessageBox.Show(exc.ToString());\r
+ MessageBox.Show(exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
}\r
}\r
private void encodeOnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete, float CurrentFps, float AverageFps, TimeSpan TimeRemaining)\r
}\r
#endregion\r
\r
+ #region enum\r
+ private enum SourceType\r
+ {\r
+ None = 0,\r
+ Folder,\r
+ DvdDrive,\r
+ VideoFile\r
+ }\r
+ #endregion\r
+\r
// This is the END of the road ****************************************\r
}\r
}
\ No newline at end of file
OSDN Git Service
