X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmMain.cs;h=8dd436c9b0a65fd38bf3be2cb4abb1e18efb7d3f;hb=d571d3e6a3bb4bbeda35cac674f697a253a11e94;hp=413847d5161be33da11d28c319198f0eee8bb4be;hpb=e1d7d5a597b1323f3d9b4d1cc9a833c527b294ca;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 413847d5..8dd436c9 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -4,37 +4,42 @@ Homepage: . It may be used under the terms of the GNU General Public License. */ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Globalization; -using System.Windows.Forms; -using System.IO; -using System.Diagnostics; -using System.Threading; -using Handbrake.EncodeQueue; -using Handbrake.Functions; -using Handbrake.Presets; -using Handbrake.Parsing; - namespace Handbrake { + using System; + using System.Collections.Generic; + using System.ComponentModel; + using System.Diagnostics; + using System.Drawing; + using System.Globalization; + using System.IO; + using System.Threading; + using System.Windows.Forms; + using EncodeQueue; + using Functions; + using Model; + using Parsing; + using Presets; + public partial class frmMain : Form { // Objects which may be used by one or more other objects ************* - EncodeAndQueueHandler encodeQueue = new EncodeAndQueueHandler(); - PresetsHandler presetHandler = new PresetsHandler(); - QueryGenerator queryGen = new QueryGenerator(); + private Queue encodeQueue = new Queue(); + private PresetsHandler presetHandler = new PresetsHandler(); // Globals: Mainly used for tracking. ********************************* public Title selectedTitle; - private DVD thisDVD; private frmQueue queueWindow; private frmPreview qtpreview; private frmActivityWindow ActivityWindow; private Form splash; public string sourcePath; private string lastAction; + private SourceType selectedSourceType; + private string dvdDrivePath; + private string dvdDriveLabel; + private Preset CurrentlySelectedPreset; + private DVD currentSource; // Delegates ********************************************************** private delegate void UpdateWindowHandler(); @@ -42,12 +47,13 @@ namespace Handbrake // Applicaiton Startup ************************************************ #region Application Startup + public frmMain() { // Load and setup the splash screen in this thread splash = new frmSplashScreen(); splash.Show(this); - Label lblStatus = new Label { Size = new Size(150, 20), Location = new Point(182, 102) }; + Label lblStatus = new Label {Size = new Size(150, 20), Location = new Point(182, 102)}; splash.Controls.Add(lblStatus); InitializeComponent(); @@ -55,7 +61,7 @@ namespace Handbrake // Update the users config file with the CLI version data. lblStatus.Text = "Setting Version Data ..."; Application.DoEvents(); - Main.setCliVersionData(); + Main.SetCliVersionData(); // Show the form, but leave disabled until preloading is complete then show the main form this.Enabled = false; @@ -77,34 +83,43 @@ namespace Handbrake } } + // Clear the log files in the background + if (Properties.Settings.Default.clearOldLogs) + { + lblStatus.Text = "Clearing Old Log Files ..."; + Application.DoEvents(); + Thread clearLog = new Thread(Main.ClearOldLogs); + clearLog.Start(); + } + // Setup the GUI components lblStatus.Text = "Setting up the GUI ..."; Application.DoEvents(); - loadPresetPanel(); // Load the Preset Panel + LoadPresetPanel(); // Load the Preset Panel treeView_presets.ExpandAll(); - lbl_encode.Text = ""; - queueWindow = new frmQueue(encodeQueue); // Prepare the Queue + lbl_encode.Text = string.Empty; + drop_mode.SelectedIndex = 0; + queueWindow = new frmQueue(encodeQueue, this); // Prepare the Queue if (!Properties.Settings.Default.QueryEditorTab) tabs_panel.TabPages.RemoveAt(7); // Remove the query editor tab if the user does not want it enabled. // Load the user's default settings or Normal Preset - if (Properties.Settings.Default.defaultSettings && Properties.Settings.Default.defaultPreset != "") + if (Properties.Settings.Default.defaultPreset != string.Empty) { - if (presetHandler.getPreset(Properties.Settings.Default.defaultPreset) != null) + if (presetHandler.GetPreset(Properties.Settings.Default.defaultPreset) != null) { - string query = presetHandler.getPreset(Properties.Settings.Default.defaultPreset).Query; - Boolean loadPictureSettings = presetHandler.getPreset(Properties.Settings.Default.defaultPreset).PictureSettings; + string query = presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).Query; + bool loadPictureSettings = + presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).PictureSettings; if (query != null) { - //Ok, Reset all the H264 widgets before changing the preset - x264Panel.reset2Defaults(); + x264Panel.Reset2Defaults(); - // Send the query from the file to the Query Parser class, then load the preset QueryParser presetQuery = QueryParser.Parse(query); - PresetLoader.presetLoader(this, presetQuery, Properties.Settings.Default.defaultPreset, loadPictureSettings); + PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset, + loadPictureSettings); - // The x264 widgets will need updated, so do this now: x264Panel.X264_StandardizeOptString(); x264Panel.X264_SetCurrentSettingsInPanel(); } @@ -119,7 +134,10 @@ namespace Handbrake if (Properties.Settings.Default.tooltipEnable) ToolTip.Active = true; - //Finished Loading + // Register with Growl (if not using Growl for the encoding completion action, this wont hurt anything) + GrowlCommunicator.Register(); + + // Finished Loading lblStatus.Text = "Loading Complete!"; Application.DoEvents(); splash.Close(); @@ -153,17 +171,22 @@ namespace Handbrake } catch (Exception ex) { - if ((bool)result.AsyncState) - MessageBox.Show("Unable to check for updates, Please try again later. \n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + if ((bool) result.AsyncState) + MessageBox.Show( + "Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex, + "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } // Startup Functions private void queueRecovery() { - if (Main.check_queue_recovery()) + if (Main.CheckQueueRecovery()) { - 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); + 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); if (result == DialogResult.Yes) encodeQueue.LoadQueueFromFile("hb_queue_recovery.xml"); // Start Recovery @@ -176,23 +199,46 @@ namespace Handbrake } } } + + #endregion + + #region Properties + + public string SourceName + { + get + { + if (this.selectedSourceType == SourceType.DvdDrive) + { + return this.dvdDriveLabel; + } + + if (Path.GetFileNameWithoutExtension(this.sourcePath) != "VIDEO_TS") + return Path.GetFileNameWithoutExtension(this.sourcePath); + + return Path.GetFileNameWithoutExtension(Path.GetDirectoryName(this.sourcePath)); + } + } + #endregion #region Events + // Encoding Events for setting up the GUI private void events() { // Handle Widget changes when preset is selected. - registerPresetEventHandler(); + RegisterPresetEventHandler(); // Handle Window Resize if (Properties.Settings.Default.MainWindowMinimize) this.Resize += new EventHandler(frmMain_Resize); // Handle Encode Start / Finish / Pause - encodeQueue.CurrentJobCompleted += new EventHandler(encodeEnded); + encodeQueue.QueuePauseRequested += new EventHandler(encodePaused); - encodeQueue.NewJobStarted += new EventHandler(encodeStarted); + encodeQueue.EncodeStarted += new EventHandler(encodeStarted); + encodeQueue.EncodeEnded += new EventHandler(encodeEnded); // Handle a file being draged onto the GUI. this.DragEnter += new DragEventHandler(frmMain_DragEnter); @@ -200,7 +246,7 @@ namespace Handbrake } // 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 - public void registerPresetEventHandler() + private void RegisterPresetEventHandler() { // Output Settings drop_format.SelectedIndexChanged += new EventHandler(changePresetLabel); @@ -209,7 +255,7 @@ namespace Handbrake check_optimiseMP4.CheckedChanged += new EventHandler(changePresetLabel); // Picture Settings - //PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel); + // PictureSettings.PictureSettingsChanged += new EventHandler(changePresetLabel); // Filter Settings Filters.FilterSettingsChanged += new EventHandler(changePresetLabel); @@ -228,7 +274,8 @@ namespace Handbrake // Advanced Tab x264Panel.rtf_x264Query.TextChanged += new EventHandler(changePresetLabel); } - public void unRegisterPresetEventHandler() + + private void UnRegisterPresetEventHandler() { // Output Settings drop_format.SelectedIndexChanged -= new EventHandler(changePresetLabel); @@ -237,7 +284,7 @@ namespace Handbrake check_optimiseMP4.CheckedChanged -= new EventHandler(changePresetLabel); // Picture Settings - //PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel); + // PictureSettings.PictureSettingsChanged -= new EventHandler(changePresetLabel); // Filter Settings Filters.FilterSettingsChanged -= new EventHandler(changePresetLabel); @@ -256,9 +303,11 @@ namespace Handbrake // Advanced Tab x264Panel.rtf_x264Query.TextChanged -= new EventHandler(changePresetLabel); } + private void changePresetLabel(object sender, EventArgs e) { labelPreset.Text = "Output Settings (Preset: Custom)"; + CurrentlySelectedPreset = null; } private static void frmMain_DragEnter(object sender, DragEventArgs e) @@ -266,6 +315,7 @@ namespace Handbrake if (e.Data.GetDataPresent(DataFormats.FileDrop, false)) e.Effect = DragDropEffects.All; } + private void frmMain_DragDrop(object sender, DragEventArgs e) { string[] fileList = e.Data.GetData(DataFormats.FileDrop) as string[]; @@ -273,157 +323,139 @@ namespace Handbrake if (fileList != null) { - if (fileList[0].StartsWith("\\")) + if (fileList[0] != string.Empty) { - 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); - UpdateSourceLabel(); + this.selectedSourceType = SourceType.VideoFile; + StartScan(fileList[0], 0); } else - { - if (fileList[0] != "") - { - setupGUIforScan(fileList[0]); - startScan(fileList[0]); - } - else - UpdateSourceLabel(); - } + UpdateSourceLabel(); } else UpdateSourceLabel(); } + private void encodeStarted(object sender, EventArgs e) { lastAction = "encode"; - setEncodeStarted(); + SetEncodeStarted(); // Experimental HBProc Process Monitoring. if (Properties.Settings.Default.enocdeStatusInGui) { - Thread encodeMon = new Thread(encodeMonitorThread); + Thread encodeMon = new Thread(EncodeMonitorThread); encodeMon.Start(); } } + private void encodeEnded(object sender, EventArgs e) { - setEncodeFinished(); + SetEncodeFinished(); } + private void encodePaused(object sender, EventArgs e) { - setEncodeFinished(); + SetEncodeFinished(); } + #endregion // User Interface Menus / Tool Strips ********************************* #region File Menu + private void mnu_killCLI_Click(object sender, EventArgs e) { - killScan(); + KillScan(); } + private void mnu_exit_Click(object sender, EventArgs e) { Application.Exit(); } + #endregion #region Tools Menu + private void mnu_encode_Click(object sender, EventArgs e) { queueWindow.Show(); } + private void mnu_encodeLog_Click(object sender, EventArgs e) { - String file = lastAction == "scan" ? "last_scan_log.txt" : "last_encode_log.txt"; - - frmActivityWindow dvdInfoWindow = new frmActivityWindow(file, encodeQueue, this); + frmActivityWindow dvdInfoWindow = new frmActivityWindow(lastAction); dvdInfoWindow.Show(); } + private void mnu_options_Click(object sender, EventArgs e) { - Form options = new frmOptions(); + Form options = new frmOptions(this); options.ShowDialog(); } + #endregion #region Presets Menu + private void mnu_presetReset_Click(object sender, EventArgs e) { - presetHandler.updateBuiltInPresets(); - loadPresetPanel(); + presetHandler.UpdateBuiltInPresets(); + LoadPresetPanel(); if (treeView_presets.Nodes.Count == 0) - 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); + 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); else MessageBox.Show("Presets have been updated!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information); treeView_presets.ExpandAll(); } + private void mnu_delete_preset_Click(object sender, EventArgs e) { - presetHandler.removeBuiltInPresets(); - loadPresetPanel(); // Reload the preset panel + presetHandler.RemoveBuiltInPresets(); + LoadPresetPanel(); // Reload the preset panel } + private void mnu_SelectDefault_Click(object sender, EventArgs e) { loadNormalPreset(); } + private void mnu_importMacPreset_Click(object sender, EventArgs e) { - Import imp = new Import(); - if (openPreset.ShowDialog() == DialogResult.OK) - { - QueryParser parsed = imp.importMacPreset(openPreset.FileName); - if (presetHandler.checkIfUserPresetExists(parsed.PresetName + " (Imported)")) - { - DialogResult result = MessageBox.Show("This preset appears to already exist. Would you like to overwrite it?", "Overwrite preset?", - MessageBoxButtons.YesNo, MessageBoxIcon.Warning); - if (result == DialogResult.Yes) - { - PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings); - presetHandler.updatePreset(parsed.PresetName + " (Imported)", queryGen.generateTheQuery(this), - parsed.UsesPictureSettings); - } - } - else - { - PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings); - presetHandler.addPreset(parsed.PresetName, queryGen.generateTheQuery(this), parsed.UsesPictureSettings); - - if (presetHandler.addPreset(parsed.PresetName + " (Imported)", queryGen.generateTheQuery(this), parsed.UsesPictureSettings)) - { - TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)") { ForeColor = Color.Black }; - treeView_presets.Nodes.Add(preset_treeview); - } - } - } + importPreset(); } + private void btn_new_preset_Click(object sender, EventArgs e) { - Form preset = new frmAddPreset(this, queryGen.generateTheQuery(this), presetHandler); + Form preset = new frmAddPreset(this, QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), + presetHandler); preset.ShowDialog(); } + #endregion #region Help Menu - private void mnu_handbrake_forums_Click(object sender, EventArgs e) - { - Process.Start("http://forum.handbrake.fr/"); - } + private void mnu_user_guide_Click(object sender, EventArgs e) { Process.Start("http://trac.handbrake.fr/wiki/HandBrakeGuide"); } + private void mnu_handbrake_home_Click(object sender, EventArgs e) { Process.Start("http://handbrake.fr"); } + private void mnu_UpdateCheck_Click(object sender, EventArgs e) { lbl_updateCheck.Visible = true; Main.BeginCheckForUpdates(new AsyncCallback(updateCheckDoneMenu), false); } + private void updateCheckDoneMenu(IAsyncResult result) { // Make sure it's running on the calling thread @@ -437,23 +469,27 @@ namespace Handbrake { // Get the information about the new build, if any, and close the window info = Main.EndCheckForUpdates(result); - + if (info.NewVersionAvailable && info.BuildInformation != null) { frmUpdater updateWindow = new frmUpdater(info.BuildInformation); updateWindow.ShowDialog(); } else - MessageBox.Show("There are no new updates at this time.", "Update Check", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("There are no new updates at this time.", "Update Check", MessageBoxButtons.OK, + MessageBoxIcon.Information); lbl_updateCheck.Visible = false; return; } catch (Exception ex) { - if ((bool)result.AsyncState) - MessageBox.Show("Unable to check for updates, Please try again later. \n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + if ((bool) result.AsyncState) + MessageBox.Show( + "Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex, + "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + private void mnu_about_Click(object sender, EventArgs e) { using (frmAbout About = new frmAbout()) @@ -461,43 +497,60 @@ namespace Handbrake About.ShowDialog(); } } + #endregion #region Preset Bar + // Right Click Menu Code private void pmnu_expandAll_Click(object sender, EventArgs e) { treeView_presets.ExpandAll(); } + private void pmnu_collapse_Click(object sender, EventArgs e) { treeView_presets.CollapseAll(); } + + private void pmnu_import_Click(object sender, EventArgs e) + { + importPreset(); + } + private void pmnu_saveChanges_Click(object sender, EventArgs e) { - 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); + 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); if (result == DialogResult.Yes) - presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.generateTabbedComponentsQuery(this), true); + presetHandler.Update(treeView_presets.SelectedNode.Text, + QueryGenerator.GenerateTabbedComponentsQuery(this), true); else if (result == DialogResult.No) - presetHandler.updatePreset(treeView_presets.SelectedNode.Text, QueryGenerator.generateTabbedComponentsQuery(this), false); + presetHandler.Update(treeView_presets.SelectedNode.Text, + QueryGenerator.GenerateTabbedComponentsQuery(this), false); } + private void pmnu_delete_click(object sender, EventArgs e) { if (treeView_presets.SelectedNode != null) { - presetHandler.remove(treeView_presets.SelectedNode.Text); + presetHandler.Remove(treeView_presets.SelectedNode.Text); treeView_presets.Nodes.Remove(treeView_presets.SelectedNode); } treeView_presets.Select(); } - private void presets_menu_Opening(object sender, System.ComponentModel.CancelEventArgs e) + + private void presets_menu_Opening(object sender, CancelEventArgs e) { // Make sure that the save menu is always disabled by default pmnu_saveChanges.Enabled = false; // Now enable the save menu if the selected preset is a user preset if (treeView_presets.SelectedNode != null) - if (presetHandler.checkIfUserPresetExists(treeView_presets.SelectedNode.Text)) + if (presetHandler.CheckIfUserPresetExists(treeView_presets.SelectedNode.Text)) pmnu_saveChanges.Enabled = true; treeView_presets.Select(); @@ -506,27 +559,31 @@ namespace Handbrake // Presets Management private void btn_addPreset_Click(object sender, EventArgs e) { - Form preset = new frmAddPreset(this, QueryGenerator.generateTabbedComponentsQuery(this), presetHandler); + Form preset = new frmAddPreset(this, QueryGenerator.GenerateTabbedComponentsQuery(this), presetHandler); preset.ShowDialog(); } + private void btn_removePreset_Click(object sender, EventArgs e) { - DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", + MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result == DialogResult.Yes) { if (treeView_presets.SelectedNode != null) { - presetHandler.remove(treeView_presets.SelectedNode.Text); + presetHandler.Remove(treeView_presets.SelectedNode.Text); treeView_presets.Nodes.Remove(treeView_presets.SelectedNode); } } treeView_presets.Select(); } + private void btn_setDefault_Click(object sender, EventArgs e) { if (treeView_presets.SelectedNode != null) { - DialogResult result = MessageBox.Show("Are you sure you wish to set this preset as the default?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + DialogResult result = MessageBox.Show("Are you sure you wish to set this preset as the default?", + "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result == DialogResult.Yes) { Properties.Settings.Default.defaultPreset = treeView_presets.SelectedNode.Text; @@ -537,6 +594,7 @@ namespace Handbrake else MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); } + private void treeview_presets_mouseUp(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Right) @@ -552,27 +610,30 @@ namespace Handbrake treeView_presets.Select(); } + private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e) { selectPreset(); } + private void treeView_presets_deleteKey(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Delete) { - DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", + MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result == DialogResult.Yes) { if (treeView_presets.SelectedNode != null) - presetHandler.remove(treeView_presets.SelectedNode.Text); + presetHandler.Remove(treeView_presets.SelectedNode.Text); // Remember each nodes expanded status so we can reload it - List nodeStatus = new List(); + List nodeStatus = new List(); foreach (TreeNode node in treeView_presets.Nodes) nodeStatus.Add(node.IsExpanded); // Now reload the preset panel - loadPresetPanel(); + LoadPresetPanel(); // And finally, re-expand any of the nodes if required int i = 0; @@ -586,35 +647,42 @@ namespace Handbrake } } } + private void selectPreset() { if (treeView_presets.SelectedNode != null) { // Ok, so, we've selected a preset. Now we want to load it. string presetName = treeView_presets.SelectedNode.Text; - if (presetHandler.getPreset(presetName) != null) + Preset preset = presetHandler.GetPreset(presetName); + if (preset != null) { - string query = presetHandler.getPreset(presetName).Query; - Boolean loadPictureSettings = presetHandler.getPreset(presetName).PictureSettings; + string query = presetHandler.GetPreset(presetName).Query; + bool loadPictureSettings = presetHandler.GetPreset(presetName).PictureSettings; if (query != null) { - //Ok, Reset all the H264 widgets before changing the preset - x264Panel.reset2Defaults(); + // Ok, Reset all the H264 widgets before changing the preset + x264Panel.Reset2Defaults(); // Send the query from the file to the Query Parser class QueryParser presetQuery = QueryParser.Parse(query); // Now load the preset - PresetLoader.presetLoader(this, presetQuery, presetName, loadPictureSettings); + PresetLoader.LoadPreset(this, presetQuery, presetName, loadPictureSettings); // The x264 widgets will need updated, so do this now: x264Panel.X264_StandardizeOptString(); x264Panel.X264_SetCurrentSettingsInPanel(); + + // Finally, let this window have a copy of the preset settings. + CurrentlySelectedPreset = preset; + PictureSettings.SetPresetCropWarningLabel(preset); } } } } + private void loadNormalPreset() { foreach (TreeNode treenode in treeView_presets.Nodes) @@ -626,58 +694,121 @@ namespace Handbrake } } } + + private void importPreset() + { + if (openPreset.ShowDialog() == DialogResult.OK) + { + QueryParser parsed = PlistPresetHandler.Import(openPreset.FileName); + if (presetHandler.CheckIfUserPresetExists(parsed.PresetName + " (Imported)")) + { + DialogResult result = + MessageBox.Show("This preset appears to already exist. Would you like to overwrite it?", + "Overwrite preset?", + MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + if (result == DialogResult.Yes) + { + PresetLoader.LoadPreset(this, parsed, parsed.PresetName, parsed.UsesPictureSettings); + presetHandler.Update(parsed.PresetName + " (Imported)", + QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), + parsed.UsesPictureSettings); + } + } + else + { + PresetLoader.LoadPreset(this, parsed, parsed.PresetName, parsed.UsesPictureSettings); + presetHandler.Add(parsed.PresetName, + QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), + parsed.UsesPictureSettings); + + if (presetHandler.Add(parsed.PresetName + " (Imported)", + QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null), + parsed.UsesPictureSettings)) + { + TreeNode preset_treeview = new TreeNode(parsed.PresetName + " (Imported)") + { + ForeColor = Color.Black + }; + treeView_presets.Nodes.Add(preset_treeview); + } + } + } + } + #endregion #region ToolStrip + private void btn_source_Click(object sender, EventArgs e) { - if (Properties.Settings.Default.drive_detection) - { - mnu_dvd_drive.Visible = true; - Thread driveInfoThread = new Thread(getDriveInfoThread); - driveInfoThread.Start(); - } - else - mnu_dvd_drive.Visible = false; + mnu_dvd_drive.Visible = true; + Thread driveInfoThread = new Thread(SetDriveSelectionMenuItem); + driveInfoThread.Start(); } + private void btn_start_Click(object sender, EventArgs e) { if (btn_start.Text == "Stop") { - DialogResult result = MessageBox.Show("Are you sure you wish to cancel the encode?", "Cancel Encode?", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + DialogResult result; + if (Properties.Settings.Default.enocdeStatusInGui && + !Properties.Settings.Default.showCliForInGuiEncodeStatus) + { + result = MessageBox.Show( + "Are you sure you wish to cancel the encode?\n\nPlease note, when 'Enable in-GUI encode status' is enabled, stopping this encode will render the file unplayable. ", + "Cancel Encode?", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + } + else + { + result = MessageBox.Show("Are you sure you wish to cancel the encode?", "Cancel Encode?", + MessageBoxButtons.YesNo, MessageBoxIcon.Question); + } if (result == DialogResult.Yes) { // Pause The Queue - encodeQueue.RequestPause(); + encodeQueue.Pause(); - // Allow the CLI to exit cleanly - Win32.SetForegroundWindow((int)encodeQueue.processHandle); - SendKeys.Send("^C"); + if (Properties.Settings.Default.enocdeStatusInGui && + !Properties.Settings.Default.showCliForInGuiEncodeStatus) + { + encodeQueue.Stop(); + if (encodeQueue.HbProcess != null) + encodeQueue.HbProcess.WaitForExit(); + } + else + { + encodeQueue.SafelyClose(); + } // Update the GUI - setEncodeFinished(); + SetEncodeFinished(); } } else { - if (encodeQueue.Count != 0 || (!string.IsNullOrEmpty(sourcePath) && !string.IsNullOrEmpty(text_destination.Text))) + if (encodeQueue.Count != 0 || + (!string.IsNullOrEmpty(sourcePath) && !string.IsNullOrEmpty(text_destination.Text))) { - string generatedQuery = queryGen.generateTheQuery(this); - string specifiedQuery = rtf_query.Text != "" ? rtf_query.Text : queryGen.generateTheQuery(this); + string generatedQuery = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null); + string specifiedQuery = rtf_query.Text != string.Empty + ? rtf_query.Text + : QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null); string query = string.Empty; // Check to make sure the generated query matches the GUI settings - if (Properties.Settings.Default.PromptOnUnmatchingQueries && !string.IsNullOrEmpty(specifiedQuery) && generatedQuery != specifiedQuery) + if (Properties.Settings.Default.PromptOnUnmatchingQueries && !string.IsNullOrEmpty(specifiedQuery) && + generatedQuery != specifiedQuery) { DialogResult result = MessageBox.Show("The query under the \"Query Editor\" tab " + - "does not match the current GUI settings. Because the manual query takes " + - "priority over the GUI, your recently updated settings will not be taken " + - "into account when encoding this job." + Environment.NewLine + Environment.NewLine + - "Do you want to replace the manual query with the GUI-generated query?", - "Manual Query does not Match GUI", - MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk, - MessageBoxDefaultButton.Button3); + "does not match the current GUI settings.\n\nBecause the manual query takes " + + "priority over the GUI, your recently updated settings will not be taken " + + "into account when encoding this job." + + Environment.NewLine + Environment.NewLine + + "Do you want to replace the manual query with the updated GUI-generated query?", + "Manual Query does not Match GUI", + MessageBoxButtons.YesNoCancel, MessageBoxIcon.Asterisk, + MessageBoxDefaultButton.Button3); switch (result) { @@ -697,66 +828,81 @@ namespace Handbrake } else { - query = generatedQuery; + query = specifiedQuery; } DialogResult overwrite = DialogResult.Yes; - if (text_destination.Text != "") + if (text_destination.Text != string.Empty) if (File.Exists(text_destination.Text)) - overwrite = MessageBox.Show("The destination file already exists. Are you sure you want to overwrite it?", "Overwrite File?", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + overwrite = + MessageBox.Show( + "The destination file already exists. Are you sure you want to overwrite it?", + "Overwrite File?", MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (overwrite == DialogResult.Yes) { if (encodeQueue.Count == 0) - encodeQueue.AddJob(query, sourcePath, text_destination.Text); + encodeQueue.Add(query, sourcePath, text_destination.Text, (rtf_query.Text != string.Empty)); - queueWindow.setQueue(); + queueWindow.SetQueue(); if (encodeQueue.Count > 1) queueWindow.Show(false); - setEncodeStarted(); // Encode is running, so setup the GUI appropriately - ActivityWindow.setLogView(false); - encodeQueue.StartEncodeQueue(); // Start The Queue Encoding Process - lastAction = "encode"; // Set the last action to encode - Used for activity window. + SetEncodeStarted(); // Encode is running, so setup the GUI appropriately + encodeQueue.Start(); // Start The Queue Encoding Process + lastAction = "encode"; // Set the last action to encode - Used for activity window. } + if (ActivityWindow != null) + ActivityWindow.SetEncodeMode(); + this.Focus(); } else if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text)) - MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, + MessageBoxIcon.Warning); } } + private void btn_add2Queue_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text)) - MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, + MessageBoxIcon.Warning); else { - String query = queryGen.generateTheQuery(this); - if (rtf_query.Text != "") + string query = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null); + if (rtf_query.Text != string.Empty) query = rtf_query.Text; if (encodeQueue.CheckForDestinationDuplicate(text_destination.Text)) { - 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?", - "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + 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?", + "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); if (result == DialogResult.Yes) - encodeQueue.AddJob(query, sourcePath, text_destination.Text); - + encodeQueue.Add(query, sourcePath, text_destination.Text, (rtf_query.Text != string.Empty)); } else - encodeQueue.AddJob(query, sourcePath, text_destination.Text); + encodeQueue.Add(query, sourcePath, text_destination.Text, (rtf_query.Text != string.Empty)); + + lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue"; queueWindow.Show(); } } + private void btn_showQueue_Click(object sender, EventArgs e) { queueWindow.Show(); + queueWindow.Activate(); } + private void tb_preview_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text)) - MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("No source or destination selected.", "Warning", MessageBoxButtons.OK, + MessageBoxIcon.Warning); else { if (qtpreview == null) @@ -770,20 +916,37 @@ namespace Handbrake qtpreview.Show(); } else - MessageBox.Show(qtpreview, "The preview window is already open!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show(qtpreview, "The preview window is already open!", "Warning", MessageBoxButtons.OK, + MessageBoxIcon.Warning); } } + private void btn_ActivityWindow_Click(object sender, EventArgs e) { - String file = lastAction == "scan" ? "last_scan_log.txt" : "last_encode_log.txt"; - if (ActivityWindow == null) - ActivityWindow = new frmActivityWindow(file, encodeQueue, this); - + if (ActivityWindow == null || !ActivityWindow.IsHandleCreated) + ActivityWindow = new frmActivityWindow(lastAction); + else + switch (lastAction) + { + case "scan": + ActivityWindow.SetScanMode(); + break; + case "encode": + ActivityWindow.SetEncodeMode(); + break; + default: + ActivityWindow.SetEncodeMode(); + break; + } + ActivityWindow.Show(); + ActivityWindow.Activate(); } + #endregion #region System Tray Icon + private void frmMain_Resize(object sender, EventArgs e) { if (FormWindowState.Minimized == this.WindowState) @@ -794,6 +957,7 @@ namespace Handbrake else if (FormWindowState.Normal == this.WindowState) notifyIcon.Visible = false; } + private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e) { this.Visible = true; @@ -801,6 +965,7 @@ namespace Handbrake this.WindowState = FormWindowState.Normal; notifyIcon.Visible = false; } + private void btn_restore_Click(object sender, EventArgs e) { this.Visible = true; @@ -808,111 +973,71 @@ namespace Handbrake this.WindowState = FormWindowState.Normal; notifyIcon.Visible = false; } + #endregion #region Tab Control - //Source + // Source private void btn_dvd_source_Click(object sender, EventArgs e) { - // Enable the creation of chapter markers. - Check_ChapterMarkers.Enabled = true; - - // Set the last action to scan. - // This is used for tracking which file to load in the activity window - lastAction = "scan"; - sourcePath = string.Empty; - if (DVD_Open.ShowDialog() == DialogResult.OK) { - String filename = DVD_Open.SelectedPath; - - if (filename.StartsWith("\\")) - { - 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); - UpdateSourceLabel(); - } - else - { - if (filename != "") - { - sourcePath = Path.GetFullPath(filename); - setupGUIforScan(filename); - startScan(filename); - } else - UpdateSourceLabel(); - } + this.selectedSourceType = SourceType.Folder; + SelectSource(DVD_Open.SelectedPath); } else UpdateSourceLabel(); } + private void btn_file_source_Click(object sender, EventArgs e) { - // Set the last action to scan. - // This is used for tracking which file to load in the activity window - lastAction = "scan"; - sourcePath = string.Empty; - if (ISO_Open.ShowDialog() == DialogResult.OK) { - String filename = ISO_Open.FileName; - if (filename.StartsWith("\\")) - 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); - else - { - if (filename != "") - { - sourcePath = Path.GetFileName(filename); - setupGUIforScan(filename); - startScan(filename); - } else - UpdateSourceLabel(); - } + this.selectedSourceType = SourceType.VideoFile; + SelectSource(ISO_Open.FileName); } - UpdateSourceLabel(); + else + UpdateSourceLabel(); } + private void mnu_dvd_drive_Click(object sender, EventArgs e) { - // Enable the creation of chapter markers. - Check_ChapterMarkers.Enabled = true; + if (this.dvdDrivePath == null) return; + this.selectedSourceType = SourceType.DvdDrive; + SelectSource(this.dvdDrivePath); + } - // Set the last action to scan. - // This is used for tracking which file to load in the activity window + private void SelectSource(string file) + { + Check_ChapterMarkers.Enabled = true; lastAction = "scan"; sourcePath = string.Empty; - if (mnu_dvd_drive.Text.Contains("VIDEO_TS")) + if (file == string.Empty) // Must have a file or path { - string[] path = mnu_dvd_drive.Text.Split(' '); - String filename = path[0]; - sourcePath = Path.GetFullPath(filename); - setupGUIforScan(filename); - startScan(filename); + UpdateSourceLabel(); + return; } - // If there are no titles in the dropdown menu then the scan has obviously failed. Display an error message explaining to the user. - if (drp_dvdtitle.Items.Count == 0) - 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); - - UpdateSourceLabel(); - - lbl_encode.Text = ""; + sourcePath = Path.GetFileName(file); + StartScan(file, 0); } + private void drp_dvdtitle_Click(object sender, EventArgs e) { if ((drp_dvdtitle.Items.Count == 1) && (drp_dvdtitle.Items[0].ToString() == "Automatic")) - MessageBox.Show("There are no titles to select. Please load a source file by clicking the 'Source' button above before trying to select a title.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); + MessageBox.Show( + "There are no titles to select. Please load a source file by clicking the 'Source' button above before trying to select a title.", + "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); } + private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e) { - unRegisterPresetEventHandler(); - // Reset some values on the form - PictureSettings.lbl_Aspect.Text = "Select a Title"; - //lbl_RecomendedCrop.Text = "Select a Title"; + UnRegisterPresetEventHandler(); + drop_mode.SelectedIndex = 0; + + PictureSettings.lbl_Aspect.Text = "Select a Title"; // Reset some values on the form drop_chapterStart.Items.Clear(); drop_chapterFinish.Items.Clear(); @@ -922,11 +1047,12 @@ namespace Handbrake { selectedTitle = drp_dvdtitle.SelectedItem as Title; lbl_duration.Text = selectedTitle.Duration.ToString(); - PictureSettings.Source = selectedTitle; // Setup Picture Settings Tab Control + PictureSettings.CurrentlySelectedPreset = CurrentlySelectedPreset; + PictureSettings.Source = selectedTitle; // Setup Picture Settings Tab Control // Populate the Angles dropdown drop_angle.Items.Clear(); - if (Properties.Settings.Default.dvdnav) + if (!Properties.Settings.Default.noDvdNav) { drop_angle.Visible = true; lbl_angle.Visible = true; @@ -953,30 +1079,32 @@ namespace Handbrake drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString(); // Populate the Audio Channels Dropdown - AudioSettings.setTrackList(selectedTitle); + AudioSettings.SetTrackList(selectedTitle); // Populate the Subtitles dropdown - Subtitles.drp_subtitleTracks.Items.Clear(); - Subtitles.drp_subtitleTracks.Items.Add("Foreign Audio Search (Bitmap)"); - Subtitles.drp_subtitleTracks.Items.AddRange(selectedTitle.Subtitles.ToArray()); - Subtitles.drp_subtitleTracks.SelectedIndex = 0; - Subtitles.setSubtitleTrackAuto(); + Subtitles.SetSubtitleTrackAuto(selectedTitle.Subtitles.ToArray()); } + // Update the source label if we have multiple streams + if (selectedTitle != null) + if (!string.IsNullOrEmpty(selectedTitle.SourceName)) + labelSource.Text = labelSource.Text = Path.GetFileName(selectedTitle.SourceName); - // Run the autoName & chapterNaming functions + // Run the AutoName & ChapterNaming functions if (Properties.Settings.Default.autoNaming) { - string autoPath = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, sourcePath, text_destination.Text, drop_format.SelectedIndex); + string autoPath = Main.AutoName(this); if (autoPath != null) text_destination.Text = autoPath; else - 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); + 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); } data_chpt.Rows.Clear(); if (selectedTitle.Chapters.Count != 1) { - DataGridView chapterGridView = Main.chapterNaming(data_chpt, drop_chapterFinish.Text); + DataGridView chapterGridView = Main.ChapterNaming(data_chpt, drop_chapterFinish.Text); if (chapterGridView != null) data_chpt = chapterGridView; } @@ -990,91 +1118,154 @@ namespace Handbrake data_chpt.Columns[0].Width = 166; data_chpt.Columns[0].Width = 165; - registerPresetEventHandler(); + RegisterPresetEventHandler(); } - private void drop_chapterStart_SelectedIndexChanged(object sender, EventArgs e) - { - int c_start, c_end; - if (drop_chapterFinish.Text == "Auto" && drop_chapterFinish.Items.Count != 0) - drop_chapterFinish.SelectedIndex = drop_chapterFinish.Items.Count - 1; + private void chapersChanged(object sender, EventArgs e) + { + if (drop_mode.SelectedIndex != 0) // Function is not used if we are not in chapters mode. + return; - int.TryParse(drop_chapterStart.Text, out c_start); - int.TryParse(drop_chapterFinish.Text, out c_end); + Control ctl = (Control) sender; + int chapterStart, chapterEnd; + int.TryParse(drop_chapterStart.Text, out chapterStart); + int.TryParse(drop_chapterFinish.Text, out chapterEnd); - if (c_end != 0) + switch (ctl.Name) { - if (c_start > c_end) - drop_chapterFinish.Text = c_start.ToString(); + case "drop_chapterStart": + if (drop_chapterFinish.SelectedIndex == -1 && drop_chapterFinish.Items.Count != 0) + drop_chapterFinish.SelectedIndex = drop_chapterFinish.Items.Count - 1; + + if (chapterEnd != 0) + if (chapterStart > chapterEnd) + drop_chapterFinish.Text = chapterStart.ToString(); + break; + case "drop_chapterFinish": + if (drop_chapterStart.Items.Count >= 1 && drop_chapterStart.SelectedIndex == -1) + drop_chapterStart.SelectedIndex = 0; + + if (chapterStart != 0) + if (chapterEnd < chapterStart) + drop_chapterFinish.Text = chapterStart.ToString(); + + // Add more rows to the Chapter menu if needed. + if (Check_ChapterMarkers.Checked) + { + int i = data_chpt.Rows.Count, finish = 0; + int.TryParse(drop_chapterFinish.Text, out finish); + + while (i < finish) + { + int n = data_chpt.Rows.Add(); + data_chpt.Rows[n].Cells[0].Value = (i + 1); + data_chpt.Rows[n].Cells[1].Value = "Chapter " + (i + 1); + data_chpt.Rows[n].Cells[0].ValueType = typeof (int); + data_chpt.Rows[n].Cells[1].ValueType = typeof (string); + i++; + } + } + break; } - lbl_duration.Text = Main.calculateDuration(drop_chapterStart.SelectedIndex, drop_chapterFinish.SelectedIndex, selectedTitle).ToString(); + // Update the Duration + lbl_duration.Text = + Main.CalculateDuration(drop_chapterStart.SelectedIndex, drop_chapterFinish.SelectedIndex, selectedTitle) + .ToString(); // Run the Autonaming function if (Properties.Settings.Default.autoNaming) - text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, sourcePath, text_destination.Text, drop_format.SelectedIndex); + text_destination.Text = Main.AutoName(this); // Disable chapter markers if only 1 chapter is selected. - if (c_start == c_end) + if (chapterStart == chapterEnd) { - Check_ChapterMarkers.Checked = false; Check_ChapterMarkers.Enabled = false; + btn_importChapters.Enabled = false; + data_chpt.Enabled = false; } else - Check_ChapterMarkers.Enabled = true; - } - private void drop_chapterFinish_SelectedIndexChanged(object sender, EventArgs e) - { - int c_start, c_end; - - if (drop_chapterStart.Text == "Auto" && drop_chapterStart.Items.Count >= 1) - drop_chapterStart.SelectedIndex = 1; - - int.TryParse(drop_chapterStart.Text, out c_start); - int.TryParse(drop_chapterFinish.Text, out c_end); - - if (c_start != 0) { - if (c_end < c_start) - drop_chapterFinish.Text = c_start.ToString(); + Check_ChapterMarkers.Enabled = true; + if (Check_ChapterMarkers.Checked) + { + btn_importChapters.Enabled = true; + data_chpt.Enabled = true; + } } + } - lbl_duration.Text = Main.calculateDuration(drop_chapterStart.SelectedIndex, drop_chapterFinish.SelectedIndex, selectedTitle).ToString(); - - // Run the Autonaming function - if (Properties.Settings.Default.autoNaming) - text_destination.Text = Main.autoName(drp_dvdtitle, drop_chapterStart.Text, drop_chapterFinish.Text, sourcePath, text_destination.Text, drop_format.SelectedIndex); + private void SecondsOrFramesChanged(object sender, EventArgs e) + { + int start, end; + int.TryParse(drop_chapterStart.Text, out start); + int.TryParse(drop_chapterFinish.Text, out end); + double duration = end - start; - // Add more rows to the Chapter menu if needed. - if (Check_ChapterMarkers.Checked) + switch (drop_mode.SelectedIndex) { - int i = data_chpt.Rows.Count, finish = 0; - - if (drop_chapterFinish.Text != "Auto") - int.TryParse(drop_chapterFinish.Text, out finish); + case 1: + lbl_duration.Text = TimeSpan.FromSeconds(duration).ToString(); + return; + case 2: + if (selectedTitle != null) + { + duration = duration/selectedTitle.Fps; + lbl_duration.Text = TimeSpan.FromSeconds(duration).ToString(); + } + else + lbl_duration.Text = "--:--:--"; - while (i < finish) - { - int n = data_chpt.Rows.Add(); - data_chpt.Rows[n].Cells[0].Value = (i + 1); - data_chpt.Rows[n].Cells[1].Value = "Chapter " + (i + 1); - data_chpt.Rows[n].Cells[0].ValueType = typeof(int); - data_chpt.Rows[n].Cells[1].ValueType = typeof(string); - i++; - } + return; } + } - // Disable chapter markers if only 1 chapter is selected. - if (c_start == c_end) + private void drop_mode_SelectedIndexChanged(object sender, EventArgs e) + { + // Reset + this.drop_chapterFinish.TextChanged -= new EventHandler(this.SecondsOrFramesChanged); + this.drop_chapterStart.TextChanged -= new EventHandler(this.SecondsOrFramesChanged); + + // Do Work + switch (drop_mode.SelectedIndex) { - Check_ChapterMarkers.Checked = false; - Check_ChapterMarkers.Enabled = false; + case 0: + drop_chapterStart.DropDownStyle = ComboBoxStyle.DropDownList; + drop_chapterFinish.DropDownStyle = ComboBoxStyle.DropDownList; + if (drop_chapterStart.Items.Count != 0) + { + drop_chapterStart.SelectedIndex = 0; + drop_chapterFinish.SelectedIndex = drop_chapterFinish.Items.Count - 1; + } + else + lbl_duration.Text = "--:--:--"; + return; + case 1: + this.drop_chapterStart.TextChanged += new EventHandler(this.SecondsOrFramesChanged); + this.drop_chapterFinish.TextChanged += new EventHandler(this.SecondsOrFramesChanged); + drop_chapterStart.DropDownStyle = ComboBoxStyle.Simple; + drop_chapterFinish.DropDownStyle = ComboBoxStyle.Simple; + if (selectedTitle != null) + { + drop_chapterStart.Text = "0"; + drop_chapterFinish.Text = selectedTitle.Duration.TotalSeconds.ToString(); + } + return; + case 2: + this.drop_chapterStart.TextChanged += new EventHandler(this.SecondsOrFramesChanged); + this.drop_chapterFinish.TextChanged += new EventHandler(this.SecondsOrFramesChanged); + drop_chapterStart.DropDownStyle = ComboBoxStyle.Simple; + drop_chapterFinish.DropDownStyle = ComboBoxStyle.Simple; + if (selectedTitle != null) + { + drop_chapterStart.Text = "0"; + drop_chapterFinish.Text = (selectedTitle.Fps*selectedTitle.Duration.TotalSeconds).ToString(); + } + return; } - else - Check_ChapterMarkers.Enabled = true; } - //Destination + // Destination private void btn_destBrowse_Click(object sender, EventArgs e) { // This removes the file extension from the filename box on the save file dialog. @@ -1092,36 +1283,36 @@ namespace Handbrake if (DVD_Save.ShowDialog() == DialogResult.OK) { - if (DVD_Save.FileName.StartsWith("\\")) - 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); - else + // Add a file extension manually, as FileDialog.AddExtension has issues with dots in filenames + switch (DVD_Save.FilterIndex) { - // Add a file extension manually, as FileDialog.AddExtension has issues with dots in filenames - switch (DVD_Save.FilterIndex) - { - case 1: - if (!Path.GetExtension(DVD_Save.FileName).Equals(".mp4", StringComparison.InvariantCultureIgnoreCase)) - if (Properties.Settings.Default.useM4v) - DVD_Save.FileName += ".m4v"; - else - DVD_Save.FileName += ".mp4"; - break; - case 2: - if (!Path.GetExtension(DVD_Save.FileName).Equals(".mkv", StringComparison.InvariantCultureIgnoreCase)) - DVD_Save.FileName += ".mkv"; - break; - default: - //do nothing - break; - } - text_destination.Text = DVD_Save.FileName; - - // Quicktime requires .m4v file for chapter markers to work. If checked, change the extension to .m4v (mp4 and m4v are the same thing) - if (Check_ChapterMarkers.Checked && DVD_Save.FilterIndex != 2) - setExtension(".m4v"); + case 1: + if ( + !Path.GetExtension(DVD_Save.FileName).Equals(".mp4", + StringComparison.InvariantCultureIgnoreCase)) + if (Properties.Settings.Default.useM4v) + DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".m4v").Replace(".mkv", ".m4v"); + else + DVD_Save.FileName = DVD_Save.FileName.Replace(".m4v", ".mp4").Replace(".mkv", ".mp4"); + break; + case 2: + if ( + !Path.GetExtension(DVD_Save.FileName).Equals(".mkv", + StringComparison.InvariantCultureIgnoreCase)) + DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", ".mkv").Replace(".m4v", ".mkv"); + break; + default: + // do nothing + break; } + text_destination.Text = DVD_Save.FileName; + + // Quicktime requires .m4v file for chapter markers to work. If checked, change the extension to .m4v (mp4 and m4v are the same thing) + if (Check_ChapterMarkers.Checked && DVD_Save.FilterIndex != 2) + SetExtension(".m4v"); } } + private void text_destination_TextChanged(object sender, EventArgs e) { string path = text_destination.Text; @@ -1137,20 +1328,21 @@ namespace Handbrake switch (drop_format.SelectedIndex) { case 0: - if (Properties.Settings.Default.useM4v) - setExtension(".m4v"); + if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || + AudioSettings.RequiresM4V() || Subtitles.RequiresM4V()) + SetExtension(".m4v"); else - setExtension(".mp4"); + SetExtension(".mp4"); break; case 1: - setExtension(".mkv"); + SetExtension(".mkv"); break; } - AudioSettings.setAudioByContainer(drop_format.Text); - Subtitles.setContainer(drop_format.SelectedIndex); + AudioSettings.SetContainer(drop_format.Text); + Subtitles.SetContainer(drop_format.SelectedIndex); - if ((drop_format.Text.Contains("MP4")) || (drop_format.Text.Contains("M4V"))) + if (drop_format.Text.Contains("MP4")) { if (drp_videoEncoder.Items.Contains("VP3 (Theora)")) { @@ -1161,19 +1353,26 @@ namespace Handbrake else if (drop_format.Text.Contains("MKV")) drp_videoEncoder.Items.Add("VP3 (Theora)"); } - private void setExtension(string newExtension) + + public void SetExtension(string newExtension) { - text_destination.Text = text_destination.Text.Replace(".mp4", newExtension); - text_destination.Text = text_destination.Text.Replace(".m4v", newExtension); - text_destination.Text = text_destination.Text.Replace(".mkv", newExtension); + if (newExtension == ".mp4" || newExtension == ".m4v") + if (Properties.Settings.Default.useM4v || Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || + Subtitles.RequiresM4V()) + newExtension = ".m4v"; + else + newExtension = ".mp4"; + + if (Path.HasExtension(newExtension)) + text_destination.Text = Path.ChangeExtension(text_destination.Text, newExtension); } - //Video Tab + // Video Tab private void drp_videoEncoder_SelectedIndexChanged(object sender, EventArgs e) { setContainerOpts(); - //Turn off some options which are H.264 only when the user selects a non h.264 encoder + // Turn off some options which are H.264 only when the user selects a non h.264 encoder if (drp_videoEncoder.Text.Contains("H.264")) { if (check_2PassEncode.CheckState == CheckState.Checked) @@ -1190,7 +1389,7 @@ namespace Handbrake check_turbo.CheckState = CheckState.Unchecked; check_turbo.Enabled = false; tab_advanced.Enabled = false; - x264Panel.x264Query = ""; + x264Panel.X264Query = string.Empty; check_iPodAtom.Enabled = false; check_iPodAtom.Checked = false; } @@ -1200,7 +1399,7 @@ namespace Handbrake { case "MPEG-4 (FFmpeg)": if (slider_videoQuality.Value > 31) - slider_videoQuality.Value = 20; // Just reset to 70% QP 10 on encode change. + slider_videoQuality.Value = 20; // Just reset to 70% QP 10 on encode change. slider_videoQuality.Minimum = 1; slider_videoQuality.Maximum = 31; break; @@ -1209,21 +1408,22 @@ namespace Handbrake slider_videoQuality.TickFrequency = 1; CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US"); - double multiplier = 1.0 / Properties.Settings.Default.x264cqstep; - double value = slider_videoQuality.Value * multiplier; + double cqStep = Properties.Settings.Default.x264cqstep; + double multiplier = 1.0/cqStep; + double value = slider_videoQuality.Value*multiplier; switch (Properties.Settings.Default.x264cqstep.ToString(culture)) { - case "0.20": + case "0.2": slider_videoQuality.Maximum = 255; break; case "0.25": slider_videoQuality.Maximum = 204; break; - case "0.50": - slider_videoQuality.Maximum = 40; + case "0.5": + slider_videoQuality.Maximum = 102; break; - case "1.0": + case "1": slider_videoQuality.Maximum = 51; break; default: @@ -1231,17 +1431,18 @@ namespace Handbrake break; } if (value < slider_videoQuality.Maximum) - slider_videoQuality.Value = slider_videoQuality.Maximum - (int)value; + slider_videoQuality.Value = slider_videoQuality.Maximum - (int) value; break; case "VP3 (Theora)": if (slider_videoQuality.Value > 63) - slider_videoQuality.Value = 45; // Just reset to 70% QP 45 on encode change. + slider_videoQuality.Value = 45; // Just reset to 70% QP 45 on encode change. slider_videoQuality.Minimum = 0; slider_videoQuality.Maximum = 63; break; } } + /// /// Set the container format options /// @@ -1263,32 +1464,73 @@ namespace Handbrake check_iPodAtom.Checked = false; } } + + private double _cachedCqStep = Properties.Settings.Default.x264cqstep; + + /// + /// Update the CQ slider for x264 for a new CQ step. This is set from option + /// + public void setQualityFromSlider() + { + // Work out the current RF value. + double cqStep = _cachedCqStep; + double rfValue = 51.0 - slider_videoQuality.Value*cqStep; + + // Change the maximum value for the slider + switch (Properties.Settings.Default.x264cqstep.ToString(new CultureInfo("en-US"))) + { + case "0.2": + slider_videoQuality.Maximum = 255; + break; + case "0.25": + slider_videoQuality.Maximum = 204; + break; + case "0.5": + slider_videoQuality.Maximum = 102; + break; + case "1": + slider_videoQuality.Maximum = 51; + break; + default: + slider_videoQuality.Maximum = 51; + break; + } + + // Reset the CQ slider to RF0 + slider_videoQuality.Value = slider_videoQuality.Maximum; + + // Reset the CQ slider back to the previous value as close as possible + double cqStepNew = Properties.Settings.Default.x264cqstep; + double rfValueCurrent = 51.0 - slider_videoQuality.Value*cqStepNew; + while (rfValueCurrent < rfValue) + { + slider_videoQuality.Value--; + rfValueCurrent = 51.0 - slider_videoQuality.Value*cqStepNew; + } + + // Cache the CQ step for the next calculation + _cachedCqStep = Properties.Settings.Default.x264cqstep; + } + private void slider_videoQuality_Scroll(object sender, EventArgs e) { + double cqStep = Properties.Settings.Default.x264cqstep; switch (drp_videoEncoder.Text) { case "MPEG-4 (FFmpeg)": - double rfValue = 31 - (slider_videoQuality.Value - 1); - double max = slider_videoQuality.Maximum; - double min = slider_videoQuality.Minimum; - double val = ((max - min) - (rfValue - min)) / (max - min); - SliderValue.Text = Math.Round((val * 100), 2) + "% QP:" + (32 - slider_videoQuality.Value); + lbl_SliderValue.Text = "QP:" + (32 - slider_videoQuality.Value); break; case "H.264 (x264)": - rfValue = 51.0 - slider_videoQuality.Value * Properties.Settings.Default.x264cqstep; - max = slider_videoQuality.Maximum * Properties.Settings.Default.x264cqstep; - min = slider_videoQuality.Minimum; - val = ((max - min) - (rfValue - min)) / (max - min); + double rfValue = 51.0 - slider_videoQuality.Value*cqStep; rfValue = Math.Round(rfValue, 2); - SliderValue.Text = Math.Round((val * 100), 2) + "% RF:" + rfValue; + lbl_SliderValue.Text = "RF:" + rfValue.ToString(new CultureInfo("en-US")); break; case "VP3 (Theora)": - rfValue = slider_videoQuality.Value; - double value = rfValue / 63; - SliderValue.Text = Math.Round((value * 100), 2) + "% QP:" + slider_videoQuality.Value; + lbl_SliderValue.Text = "QP:" + slider_videoQuality.Value; break; } } + private void radio_targetFilesize_CheckedChanged(object sender, EventArgs e) { text_bitrate.Enabled = false; @@ -1297,6 +1539,7 @@ namespace Handbrake check_2PassEncode.Enabled = true; } + private void radio_avgBitrate_CheckedChanged(object sender, EventArgs e) { text_bitrate.Enabled = true; @@ -1305,6 +1548,7 @@ namespace Handbrake check_2PassEncode.Enabled = true; } + private void radio_cq_CheckedChanged(object sender, EventArgs e) { text_bitrate.Enabled = false; @@ -1314,6 +1558,7 @@ namespace Handbrake check_2PassEncode.Enabled = false; check_2PassEncode.CheckState = CheckState.Unchecked; } + private void check_2PassEncode_CheckedChanged(object sender, EventArgs e) { if (check_2PassEncode.CheckState.ToString() == "Checked") @@ -1334,150 +1579,139 @@ namespace Handbrake if (Check_ChapterMarkers.Checked) { if (drop_format.SelectedIndex != 1) - setExtension(".m4v"); - data_chpt.Rows.Clear(); + SetExtension(".m4v"); data_chpt.Enabled = true; - DataGridView chapterGridView = Main.chapterNaming(data_chpt, drop_chapterFinish.Text); - if (chapterGridView != null) - data_chpt = chapterGridView; + btn_importChapters.Enabled = true; } else { if (drop_format.SelectedIndex != 1 && !Properties.Settings.Default.useM4v) - setExtension(".mp4"); - data_chpt.Rows.Clear(); + SetExtension(".mp4"); data_chpt.Enabled = false; + btn_importChapters.Enabled = false; + } + } + + private void btn_importChapters_Click(object sender, EventArgs e) + { + if (File_ChapterImport.ShowDialog() == DialogResult.OK) + { + string filename = File_ChapterImport.FileName; + DataGridView imported = Main.ImportChapterNames(data_chpt, filename); + if (imported != null) + data_chpt = imported; + } + } + + private void mnu_resetChapters_Click(object sender, EventArgs e) + { + data_chpt.Rows.Clear(); + DataGridView chapterGridView = Main.ChapterNaming(data_chpt, drop_chapterFinish.Text); + if (chapterGridView != null) + { + data_chpt = chapterGridView; } } // Query Editor Tab private void btn_generate_Query_Click(object sender, EventArgs e) { - rtf_query.Text = queryGen.generateTheQuery(this); + rtf_query.Text = QueryGenerator.GenerateCliQuery(this, drop_mode.SelectedIndex, 0, null); } + private void btn_clear_Click(object sender, EventArgs e) { rtf_query.Clear(); } + #endregion // MainWindow Components, Actions and Functions *********************** #region Source Scan - public Boolean isScanning { get; set; } - private static int scanProcessID { get; set; } - private void setupGUIforScan(String filename) + + public bool isScanning { get; set; } + private Scan SourceScan; + + private void StartScan(string filename, int title) { + // Setup the GUI components for the scan. sourcePath = filename; foreach (Control ctrl in Controls) - { if (!(ctrl is StatusStrip || ctrl is MenuStrip || ctrl is ToolStrip)) ctrl.Enabled = false; - } + lbl_encode.Visible = true; lbl_encode.Text = "Scanning ..."; - //gb_source.Text = "Source: Scanning ..."; btn_source.Enabled = false; btn_start.Enabled = false; btn_showQueue.Enabled = false; btn_add2Queue.Enabled = false; tb_preview.Enabled = false; mnu_killCLI.Visible = true; - } - private void startScan(String filename) - { + + if (ActivityWindow != null) + ActivityWindow.SetScanMode(); + + // Start the Scan try { - lbl_encode.Visible = true; - lbl_encode.Text = "Scanning..."; - ActivityWindow.setLogView(true); isScanning = true; - ThreadPool.QueueUserWorkItem(scanProcess, filename); + SourceScan = new Scan(); + SourceScan.ScanSource(sourcePath, title); + SourceScan.ScanStatusChanged += new EventHandler(SourceScan_ScanStatusChanged); + SourceScan.ScanCompleted += new EventHandler(SourceScan_ScanCompleted); } catch (Exception exc) { - MessageBox.Show("frmMain.cs - startScan " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("frmMain.cs - StartScan " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - private void scanProcess(object state) - { - try - { - string inputFile = (string)state; - string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe"); - string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs"; - string dvdInfoPath = Path.Combine(logDir, "last_scan_log.txt"); - - // Make we don't pick up a stale last_encode_log.txt (and that we have rights to the file) - if (File.Exists(dvdInfoPath)) - File.Delete(dvdInfoPath); - - String dvdnav = string.Empty; - if (Properties.Settings.Default.dvdnav) - dvdnav = " --dvdnav"; - string strCmdLine = String.Format(@"cmd /c """"{0}"" -i ""{1}"" -t0 {2} -v >""{3}"" 2>&1""", handbrakeCLIPath, inputFile, dvdnav, dvdInfoPath); - ProcessStartInfo hbParseDvd = new ProcessStartInfo("CMD.exe", strCmdLine) { WindowStyle = ProcessWindowStyle.Hidden }; - - Boolean cleanExit = true; - using (hbproc = Process.Start(hbParseDvd)) - { - Process[] before = Process.GetProcesses(); // Get a list of running processes before starting. - scanProcessID = Main.getCliProcess(before); - hbproc.WaitForExit(); - if (hbproc.ExitCode != 0) - cleanExit = false; - } - - if (cleanExit) // If 0 exit code, CLI exited cleanly. - { - if (!File.Exists(dvdInfoPath)) - { - throw new Exception( - "Unable to retrieve the DVD Info. last_scan_log.txt is missing. \nExpected location of last_scan_log.txt: \n" + - dvdInfoPath); - } + private void SourceScan_ScanStatusChanged(object sender, EventArgs e) + { + UpdateScanStatusLabel(); + } - using (StreamReader sr = new StreamReader(dvdInfoPath)) - { - thisDVD = DVD.Parse(sr); - sr.Close(); - sr.Dispose(); - } + private void SourceScan_ScanCompleted(object sender, EventArgs e) + { + UpdateGuiAfterScan(); + } - updateUIafterScan(); - } - } - catch (Exception exc) + private void UpdateScanStatusLabel() + { + if (InvokeRequired) { - MessageBox.Show("frmMain.cs - scanProcess() " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - enableGUI(); + BeginInvoke(new UpdateWindowHandler(UpdateScanStatusLabel)); + return; } + lbl_encode.Text = SourceScan.ScanStatus(); } - private void updateUIafterScan() + + private void UpdateGuiAfterScan() { + if (InvokeRequired) + { + BeginInvoke(new UpdateWindowHandler(UpdateGuiAfterScan)); + return; + } + try { - if (InvokeRequired) - { - BeginInvoke(new UpdateWindowHandler(updateUIafterScan)); - return; - } + currentSource = SourceScan.SouceData(); // Setup some GUI components drp_dvdtitle.Items.Clear(); - if (thisDVD.Titles.Count != 0) - drp_dvdtitle.Items.AddRange(thisDVD.Titles.ToArray()); - drp_dvdtitle.Text = "Automatic"; - drop_chapterFinish.Text = "Auto"; - drop_chapterStart.Text = "Auto"; + if (currentSource.Titles.Count != 0) + drp_dvdtitle.Items.AddRange(currentSource.Titles.ToArray()); // Now select the longest title - if (thisDVD.Titles.Count != 0) - drp_dvdtitle.SelectedItem = Main.selectLongestTitle(thisDVD); + if (currentSource.Titles.Count != 0) + drp_dvdtitle.SelectedItem = Main.SelectLongestTitle(currentSource); // Enable the creation of chapter markers if the file is an image of a dvd. - if (sourcePath.ToLower().Contains(".iso") || sourcePath.ToLower().Contains("VIDEO_TS")) + if (sourcePath.ToLower().Contains(".iso") || sourcePath.Contains("VIDEO_TS") || + Directory.Exists(Path.Combine(sourcePath, "VIDEO_TS"))) Check_ChapterMarkers.Enabled = true; else { @@ -1490,29 +1724,30 @@ namespace Handbrake if (drp_dvdtitle.Items.Count == 0) { 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).", + "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).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand); sourcePath = string.Empty; } UpdateSourceLabel(); // Enable the GUI components and enable any disabled components - enableGUI(); + EnableGUI(); } catch (Exception exc) { - MessageBox.Show("frmMain.cs - updateUIafterScan " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - enableGUI(); + MessageBox.Show("frmMain.cs - updateUIafterScan " + exc, "Error", MessageBoxButtons.OK, + MessageBoxIcon.Error); + EnableGUI(); } } - private void enableGUI() + + private void EnableGUI() { try { if (InvokeRequired) - BeginInvoke(new UpdateWindowHandler(enableGUI)); + BeginInvoke(new UpdateWindowHandler(EnableGUI)); lbl_encode.Text = "Scan Completed"; - //gb_source.Text = "Source"; foreach (Control ctrl in Controls) ctrl.Enabled = true; btn_start.Enabled = true; @@ -1524,68 +1759,96 @@ namespace Handbrake } catch (Exception exc) { - MessageBox.Show("frmMain.cs - enableGUI() " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("frmMain.cs - EnableGUI() " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - private void killScan() + + private void KillScan() { try { - enableGUI(); - resetGUI(); + SourceScan.ScanCompleted -= new EventHandler(SourceScan_ScanCompleted); + EnableGUI(); + ResetGUI(); - Process[] prs = Process.GetProcesses(); - foreach (Process process in prs) - { - if (process.Id == scanProcessID) - { - process.Refresh(); - if (!process.HasExited) - process.Kill(); - } - } + if (SourceScan.ScanProcess() != null) + SourceScan.ScanProcess().Kill(); + + lbl_encode.Text = "Scan Cancelled!"; } catch (Exception ex) { - MessageBox.Show("Unable to kill HandBrakeCLI.exe \nYou may need to manually kill HandBrakeCLI.exe using the Windows Task Manager if it does not close automatically within the next few minutes. \n\nError Information: \n" + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show( + "Unable to kill HandBrakeCLI.exe \nYou may need to manually kill HandBrakeCLI.exe using the Windows Task Manager if it does not close automatically within the next few minutes. \n\nError Information: \n" + + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - private void resetGUI() + + private void ResetGUI() { drp_dvdtitle.Items.Clear(); - drp_dvdtitle.Text = "Automatic"; drop_chapterStart.Items.Clear(); - drop_chapterStart.Text = "Auto"; drop_chapterFinish.Items.Clear(); - drop_chapterFinish.Text = "Auto"; lbl_duration.Text = "Select a Title"; PictureSettings.lbl_src_res.Text = "Select a Title"; PictureSettings.lbl_Aspect.Text = "Select a Title"; - sourcePath = "Source"; - text_destination.Text = ""; - thisDVD = null; + sourcePath = String.Empty; + text_destination.Text = String.Empty; selectedTitle = null; isScanning = false; } private void UpdateSourceLabel() { - labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : Path.GetFileName(sourcePath); + labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "Select \"Source\" to continue." : this.SourceName; + + if (selectedTitle != null) + if (!string.IsNullOrEmpty(selectedTitle.SourceName)) + // If it's one of multiple source files, make sure we don't use the folder name + labelSource.Text = Path.GetFileName(selectedTitle.SourceName); + } + + public void RecievingJob(Job job) + { + string query = job.Query; + StartScan(job.Source, 0); + + + if (query != null) + { + // Ok, Reset all the H264 widgets before changing the preset + x264Panel.Reset2Defaults(); + + // Send the query from the file to the Query Parser class + QueryParser presetQuery = QueryParser.Parse(query); + + // Now load the preset + PresetLoader.LoadPreset(this, presetQuery, "Load Back From Queue", true); + + // The x264 widgets will need updated, so do this now: + x264Panel.X264_StandardizeOptString(); + x264Panel.X264_SetCurrentSettingsInPanel(); + + // Finally, let this window have a copy of the preset settings. + CurrentlySelectedPreset = null; + PictureSettings.SetPresetCropWarningLabel(null); + } } #endregion - #region GUI + #region GUI Functions and Actions + /// /// Set the GUI to it's finished encoding state. /// - private void setEncodeFinished() + private void SetEncodeFinished() { try { if (InvokeRequired) { - BeginInvoke(new UpdateWindowHandler(setEncodeFinished)); + BeginInvoke(new UpdateWindowHandler(SetEncodeFinished)); return; } @@ -1611,18 +1874,18 @@ namespace Handbrake /// /// Set the GUI to it's started encoding state. /// - private void setEncodeStarted() + private void SetEncodeStarted() { try { if (InvokeRequired) { - BeginInvoke(new UpdateWindowHandler(setEncodeStarted)); + BeginInvoke(new UpdateWindowHandler(SetEncodeStarted)); return; } lbl_encode.Visible = true; - lbl_encode.Text = "Encoding in Progress"; + lbl_encode.Text = "Encoding with " + encodeQueue.Count + " encode(s) pending"; btn_start.Text = "Stop"; btn_start.ToolTipText = "Stop the encoding process."; btn_start.Image = Properties.Resources.stop; @@ -1632,63 +1895,79 @@ namespace Handbrake MessageBox.Show(exc.ToString()); } } - #endregion - #region DVD Drive Detection - private delegate void ProgressUpdateHandler(); - private void getDriveInfoThread() + /// + /// Set the DVD Drive selection in the "Source" Menu + /// + private void SetDriveSelectionMenuItem() { try { if (InvokeRequired) { - BeginInvoke(new ProgressUpdateHandler(getDriveInfoThread)); + BeginInvoke(new UpdateWindowHandler(SetDriveSelectionMenuItem)); return; } - Boolean foundDrive = false; - DriveInfo[] theCollectionOfDrives = DriveInfo.GetDrives(); - foreach (DriveInfo curDrive in theCollectionOfDrives) + List drives = Main.GetDrives(); + + if (drives.Count == 0) { - if (curDrive.DriveType == DriveType.CDRom && curDrive.IsReady) - { - if (File.Exists(curDrive.RootDirectory + "VIDEO_TS\\VIDEO_TS.IFO")) - { - mnu_dvd_drive.Text = curDrive.RootDirectory + "VIDEO_TS (" + curDrive.VolumeLabel + ")"; - foundDrive = true; - break; - } - } + mnu_dvd_drive.Text = "[No DVD Drive Ready]"; + return; } - if (foundDrive == false) - mnu_dvd_drive.Text = "[No DVD Drive Ready]"; + this.dvdDrivePath = drives[0].RootDirectory + "VIDEO_TS"; + this.dvdDriveLabel = drives[0].VolumeLabel; + mnu_dvd_drive.Text = this.dvdDrivePath + " (" + this.dvdDriveLabel + ")"; } catch (Exception) { mnu_dvd_drive.Text = "[No DVD Drive Ready / Found]"; } } - #endregion - #region Public Methods /// /// Access the preset Handler and setup the preset panel. /// - public void loadPresetPanel() + private void LoadPresetPanel() { - if (presetHandler.checkIfPresetsAreOutOfDate()) + if (presetHandler.CheckIfPresetsAreOutOfDate()) if (!Properties.Settings.Default.presetNotification) - MessageBox.Show(splash, - "HandBrake has determined your built-in presets are out of date... These presets will now be updated.", - "Preset Update", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show(splash, + "HandBrake has determined your built-in presets are out of date... These presets will now be updated.", + "Preset Update", MessageBoxButtons.OK, MessageBoxIcon.Information); - presetHandler.getPresetPanel(ref treeView_presets); + presetHandler.GetPresetPanel(ref treeView_presets); treeView_presets.Update(); - } + } + #endregion #region Overrides + + /// + /// Handle GUI shortcuts + /// + /// + /// + /// + protected override bool ProcessCmdKey(ref Message msg, Keys keyData) + { + if (keyData == (Keys.Control | Keys.S)) + { + btn_start_Click(this, new EventArgs()); + return true; + } + + if (keyData == (Keys.Control | Keys.A)) + { + btn_add2Queue_Click(this, new EventArgs()); + return true; + } + return base.ProcessCmdKey(ref msg, keyData); + } + /// /// If the queue is being processed, prompt the user to confirm application close. /// @@ -1696,45 +1975,68 @@ namespace Handbrake protected override void OnFormClosing(FormClosingEventArgs e) { // If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close. - if ((encodeQueue.isEncoding) && (!encodeQueue.PauseRequested) && (encodeQueue.Count > 0)) + if ((encodeQueue.IsEncoding) && (!encodeQueue.PauseRequested) && (encodeQueue.Count > 0)) { - 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?", - "Close HandBrake?", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + 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?", + "Close HandBrake?", MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result == DialogResult.No) e.Cancel = true; } base.OnFormClosing(e); } + #endregion #region In-GUI Encode Status (Experimental) - private void encodeMonitorThread() + /// + /// Starts a new thread to monitor and process the CLI encode status + /// + private void EncodeMonitorThread() { try { - Parser encode = new Parser(encodeQueue.hbProcess.StandardOutput.BaseStream); - encode.OnEncodeProgress += encodeOnEncodeProgress; + Parser encode = new Parser(encodeQueue.HbProcess.StandardOutput.BaseStream); + encode.OnEncodeProgress += EncodeOnEncodeProgress; while (!encode.EndOfStream) - { - encode.readEncodeStatus(); - } + encode.ReadEncodeStatus(); } catch (Exception exc) { - MessageBox.Show(exc.ToString()); + MessageBox.Show(exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - private void encodeOnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete, float CurrentFps, float AverageFps, TimeSpan TimeRemaining) + + /// + /// Displays the Encode status in the GUI + /// + /// + /// + /// + /// + /// + /// + /// + private void EncodeOnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete, + float CurrentFps, float AverageFps, TimeSpan TimeRemaining) { if (this.InvokeRequired) { - this.BeginInvoke(new EncodeProgressEventHandler(encodeOnEncodeProgress), - new object[] { Sender, CurrentTask, TaskCount, PercentComplete, CurrentFps, AverageFps, TimeRemaining }); + this.BeginInvoke(new EncodeProgressEventHandler(EncodeOnEncodeProgress), + new[] + { + Sender, CurrentTask, TaskCount, PercentComplete, CurrentFps, AverageFps, + TimeRemaining + }); return; } - lbl_encode.Text = string.Format("Encode Progress: {0}%, FPS: {1}, Avg FPS: {2}, Time Remaining: {3} ", PercentComplete, CurrentFps, AverageFps, TimeRemaining); + lbl_encode.Text = + string.Format("Encode Progress: {0}%, FPS: {1}, Avg FPS: {2}, Time Remaining: {3} ", + PercentComplete, CurrentFps, AverageFps, TimeRemaining); } + #endregion // This is the END of the road ****************************************