OSDN Git Service

WinGui:
[handbrake-jp/handbrake-jp-git.git] / win / C# / frmMain.cs
index 652ff22..83ea0de 100644 (file)
@@ -8,37 +8,36 @@ using System;
 using System.Collections;\r
 using System.Collections.Generic;\r
 using System.Drawing;\r
-using System.Text;\r
 using System.Windows.Forms;\r
 using System.IO;\r
 using System.Diagnostics;\r
 using System.Threading;\r
-using System.Runtime.InteropServices;\r
-using System.Globalization;\r
-using System.Text.RegularExpressions;\r
 \r
 namespace Handbrake\r
 {\r
     public partial class frmMain : Form\r
     {\r
-        // Declarations *******************************************************\r
         // Objects which may be used by one or more other objects\r
+        private delegate void UpdateWindowHandler();\r
         Functions.Main hb_common_func = new Functions.Main();\r
-        Functions.Encode cliObj = new Functions.Encode();\r
-        Functions.Queue encodeQueue = new Functions.Queue();\r
+        Functions.Encode encodeHandler = new Functions.Encode();\r
+        Queue.QueueHandler encodeQueue = new Queue.QueueHandler();\r
         Presets.PresetsHandler presetHandler = new Presets.PresetsHandler();\r
         Parsing.Title selectedTitle;\r
+        Parsing.DVD thisDVD;\r
 \r
         // Objects belonging to this window only\r
         PresetLoader presetLoader = new PresetLoader();\r
         x264Panel x264PanelFunctions = new x264Panel();\r
         QueryGenerator queryGen = new QueryGenerator();\r
 \r
-        internal Process hbProc;\r
-        private Parsing.DVD thisDVD;\r
+        // Globals: Mainly used for tracking.\r
         private frmQueue queueWindow;\r
-        private delegate void updateStatusChanger();\r
+        private frmGenPreview vlcpreview;\r
+        private frmPreview qtpreview;\r
         private string lastAction = null;\r
+        public int maxWidth = 0;\r
+        public int maxHeight = 0;\r
 \r
         // Applicaiton Startup ************************************************\r
 \r
@@ -50,33 +49,19 @@ namespace Handbrake
             Form splash = new frmSplashScreen();\r
             splash.Show();\r
 \r
-            // Initialize the queue window.\r
-            queueWindow = new frmQueue(this);\r
             //Create a label that can be updated from the parent thread.\r
             Label lblStatus = new Label();\r
             lblStatus.Size = new Size(250, 20);\r
             lblStatus.Location = new Point(10, 280);\r
             splash.Controls.Add(lblStatus);\r
-\r
             InitializeComponent();\r
 \r
             // Update the users config file with the CLI version data.\r
             lblStatus.Text = "Setting Version Data ...";\r
             Application.DoEvents();\r
             ArrayList x = hb_common_func.getCliVersionData();\r
-            if (x != null)\r
-            {\r
-                try\r
-                {\r
-                    Properties.Settings.Default.hb_build = int.Parse(x[1].ToString());\r
-                    Properties.Settings.Default.hb_version = x[0].ToString();\r
-                }\r
-                catch (Exception)\r
-                {\r
-                    Properties.Settings.Default.hb_build = 0;\r
-                    Properties.Settings.Default.hb_version = "0";\r
-                }\r
-            }\r
+            Properties.Settings.Default.hb_build = int.Parse(x[1].ToString());\r
+            Properties.Settings.Default.hb_version = x[0].ToString();\r
 \r
             // show the form, but leave disabled until preloading is complete then show the main form\r
             this.Enabled = false;\r
@@ -95,39 +80,63 @@ namespace Handbrake
             // Setup the GUI components\r
             lblStatus.Text = "Setting up the GUI ...";\r
             Application.DoEvents();\r
-            setupH264Panel();               // Initalize the H.264 Panel\r
-            loadPresetPanel();              // Load the Preset Panel\r
+            x264PanelFunctions.reset2Defaults(this); // Initialize all the x264 widgets to their default values\r
+            loadPresetPanel();                       // Load the Preset Panel\r
+            treeView_presets.ExpandAll();\r
+            lbl_encode.Text = "";\r
+            queueWindow = new frmQueue(encodeQueue);        // Prepare the Queue\r
+            if (Properties.Settings.Default.QueryEditorTab != "Checked")\r
+                tabs_panel.TabPages.RemoveAt(5); // 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 == "Checked")\r
-                loadUserDefaults();\r
+            if (Properties.Settings.Default.defaultSettings == "Checked" && Properties.Settings.Default.defaultPreset != "")\r
+            {\r
+                // Ok, so, we've selected a preset. Now we want to load it.\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
+\r
+                    if (query != null)\r
+                    {\r
+                        //Ok, Reset all the H264 widgets before changing the preset\r
+                        x264PanelFunctions.reset2Defaults(this);\r
+\r
+                        // Send the query from the file to the Query Parser class, then load the preset\r
+                        Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);\r
+                        presetLoader.presetLoader(this, presetQuery, Properties.Settings.Default.defaultPreset, loadPictureSettings);\r
+\r
+                        // The x264 widgets will need updated, so do this now:\r
+                        x264PanelFunctions.X264_StandardizeOptString(this);\r
+                        x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);\r
+                    }\r
+                }\r
+                else\r
+                    loadNormalPreset();\r
+            }\r
             else\r
                 loadNormalPreset();\r
-            // Expand the preset Nodes\r
-            treeView_presets.ExpandAll();\r
+\r
             // Enabled GUI tooltip's if Required\r
             if (Properties.Settings.Default.tooltipEnable == "Checked")\r
                 ToolTip.Active = true;\r
-            lbl_encode.Text = "";\r
 \r
             //Finished Loading\r
             lblStatus.Text = "Loading Complete!";\r
             Application.DoEvents();\r
-\r
-            //Close the splash screen\r
             splash.Close();\r
             splash.Dispose();\r
-\r
-            // Turn the interface back to the user\r
             this.Enabled = true;\r
 \r
-            // Some event Handlers. Used for minimize to taskbar\r
-            this.Resize += new EventHandler(frmMain_Resize);\r
+            // Event Handlers\r
+            events();\r
 \r
             // Queue Recovery\r
             queueRecovery();\r
         }\r
 \r
         // Startup Functions\r
+        private delegate void updateStatusChanger();\r
         private void startupUpdateCheck()\r
         {\r
             try\r
@@ -147,34 +156,6 @@ namespace Handbrake
             }\r
             catch (Exception) { /* Do Nothing*/ }\r
         }\r
-        private void setupH264Panel()\r
-        {\r
-            // Set the default settings of the x264 panel\r
-            drop_bFrames.Text = "Default (0)";\r
-            drop_refFrames.Text = "Default (1)";\r
-            drop_subpixelMotionEstimation.Text = "Default (4)";\r
-            drop_trellis.Text = "Default (0)";\r
-            drop_MotionEstimationMethod.Text = "Default (Hexagon)";\r
-            drop_MotionEstimationRange.Text = "Default (16)";\r
-            drop_directPrediction.Text = "Default (Spatial)";\r
-            drop_deblockAlpha.Text = "Default (0)";\r
-            drop_deblockBeta.Text = "Default (0)";\r
-            drop_analysis.Text = "Default (some)";\r
-            rtf_x264Query.Text = "";\r
-        }\r
-        private void loadUserDefaults()\r
-        {\r
-            // Try to load the users default settings.\r
-            string userDefaults = Properties.Settings.Default.defaultUserSettings;\r
-\r
-            if (userDefaults == "")\r
-                loadNormalPreset();\r
-            else\r
-            {\r
-                Functions.QueryParser presetQuery = Functions.QueryParser.Parse(userDefaults);\r
-                presetLoader.presetLoader(this, presetQuery, "User Defaults ");\r
-            }\r
-        }\r
         private void queueRecovery()\r
         {\r
             if (hb_common_func.check_queue_recovery() == true)\r
@@ -182,20 +163,47 @@ namespace Handbrake
                 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.dat"); // Start Recovery\r
+                    encodeQueue.recoverQueue("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
-                    string queuePath = Path.Combine(Path.GetTempPath(), "hb_queue_recovery.dat");\r
+                    string queuePath = Path.Combine(Path.GetTempPath(), "hb_queue_recovery.xml");\r
                     if (File.Exists(queuePath))\r
                         File.Delete(queuePath);\r
                 }\r
             }\r
         }\r
+        #endregion\r
+\r
+        #region Events\r
+        // Encoding Events for setting up the GUI\r
+        private void events()\r
+        {\r
+            // Handle Window Resize\r
+            if (Properties.Settings.Default.MainWindowMinimize == "Checked")\r
+                this.Resize += new EventHandler(frmMain_Resize);\r
 \r
+            // Handle Encode Start\r
+            encodeQueue.OnEncodeEnded += new EventHandler(encodeEnded);\r
+            encodeQueue.OnPaused += new EventHandler(encodePaused);\r
+            encodeQueue.OnEncodeStart += new EventHandler(encodeStarted);\r
+        }\r
+        private void encodeStarted(object sender, EventArgs e)\r
+        {\r
+            setLastAction("encode");\r
+            setEncodeStarted();\r
+        }\r
+        private void encodeEnded(object sender, EventArgs e)\r
+        {\r
+            setEncodeFinished();\r
+        }\r
+        private void encodePaused(object sender, EventArgs e)\r
+        {\r
+            setEncodeFinished();\r
+        }\r
         #endregion\r
 \r
-        // The Applications Main Menu and Menus *******************************\r
+        // User Interface Menus / Tool Strips *********************************\r
 \r
         #region File Menu\r
         private void mnu_exit_Click(object sender, EventArgs e)\r
@@ -207,7 +215,7 @@ namespace Handbrake
         #region Tools Menu\r
         private void mnu_encode_Click(object sender, EventArgs e)\r
         {\r
-            queueWindow.setQueue(encodeQueue);\r
+            queueWindow.setQueue();\r
             queueWindow.Show();\r
         }\r
         private void mnu_encodeLog_Click(object sender, EventArgs e)\r
@@ -218,12 +226,12 @@ namespace Handbrake
             else\r
                 file = "hb_encode_log.dat";\r
 \r
-            frmActivityWindow dvdInfoWindow = new frmActivityWindow(file, this, queueWindow);\r
+            frmActivityWindow dvdInfoWindow = new frmActivityWindow(file, encodeHandler);\r
             dvdInfoWindow.Show();\r
         }\r
         private void mnu_options_Click(object sender, EventArgs e)\r
         {\r
-            Form Options = new frmOptions(this);\r
+            Form Options = new frmOptions();\r
             Options.ShowDialog();\r
         }\r
         #endregion\r
@@ -234,14 +242,16 @@ namespace Handbrake
             presetHandler.updateBuiltInPresets();\r
             loadPresetPanel();\r
             if (treeView_presets.Nodes.Count == 0)\r
-                MessageBox.Show("Unable to load the presets.dat 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
+            treeView_presets.ExpandAll();\r
         }\r
         private void mnu_delete_preset_Click(object sender, EventArgs e)\r
         {\r
             // Empty the preset file\r
-            string presetsFile = Application.StartupPath.ToString() + "\\presets.dat";\r
+            string presetsFile = Application.StartupPath.ToString() + "\\presets.xml";\r
             if (File.Exists(presetsFile))\r
                 File.Delete(presetsFile);\r
 \r
@@ -265,8 +275,15 @@ namespace Handbrake
         }\r
         private void btn_new_preset_Click(object sender, EventArgs e)\r
         {\r
+            // Remember each nodes expanded status so we can reload it\r
+            List<Boolean> nodeStatus = saveTreeViewState();\r
+            nodeStatus.Add(true);\r
+\r
             Form preset = new frmAddPreset(this, queryGen.GenerateTheQuery(this), presetHandler);\r
             preset.ShowDialog();\r
+\r
+            // Now reload the TreeView states\r
+            loadTreeViewStates(nodeStatus);\r
         }\r
         #endregion\r
 \r
@@ -301,7 +318,8 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
-        #region Preset Menu\r
+        #region Preset Bar\r
+        // Right Click Menu Code\r
         private void pmnu_expandAll_Click(object sender, EventArgs e)\r
         {\r
             treeView_presets.ExpandAll();\r
@@ -310,11 +328,13 @@ namespace Handbrake
         {\r
             treeView_presets.CollapseAll();\r
         }\r
-        private void treeview_presets_mouseUp(object sender, MouseEventArgs e)\r
+        private void pmnu_saveChanges_Click(object sender, EventArgs e)\r
         {\r
-            if (e.Button == MouseButtons.Right)\r
-                treeView_presets.SelectedNode = treeView_presets.GetNodeAt(e.Location);\r
-            treeView_presets.Select();\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, queryGen.generateTabbedComponentsQuery(this), true);\r
+            else if (result == DialogResult.No)\r
+                presetHandler.updatePreset(treeView_presets.SelectedNode.Text, queryGen.generateTabbedComponentsQuery(this), false);\r
         }\r
         private void pmnu_delete_click(object sender, EventArgs e)\r
         {\r
@@ -323,33 +343,194 @@ namespace Handbrake
                 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
-                foreach (TreeNode node in treeView_presets.Nodes)\r
+                List<Boolean> nodeStatus = saveTreeViewState();\r
+\r
+                // Now reload the preset panel\r
+                loadPresetPanel();\r
+\r
+                // Now reload the TreeView states\r
+                loadTreeViewStates(nodeStatus);\r
+            }\r
+            treeView_presets.Select();\r
+        }\r
+        private void presets_menu_Opening(object sender, System.ComponentModel.CancelEventArgs e)\r
+        {\r
+            // Make sure that the save menu is always disabled by default\r
+            pmnu_saveChanges.Enabled = false;\r
+\r
+            // Now enable the save menu if the selected preset is a user preset\r
+            if (treeView_presets.SelectedNode != null)\r
+            {\r
+                if (presetHandler.checkIfUserPresetExists(treeView_presets.SelectedNode.Text))\r
                 {\r
-                    nodeStatus.Add(node.IsExpanded);\r
+                    pmnu_saveChanges.Enabled = true;\r
                 }\r
+            }\r
+            treeView_presets.Select();\r
+        }\r
+\r
+        // Presets Management\r
+        private void btn_addPreset_Click(object sender, EventArgs e)\r
+        {\r
+            // Remember each nodes expanded status so we can reload it\r
+            List<Boolean> nodeStatus = saveTreeViewState();\r
+            nodeStatus.Add(true);\r
+\r
+            // Now add the new preset\r
+            Form preset = new frmAddPreset(this, queryGen.generateTabbedComponentsQuery(this), presetHandler);\r
+            preset.ShowDialog();\r
 \r
+            // Now reload the TreeView states\r
+            loadTreeViewStates(nodeStatus);\r
+        }\r
+        private void btn_removePreset_Click(object sender, EventArgs e)\r
+        {\r
+            DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+            if (result == DialogResult.Yes)\r
+            {\r
+                if (treeView_presets.SelectedNode != null)\r
+                    presetHandler.remove(treeView_presets.SelectedNode.Text);\r
+\r
+                // Remember each nodes expanded status so we can reload it\r
+                List<Boolean> nodeStatus = saveTreeViewState();\r
+\r
+                // Now reload the preset panel\r
                 loadPresetPanel();\r
 \r
-                int i = 0;\r
-                foreach (TreeNode node in treeView_presets.Nodes)\r
+                // Now reload the TreeView states\r
+                loadTreeViewStates(nodeStatus);\r
+            }\r
+            treeView_presets.Select();\r
+        }\r
+        private void btn_setDefault_Click(object sender, EventArgs e)\r
+        {\r
+            if (treeView_presets.SelectedNode != null)\r
+            {\r
+                Properties.Settings.Default.defaultPreset = treeView_presets.SelectedNode.Text;\r
+                Properties.Settings.Default.Save();\r
+                MessageBox.Show("New default preset set.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
+            }\r
+            else\r
+                MessageBox.Show("Please select a preset first.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+        }\r
+        private void treeview_presets_mouseUp(object sender, MouseEventArgs e)\r
+        {\r
+            if (e.Button == MouseButtons.Right)\r
+                treeView_presets.SelectedNode = treeView_presets.GetNodeAt(e.Location);\r
+            else if (e.Button == MouseButtons.Left)\r
+                selectPreset();\r
+\r
+            treeView_presets.Select();\r
+        }\r
+        private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e)\r
+        {\r
+            selectPreset();\r
+        }\r
+        private void selectPreset()\r
+        {\r
+            if (treeView_presets.SelectedNode != null)\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
                 {\r
-                    if (nodeStatus[i] == true)\r
-                        node.Expand();\r
+                    string query = presetHandler.getPreset(presetName).Query;\r
+                    Boolean loadPictureSettings = presetHandler.getPreset(presetName).PictureSettings;\r
+\r
+                    if (query != null)\r
+                    {\r
+                        //Ok, Reset all the H264 widgets before changing the preset\r
+                        x264PanelFunctions.reset2Defaults(this);\r
 \r
-                    i++;\r
+                        // Send the query from the file to the Query Parser class\r
+                        Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);\r
+\r
+                        // Now load the preset\r
+                        presetLoader.presetLoader(this, presetQuery, presetName, loadPictureSettings);\r
+\r
+                        // The x264 widgets will need updated, so do this now:\r
+                        x264PanelFunctions.X264_StandardizeOptString(this);\r
+                        x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);\r
+                    }\r
                 }\r
             }\r
-            treeView_presets.Select();\r
         }\r
-        #endregion\r
+        private void treeView_presets_deleteKey(object sender, KeyEventArgs e)\r
+        {\r
+            if (e.KeyCode == Keys.Delete)\r
+            {\r
+                DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+                if (result == DialogResult.Yes)\r
+                {\r
+                    if (treeView_presets.SelectedNode != null)\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
+                    foreach (TreeNode node in treeView_presets.Nodes)\r
+                        nodeStatus.Add(node.IsExpanded);\r
 \r
-        // MainWindow Components, Actions and Functions ***********************\r
+                    // Now reload the preset panel\r
+                    loadPresetPanel();\r
+\r
+                    // And finally, re-expand any of the nodes if required\r
+                    int i = 0;\r
+                    foreach (TreeNode node in treeView_presets.Nodes)\r
+                    {\r
+                        if (nodeStatus[i] == true)\r
+                            node.Expand();\r
 \r
-        #region Actions\r
+                        i++;\r
+                    }\r
+                }\r
+            }\r
+        }\r
+        private List<Boolean> saveTreeViewState()\r
+        {\r
+            // Remember each nodes expanded status so we can reload it\r
+            List<Boolean> nodeStatus = new List<Boolean>();\r
+            foreach (TreeNode node in treeView_presets.Nodes)\r
+            {\r
+                nodeStatus.Add(node.IsExpanded);\r
+                foreach (TreeNode subNode in node.Nodes)\r
+                    nodeStatus.Add(node.IsExpanded);\r
+            }\r
+            return nodeStatus;\r
+        }\r
+        private void loadTreeViewStates(List<Boolean> nodeStatus)\r
+        {\r
+            // And finally, re-expand any of the nodes if required\r
+            int i = 0;\r
+            foreach (TreeNode node in treeView_presets.Nodes)\r
+            {\r
+                if (nodeStatus[i] == true)\r
+                    node.Expand();\r
+\r
+                foreach (TreeNode subNode in node.Nodes)\r
+                {\r
+                    if (nodeStatus[i] == true)\r
+                        subNode.Expand();\r
+                }\r
+\r
+                i++;\r
+            }\r
+        }\r
+        private void loadNormalPreset()\r
+        {\r
+            treeView_presets.Nodes.Find("Normal", true);\r
+\r
+            foreach (TreeNode treenode in treeView_presets.Nodes)\r
+            {\r
+                foreach (TreeNode node in treenode.Nodes)\r
+                {\r
+                    if (node.Text.ToString().Equals("Normal"))\r
+                        treeView_presets.SelectedNode = treeView_presets.Nodes[treenode.Index].Nodes[0];\r
+                }\r
+            }\r
+        }\r
+        #endregion\r
 \r
-        // ToolBar\r
+        #region ToolStrip\r
         private void btn_source_Click(object sender, EventArgs e)\r
         {\r
             if (Properties.Settings.Default.drive_detection == "Checked")\r
@@ -363,27 +544,58 @@ namespace Handbrake
         }\r
         private void btn_start_Click(object sender, EventArgs e)\r
         {\r
-            if (text_source.Text == string.Empty || text_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 (btn_start.Text == "Stop")\r
+            {\r
+                DialogResult result = MessageBox.Show("Are you sure you wish to cancel the encode? Please note that this may break the encoded file. \nTo safely cancel your encode, press ctrl-c on your keyboard in the CLI window. This *may* allow you to preview your encoded content.", "Cancel Encode?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
+\r
+                if (result == DialogResult.Yes)\r
+                {\r
+                    // Pause The Queue\r
+                    encodeQueue.pauseEncode();\r
+\r
+                    // Kill the current process.\r
+                    Process[] aProc = Process.GetProcessesByName("HandBrakeCLI");\r
+                    Process HandBrakeCLI;\r
+                    if (aProc.Length > 0)\r
+                    {\r
+                        HandBrakeCLI = aProc[0];\r
+                        HandBrakeCLI.Kill();\r
+                    }\r
+\r
+                    // Update the GUI\r
+                    setEncodeFinished();\r
+                }\r
+            }\r
             else\r
             {\r
-                // Set the last action to encode. \r
-                // This is used for tracking which file to load in the activity window\r
-                lastAction = "encode";\r
+                if (encodeQueue.count() != 0 || (text_source.Text != string.Empty && text_source.Text != "Click 'Source' to continue" && text_destination.Text != string.Empty))\r
+                {\r
+                    // Set the last action to encode. \r
+                    // This is used for tracking which file to load in the activity window\r
+                    lastAction = "encode";\r
 \r
-                String query;\r
-                if (rtf_query.Text != "")\r
-                    query = rtf_query.Text;\r
-                else\r
-                    query = queryGen.GenerateTheQuery(this);\r
+                    String query;\r
+                    if (rtf_query.Text != "")\r
+                        query = rtf_query.Text;\r
+                    else\r
+                        query = queryGen.GenerateTheQuery(this);\r
 \r
-                ThreadPool.QueueUserWorkItem(procMonitor, query);\r
-                lbl_encode.Visible = true;\r
-                lbl_encode.Text = "Encoding in Progress";\r
+                    if (encodeQueue.count() == 0)\r
+                    {\r
+                        encodeQueue.add(query, text_source.Text, text_destination.Text);\r
+                        encodeQueue.write2disk("hb_queue_recovery.xml");\r
+                    }\r
+                    queueWindow.setQueue();\r
+                    if (encodeQueue.count() > 1)\r
+                        queueWindow.Show();\r
+\r
+                    setEncodeStarted(); // Encode is running, so setup the GUI appropriately\r
+                    encodeQueue.startEncode(); // Start The Queue Encoding Process\r
+\r
+                }\r
+                else if (text_source.Text == string.Empty || text_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
 \r
-                btn_start.Text = "Stop";\r
-                btn_start.ToolTipText = "Stop the encoding process. \nWarning: This may break your file. Press ctrl-c in the CLI window if you wish it to exit cleanly.";\r
-                btn_start.Image = Properties.Resources.stop;\r
             }\r
         }\r
         private void btn_add2Queue_Click(object sender, EventArgs e)\r
@@ -392,23 +604,62 @@ namespace Handbrake
                 MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
             {\r
-\r
                 String query = queryGen.GenerateTheQuery(this);\r
                 if (rtf_query.Text != "")\r
                     query = rtf_query.Text;\r
 \r
-                encodeQueue.add(query);\r
-                encodeQueue.write2disk("hb_queue_recovery.dat"); // Writes the queue to the recovery file, just incase the GUI crashes.\r
+                encodeQueue.add(query, text_source.Text, text_destination.Text);\r
+                encodeQueue.write2disk("hb_queue_recovery.xml"); // Writes the queue to the recovery file, just incase the GUI crashes.\r
 \r
-                queueWindow.setQueue(encodeQueue);\r
+                queueWindow.setQueue();\r
                 queueWindow.Show();\r
             }\r
         }\r
         private void btn_showQueue_Click(object sender, EventArgs e)\r
         {\r
-            queueWindow.setQueue(encodeQueue);\r
+            queueWindow.setQueue();\r
             queueWindow.Show();\r
         }\r
+        private void mnu_vlcpreview_Click(object sender, EventArgs e)\r
+        {\r
+            if (text_source.Text == "" || text_source.Text == "Click 'Source' to continue" || text_destination.Text == "")\r
+                MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            else\r
+            {\r
+                if (vlcpreview == null)\r
+                {\r
+                    vlcpreview = new frmGenPreview(this);\r
+                    vlcpreview.Show();\r
+                }\r
+                else if (vlcpreview.IsDisposed)\r
+                {\r
+                    vlcpreview = new frmGenPreview(this);\r
+                    vlcpreview.Show();\r
+                }\r
+                else\r
+                    MessageBox.Show("The preview window is already open!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            }\r
+        }\r
+        private void mnu_qtpreview_Click(object sender, EventArgs e)\r
+        {\r
+            if (text_source.Text == "" || text_source.Text == "Click 'Source' to continue" || text_destination.Text == "")\r
+                MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            else\r
+            {\r
+                if (qtpreview == null)\r
+                {\r
+                    qtpreview = new frmPreview(this);\r
+                    qtpreview.Show();\r
+                }\r
+                else if (qtpreview.IsDisposed)\r
+                {\r
+                    qtpreview = new frmPreview(this);\r
+                    qtpreview.Show();\r
+                }\r
+                else\r
+                    MessageBox.Show("The preview window is already open!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            }\r
+        }\r
         private void btn_ActivityWindow_Click(object sender, EventArgs e)\r
         {\r
             String file = String.Empty;\r
@@ -417,13 +668,51 @@ namespace Handbrake
             else\r
                 file = "hb_encode_log.dat";\r
 \r
-            frmActivityWindow ActivityWindow = new frmActivityWindow(file, this, queueWindow);\r
+            frmActivityWindow ActivityWindow = new frmActivityWindow(file, encodeHandler);\r
             ActivityWindow.Show();\r
         }\r
+        #endregion\r
+\r
+        #region System Tray Icon\r
+        private void frmMain_Resize(object sender, EventArgs e)\r
+        {\r
+            if (FormWindowState.Minimized == this.WindowState)\r
+            {\r
+                notifyIcon.Visible = true;\r
+                if (lbl_encode.Text != "")\r
+                    notifyIcon.BalloonTipText = lbl_encode.Text;\r
+                else\r
+                    notifyIcon.BalloonTipText = "Not Encoding";\r
+                notifyIcon.ShowBalloonTip(500);\r
+                this.Hide();\r
+            }\r
+            else if (FormWindowState.Normal == this.WindowState)\r
+                notifyIcon.Visible = false;\r
+        }\r
+        private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)\r
+        {\r
+            this.Visible = true;\r
+            this.Activate();\r
+            this.WindowState = FormWindowState.Normal;\r
+            notifyIcon.Visible = false;\r
+        }\r
+        private void btn_restore_Click(object sender, EventArgs e)\r
+        {\r
+            this.Visible = true;\r
+            this.Activate();\r
+            this.WindowState = FormWindowState.Normal;\r
+            notifyIcon.Visible = false;\r
+        }\r
+        #endregion\r
+\r
+        #region Tab Control\r
 \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
@@ -486,10 +775,23 @@ namespace Handbrake
                     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
 \r
                 lbl_encode.Text = "";\r
+\r
+                // Enable the creation of chapter markers if the file is an image of a dvd.\r
+                if (filename.ToLower().Contains(".iso"))\r
+                    Check_ChapterMarkers.Enabled = true;\r
+                else\r
+                {\r
+                    Check_ChapterMarkers.Enabled = false;\r
+                    Check_ChapterMarkers.Checked = false;\r
+                    data_chpt.Rows.Clear();\r
+                }\r
             }\r
         }\r
         private void mnu_dvd_drive_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
@@ -561,21 +863,6 @@ namespace Handbrake
                 drp_track1Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
                 drp_track1Audio.SelectedIndex = 0;\r
 \r
-                drp_track2Audio.Items.Clear();\r
-                drp_track2Audio.Items.Add("None");\r
-                drp_track2Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                drp_track2Audio.SelectedIndex = 0;\r
-\r
-                drp_track3Audio.Items.Clear();\r
-                drp_track3Audio.Items.Add("None");\r
-                drp_track3Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                drp_track3Audio.SelectedIndex = 0;\r
-\r
-                drp_track4Audio.Items.Clear();\r
-                drp_track4Audio.Items.Add("None");\r
-                drp_track4Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                drp_track4Audio.SelectedIndex = 0;\r
-\r
                 // Populate the Subtitles dropdown\r
                 drp_subtitle.Items.Clear();\r
                 drp_subtitle.Items.Add("None");\r
@@ -648,18 +935,30 @@ namespace Handbrake
             DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", "").Replace(".m4v", "").Replace(".mkv", "").Replace(".ogm", "").Replace(".avi", "");\r
 \r
             // Show the dialog and set the main form file path\r
-            DVD_Save.ShowDialog();\r
-            if (DVD_Save.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
-                setAudioByContainer(DVD_Save.FileName);\r
-\r
-                text_destination.Text = DVD_Save.FileName;\r
+            if (drop_format.SelectedIndex.Equals(0))\r
+                DVD_Save.FilterIndex = 1;\r
+            else if (drop_format.SelectedIndex.Equals(1))\r
+                DVD_Save.FilterIndex = 2;\r
+            else if (drop_format.SelectedIndex.Equals(2))\r
+                DVD_Save.FilterIndex = 3;\r
+            else if (drop_format.SelectedIndex.Equals(3))\r
+                DVD_Save.FilterIndex = 4;\r
+            else if (drop_format.SelectedIndex.Equals(4))\r
+                DVD_Save.FilterIndex = 5;\r
+\r
+            if (DVD_Save.ShowDialog() == DialogResult.OK)\r
+            {\r
+                if (DVD_Save.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
+                    setAudioByContainer(DVD_Save.FileName);\r
+                    text_destination.Text = DVD_Save.FileName;\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)\r
-                    text_destination.Text = text_destination.Text.Replace(".mp4", ".m4v");\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)\r
+                        text_destination.Text = text_destination.Text.Replace(".mp4", ".m4v");\r
+                }\r
             }\r
         }\r
         private void text_destination_TextChanged(object sender, EventArgs e)\r
@@ -684,15 +983,23 @@ namespace Handbrake
         private void drop_format_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if (drop_format.SelectedIndex == 0)\r
-                text_destination.Text = hb_common_func.setExtension(text_destination.Text, ".mp4");\r
+                setExtension(".mp4");\r
             else if (drop_format.SelectedIndex == 1)\r
-                text_destination.Text = hb_common_func.setExtension(text_destination.Text, ".m4v");\r
+                setExtension(".m4v");\r
             else if (drop_format.SelectedIndex == 2)\r
-                text_destination.Text = hb_common_func.setExtension(text_destination.Text, ".mkv");\r
+                setExtension(".mkv");\r
             else if (drop_format.SelectedIndex == 3)\r
-                text_destination.Text = hb_common_func.setExtension(text_destination.Text, ".avi");\r
+                setExtension(".avi");\r
             else if (drop_format.SelectedIndex == 4)\r
-                text_destination.Text = hb_common_func.setExtension(text_destination.Text, ".ogm");\r
+                setExtension(".ogm");\r
+        }\r
+        private 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
+            text_destination.Text = text_destination.Text.Replace(".avi", newExtension);\r
+            text_destination.Text = text_destination.Text.Replace(".ogm", newExtension);\r
         }\r
 \r
         //Video Tab\r
@@ -714,7 +1021,6 @@ namespace Handbrake
                 check_iPodAtom.Checked = false;\r
             }\r
 \r
-\r
             //Turn off some options which are H.264 only when the user selects a non h.264 encoder\r
             if (drp_videoEncoder.Text.Contains("H.264"))\r
             {\r
@@ -781,6 +1087,11 @@ namespace Handbrake
         //Picture Tab\r
         private void text_width_TextChanged(object sender, EventArgs e)\r
         {\r
+            if (text_width.Text == "")\r
+                text_width.BackColor = Color.White;\r
+\r
+            maxWidth = 0; maxHeight = 0;  // Reset max width so that it's not using the MaxWidth -X. Quick hack to allow -X for preset usage.\r
+\r
             int width;\r
             Boolean parsed = int.TryParse(text_width.Text, out width);\r
             if (parsed != false)\r
@@ -791,18 +1102,24 @@ namespace Handbrake
                     text_width.BackColor = Color.LightGreen;\r
 \r
 \r
-                if (lbl_Aspect.Text != "Select a Title")\r
+                if (lbl_Aspect.Text != "Select a Title" && maxWidth == 0 && maxHeight == 0)\r
                 {\r
                     if (drp_anamorphic.Text == "None")\r
                     {\r
                         int height = hb_common_func.cacluateNonAnamorphicHeight(width, text_top.Value, text_bottom.Value, text_left.Value, text_right.Value, selectedTitle);\r
-                        text_height.Text = height.ToString();\r
+                        if (height != 0)\r
+                            text_height.Text = height.ToString();\r
                     }\r
                 }\r
             }\r
         }\r
         private void text_height_TextChanged(object sender, EventArgs e)\r
         {\r
+            if (text_height.Text == "")\r
+                text_height.BackColor = Color.White;\r
+\r
+            maxHeight = 0;  // Reset max height so that it's not using the MaxHeight -Y. Quick hack to allow -Y for preset usage.\r
+\r
             int height;\r
             Boolean parsed = int.TryParse(text_height.Text, out height);\r
             if (parsed != false)\r
@@ -879,166 +1196,15 @@ namespace Handbrake
                 lbl_deblockVal.Text = slider_deblock.Value.ToString();\r
         }\r
 \r
-        // Audio Tab\r
-        private void drp_track2Audio_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if (drp_track2Audio.SelectedItem.Equals("None"))\r
-            {\r
-                drp_audbit_2.Enabled = false;\r
-                drp_audenc_2.Enabled = false;\r
-                drp_audsr_2.Enabled = false;\r
-                drp_audmix_2.Enabled = false;\r
-                trackBar2.Enabled = false;\r
-                drp_audbit_2.Text = "";\r
-                drp_audenc_2.Text = "";\r
-                drp_audsr_2.Text = "";\r
-                drp_audmix_2.Text = "Automatic";\r
-                trackBar2.Value = 0;\r
-\r
-                // Disable the 3rd Track.\r
-                drp_track3Audio.Enabled = false;\r
-                drp_track3Audio.Text = "None";\r
-                drp_audbit_3.Text = "";\r
-                drp_audenc_3.Text = "";\r
-                drp_audsr_3.Text = "";\r
-                drp_audmix_3.Text = "Automatic";\r
-                trackBar3.Value = 0;\r
-            }\r
-            else\r
-            {\r
-                drp_audbit_2.Enabled = true;\r
-                drp_audenc_2.Enabled = true;\r
-                drp_audsr_2.Enabled = true;\r
-                drp_audmix_2.Enabled = true;\r
-                trackBar2.Enabled = true;\r
-                drp_audbit_2.Text = "160";\r
-                drp_audenc_2.Text = "AAC";\r
-                drp_audsr_2.Text = "Auto";\r
-                drp_audmix_2.Text = "Automatic";\r
-\r
-                // Enable the 3rd Track.\r
-                drp_track3Audio.Enabled = true;\r
-                drp_audbit_3.Text = "";\r
-                drp_audenc_3.Text = "";\r
-                drp_audsr_3.Text = "";\r
-                drp_audmix_3.Text = "Automatic";\r
-            }\r
-        }\r
-        private void drp_track3Audio_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if (drp_track3Audio.SelectedItem.Equals("None"))\r
-            {\r
-                drp_audbit_3.Enabled = false;\r
-                drp_audenc_3.Enabled = false;\r
-                drp_audsr_3.Enabled = false;\r
-                drp_audmix_3.Enabled = false;\r
-                trackBar3.Enabled = false;\r
-                drp_audbit_3.Text = "";\r
-                drp_audenc_3.Text = "";\r
-                drp_audsr_3.Text = "";\r
-                drp_audmix_3.Text = "Automatic";\r
-                trackBar3.Value = 0;\r
-\r
-                // Disable the 4th Track.\r
-                drp_track4Audio.Enabled = false;\r
-                drp_track4Audio.Text = "None";\r
-                drp_audbit_4.Text = "";\r
-                drp_audenc_4.Text = "";\r
-                drp_audsr_4.Text = "";\r
-                drp_audmix_4.Text = "Automatic";\r
-\r
-            }\r
-            else\r
-            {\r
-                drp_audbit_3.Enabled = true;\r
-                drp_audenc_3.Enabled = true;\r
-                drp_audsr_3.Enabled = true;\r
-                drp_audmix_3.Enabled = true;\r
-                trackBar3.Enabled = true;\r
-                drp_audbit_3.Text = "160";\r
-                drp_audenc_3.Text = "AAC";\r
-                drp_audsr_3.Text = "Auto";\r
-                drp_audmix_3.Text = "Automatic";\r
-\r
-                // Enable the 4th Track.\r
-                drp_track4Audio.Enabled = true;\r
-                drp_audbit_4.Text = "";\r
-                drp_audenc_4.Text = "";\r
-                drp_audsr_4.Text = "";\r
-                drp_audmix_4.Text = "Automatic";\r
-            }\r
-\r
-        }\r
-        private void drp_track4Audio_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if (drp_track4Audio.SelectedItem.Equals("None"))\r
-            {\r
-                drp_audbit_4.Enabled = false;\r
-                drp_audenc_4.Enabled = false;\r
-                drp_audsr_4.Enabled = false;\r
-                drp_audmix_4.Enabled = false;\r
-                trackBar4.Enabled = false;\r
-                drp_audbit_4.Text = "";\r
-                drp_audenc_4.Text = "";\r
-                drp_audsr_4.Text = "";\r
-                drp_audmix_4.Text = "Automatic";\r
-                trackBar4.Value = 0;\r
-            }\r
-            else\r
-            {\r
-                drp_audbit_4.Enabled = true;\r
-                drp_audenc_4.Enabled = true;\r
-                drp_audsr_4.Enabled = true;\r
-                drp_audmix_4.Enabled = true;\r
-                trackBar4.Enabled = true;\r
-                drp_audbit_4.Text = "160";\r
-                drp_audenc_4.Text = "AAC";\r
-                drp_audsr_4.Text = "Auto";\r
-                drp_audmix_4.Text = "Automatic";\r
-            }\r
-        }\r
-\r
-        private void drp_audmix_1_SelectedIndexChanged(object sender, EventArgs e)\r
+        //Audio Tab\r
+        private void drp_track1Audio_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text == "6 Channel Discrete"))\r
-                setBitrateSelections384(drp_audbit_1);\r
-            else if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text != "6 Channel Discrete"))\r
+            if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
             {\r
-                setBitrateSelections160(drp_audbit_1);\r
-                drp_audbit_1.Text = "160";\r
+                lv_audioList.Items[lv_audioList.SelectedIndices[0]].Text = drp_track1Audio.Text;\r
+                lv_audioList.Select();\r
             }\r
         }\r
-        private void drp_audmix_2_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if ((drp_audenc_2.Text == "AAC") && (drp_audmix_2.Text == "6 Channel Discrete"))\r
-                setBitrateSelections384(drp_audbit_2);\r
-            else if ((drp_audenc_2.Text == "AAC") && (drp_audmix_2.Text != "6 Channel Discrete"))\r
-            {\r
-                setBitrateSelections160(drp_audbit_2);\r
-                drp_audbit_2.Text = "160";\r
-            }\r
-        }\r
-        private void drp_audmix_3_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if ((drp_audenc_3.Text == "AAC") && (drp_audmix_3.Text == "6 Channel Discrete"))\r
-                setBitrateSelections384(drp_audbit_3);\r
-            else if ((drp_audenc_3.Text == "AAC") && (drp_audmix_3.Text != "6 Channel Discrete"))\r
-            {\r
-                setBitrateSelections160(drp_audbit_3);\r
-                drp_audbit_3.Text = "160";\r
-            }\r
-        }\r
-        private void drp_audmix_4_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if ((drp_audenc_4.Text == "AAC") && (drp_audmix_4.Text == "6 Channel Discrete"))\r
-                setBitrateSelections384(drp_audbit_4);\r
-            else if ((drp_audenc_4.Text == "AAC") && (drp_audmix_4.Text != "6 Channel Discrete"))\r
-            {\r
-                setBitrateSelections160(drp_audbit_4);\r
-                drp_audbit_4.Text = "160";\r
-            }\r
-        }\r
-\r
         private void drp_audenc_1_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if (drp_audenc_1.Text == "AC3")\r
@@ -1046,6 +1212,10 @@ namespace Handbrake
                 drp_audmix_1.Enabled = false;\r
                 drp_audbit_1.Enabled = false;\r
                 drp_audsr_1.Enabled = false;\r
+\r
+                drp_audmix_1.SelectedIndex = 0;\r
+                drp_audbit_1.SelectedIndex = 0;\r
+                drp_audsr_1.SelectedIndex = 0;\r
             }\r
             else\r
             {\r
@@ -1058,202 +1228,169 @@ namespace Handbrake
                 drp_audsr_1.Text = "Auto";\r
             }\r
 \r
-\r
             if (drp_audenc_1.Text == "AAC")\r
             {\r
-                drp_audmix_1.Items.Clear();\r
-                drp_audmix_1.Items.Add("Mono");\r
-                drp_audmix_1.Items.Add("Stereo");\r
-                drp_audmix_1.Items.Add("Dolby Surround");\r
-                drp_audmix_1.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_1.Items.Add("6 Channel Discrete");\r
-\r
+                setMixDownAllOptions(drp_audmix_1);\r
                 setBitrateSelections160(drp_audbit_1);\r
             }\r
             else\r
             {\r
-                drp_audmix_1.Items.Clear();\r
-                drp_audmix_1.Items.Add("Stereo");\r
-                drp_audmix_1.Items.Add("Dolby Surround");\r
-                drp_audmix_1.Items.Add("Dolby Pro Logic II");\r
-\r
+                setMixDownNotAAC(drp_audmix_1);\r
                 setBitrateSelections320(drp_audbit_1);\r
             }\r
-        }\r
-        private void drp_audenc_2_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if (drp_audenc_2.Text == "AC3")\r
-            {\r
-                drp_audmix_2.Enabled = false;\r
-                drp_audbit_2.Enabled = false;\r
-                drp_audsr_2.Enabled = false;\r
 \r
-                drp_audmix_2.Text = "Automatic";\r
-                drp_audbit_2.Text = "160";\r
-                drp_audsr_2.Text = "Auto";\r
-            }\r
-            else\r
+            // Update an item in the Audio list if required.\r
+            if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
             {\r
-                // Just make sure not to re-enable the following boxes if the track2 is none\r
-                if (drp_track2Audio.Text != "None")\r
-                {\r
-                    drp_audmix_2.Enabled = true;\r
-                    drp_audbit_2.Enabled = true;\r
-                    drp_audsr_2.Enabled = true;\r
-\r
-                    drp_audmix_2.Text = "Automatic";\r
-                    drp_audbit_2.Text = "160";\r
-                    drp_audsr_2.Text = "Auto";\r
-                }\r
-            }\r
-\r
-            if (drp_audenc_2.Text == "AAC")\r
-            {\r
-                drp_audmix_2.Items.Clear();\r
-                drp_audmix_2.Items.Add("Mono");\r
-                drp_audmix_2.Items.Add("Stereo");\r
-                drp_audmix_2.Items.Add("Dolby Surround");\r
-                drp_audmix_2.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_2.Items.Add("6 Channel Discrete");\r
-\r
-                setBitrateSelections160(drp_audbit_2);\r
-            }\r
-            else\r
-            {\r
-                drp_audmix_2.Items.Clear();\r
-                drp_audmix_2.Items.Add("Stereo");\r
-                drp_audmix_2.Items.Add("Dolby Surround");\r
-                drp_audmix_2.Items.Add("Dolby Pro Logic II");\r
-\r
-                setBitrateSelections320(drp_audbit_2);\r
+                lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[1].Text = drp_audenc_1.Text;\r
+                lv_audioList.Select();\r
             }\r
         }\r
-        private void drp_audenc_3_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if (drp_audenc_3.Text == "AC3")\r
-            {\r
-                drp_audmix_3.Enabled = false;\r
-                drp_audbit_3.Enabled = false;\r
-                drp_audsr_3.Enabled = false;\r
-\r
-                drp_audmix_3.Text = "Automatic";\r
-                drp_audbit_3.Text = "160";\r
-                drp_audsr_3.Text = "Auto";\r
-            }\r
-            else\r
-            {\r
-                // Just make sure not to re-enable the following boxes if the track above is none\r
-                if (drp_track2Audio.Text != "None")\r
-                {\r
-                    drp_audmix_3.Enabled = true;\r
-                    drp_audbit_3.Enabled = true;\r
-                    drp_audsr_3.Enabled = true;\r
-\r
-                    drp_audmix_3.Text = "Automatic";\r
-                    drp_audbit_3.Text = "160";\r
-                    drp_audsr_3.Text = "Auto";\r
-                }\r
-            }\r
-\r
+        private void drp_audmix_1_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text == "6 Channel Discrete"))\r
+                setBitrateSelections384(drp_audbit_1);\r
+            else if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text != "6 Channel Discrete"))\r
+                setBitrateSelections160(drp_audbit_1); drp_audbit_1.Text = "160";\r
 \r
-            if (drp_audenc_3.Text == "AAC")\r
+            // Update an item in the Audio list if required.\r
+            if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
             {\r
-                drp_audmix_3.Items.Clear();\r
-                drp_audmix_3.Items.Add("Mono");\r
-                drp_audmix_3.Items.Add("Stereo");\r
-                drp_audmix_3.Items.Add("Dolby Surround");\r
-                drp_audmix_3.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_3.Items.Add("6 Channel Discrete");\r
-\r
-                setBitrateSelections160(drp_audbit_3);\r
+                lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[2].Text = drp_audmix_1.Text;\r
+                lv_audioList.Select();\r
             }\r
-            else\r
+        }\r
+        private void drp_audsr_1_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            // Update an item in the Audio list if required.\r
+            if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
             {\r
-                drp_audmix_3.Items.Clear();\r
-                drp_audmix_3.Items.Add("Stereo");\r
-                drp_audmix_3.Items.Add("Dolby Surround");\r
-                drp_audmix_3.Items.Add("Dolby Pro Logic II");\r
-\r
-                setBitrateSelections320(drp_audbit_3);\r
+                lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[3].Text = drp_audsr_1.Text;\r
+                lv_audioList.Select();\r
             }\r
         }\r
-        private void drp_audenc_4_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void drp_audbit_1_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if (drp_audenc_4.Text == "AC3")\r
+            // Update an item in the Audio list if required.\r
+            if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
             {\r
-                drp_audmix_4.Enabled = false;\r
-                drp_audbit_4.Enabled = false;\r
-                drp_audsr_4.Enabled = false;\r
-\r
-                drp_audmix_4.Text = "Automatic";\r
-                drp_audbit_4.Text = "160";\r
-                drp_audsr_4.Text = "Auto";\r
+                if (drp_audenc_1.Text == "AC3")\r
+                    drp_audbit_1.Text = "Auto";\r
+                lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[4].Text = drp_audbit_1.Text;\r
+                lv_audioList.Select();\r
             }\r
-            else\r
-            {\r
-                // Just make sure not to re-enable the following boxes if the track above is none\r
-                if (drp_track2Audio.Text != "None")\r
-                {\r
-                    drp_audmix_4.Enabled = true;\r
-                    drp_audbit_4.Enabled = true;\r
-                    drp_audsr_4.Enabled = true;\r
+        }\r
+        private void tb_drc_Scroll(object sender, EventArgs e)\r
+        {\r
+            double value = (tb_drc.Value / 10.0) + 1;\r
+            lbl_drc.Text = value.ToString();\r
 \r
-                    drp_audmix_4.Text = "Automatic";\r
-                    drp_audbit_4.Text = "160";\r
-                    drp_audsr_4.Text = "Auto";\r
-                }\r
+            // Update an item in the Audio list if required.\r
+            if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
+            {\r
+                lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[5].Text = lbl_drc.Text;\r
+                lv_audioList.Select();\r
             }\r
+        }\r
 \r
+        private void btn_addAudioTrack_Click(object sender, EventArgs e)\r
+        {\r
+            // Create a new row for the Audio list based on the currently selected items in the dropdown.\r
+            ListViewItem newTrack = new ListViewItem(drp_track1Audio.Text);\r
+            newTrack.SubItems.Add(drp_audenc_1.Text);\r
+            newTrack.SubItems.Add(drp_audmix_1.Text);\r
+            newTrack.SubItems.Add(drp_audsr_1.Text);\r
+            newTrack.SubItems.Add(drp_audbit_1.Text);\r
+            newTrack.SubItems.Add(lbl_drc.Text);\r
 \r
-            if (drp_audenc_4.Text == "AAC")\r
+            // Select the newly added track and select the control\r
+            lv_audioList.Items.Add(newTrack);\r
+            lv_audioList.Items[lv_audioList.Items.Count - 1].Selected = true;\r
+            lv_audioList.Select();\r
+        }\r
+        private void btn_RemoveAudioTrack_Click(object sender, EventArgs e)\r
+        {\r
+            removeAudioTrack();\r
+        }\r
+        private void audioList_moveup_Click(object sender, EventArgs e)\r
+        {\r
+            if (lv_audioList.SelectedIndices.Count != 0)\r
             {\r
-                drp_audmix_4.Items.Clear();\r
-                drp_audmix_4.Items.Add("Mono");\r
-                drp_audmix_4.Items.Add("Stereo");\r
-                drp_audmix_4.Items.Add("Dolby Surround");\r
-                drp_audmix_4.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_4.Items.Add("6 Channel Discrete");\r
+                ListViewItem item = lv_audioList.SelectedItems[0];\r
+                int index = item.Index;\r
+                index--;\r
 \r
-                setBitrateSelections160(drp_audbit_4);\r
+                if (lv_audioList.Items.Count > index && index >= 0)\r
+                {\r
+                    lv_audioList.Items.Remove(item);\r
+                    lv_audioList.Items.Insert(index, item);\r
+                    item.Selected = true;\r
+                    lv_audioList.Focus();\r
+                }\r
             }\r
-            else\r
+        }\r
+        private void audioList_movedown_Click(object sender, EventArgs e)\r
+        {\r
+            if (lv_audioList.SelectedIndices.Count != 0)\r
             {\r
-                drp_audmix_4.Items.Clear();\r
-                drp_audmix_4.Items.Add("Stereo");\r
-                drp_audmix_4.Items.Add("Dolby Surround");\r
-                drp_audmix_4.Items.Add("Dolby Pro Logic II");\r
+                ListViewItem item = lv_audioList.SelectedItems[0];\r
+                int index = item.Index;\r
+                index++;\r
 \r
-                setBitrateSelections320(drp_audbit_4);\r
+                if (index < lv_audioList.Items.Count)\r
+                {\r
+                    lv_audioList.Items.Remove(item);\r
+                    lv_audioList.Items.Insert(index, item);\r
+                    item.Selected = true;\r
+                    lv_audioList.Focus();\r
+                }\r
             }\r
+\r
         }\r
 \r
-        private void trackBar1_Scroll(object sender, EventArgs e)\r
+        private void audioList_remove_Click(object sender, EventArgs e)\r
         {\r
-            double value = trackBar1.Value / 10.0;\r
-            value++;\r
-\r
-            lbl_drc1.Text = value.ToString();\r
+            removeAudioTrack();\r
         }\r
-        private void trackBar2_Scroll(object sender, EventArgs e)\r
+        private void removeAudioTrack()\r
         {\r
-            double value = trackBar2.Value / 10.0;\r
-            value++;\r
+            // Remove the Item and reselect the control if the following conditions are met.\r
+            if (lv_audioList.SelectedItems.Count != 0)\r
+            {\r
+                // Record the current selected index.\r
+                int currentPosition = lv_audioList.SelectedIndices[0];\r
 \r
-            lbl_drc2.Text = value.ToString();\r
-        }\r
-        private void trackBar3_Scroll(object sender, EventArgs e)\r
-        {\r
-            double value = trackBar3.Value / 10.0;\r
-            value++;\r
+                lv_audioList.Items.RemoveAt(lv_audioList.SelectedIndices[0]);\r
 \r
-            lbl_drc3.Text = value.ToString();\r
+                // Now reslect the correct item and give focus to the audio list.\r
+                if (lv_audioList.Items.Count != 0)\r
+                {\r
+                    if (currentPosition <= (lv_audioList.Items.Count - 1))\r
+                        lv_audioList.Items[currentPosition].Selected = true;\r
+                    else if (currentPosition > (lv_audioList.Items.Count - 1))\r
+                        lv_audioList.Items[lv_audioList.Items.Count - 1].Selected = true;\r
+\r
+                    lv_audioList.Select();\r
+                }\r
+            }\r
         }\r
-        private void trackBar4_Scroll(object sender, EventArgs e)\r
-        {\r
-            double value = trackBar4.Value / 10.0;\r
-            value++;\r
 \r
-            lbl_drc4.Text = value.ToString();\r
+        private void lv_audioList_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            // Set the dropdown controls based on the selected item in the Audio List.\r
+            if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
+            {\r
+                drp_track1Audio.Text = lv_audioList.Items[lv_audioList.SelectedIndices[0]].Text;\r
+                drp_audenc_1.Text = lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[1].Text;\r
+                drp_audmix_1.Text = lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[2].Text;\r
+                drp_audsr_1.Text = lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[3].Text;\r
+                drp_audbit_1.Text = lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[4].Text;\r
+                double drcValue = 0; int drcCalculated = 0;\r
+                double.TryParse(lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[5].Text, out drcValue);\r
+                drcValue = (drcValue * 10) - 10;\r
+                int.TryParse(drcValue.ToString(), out drcCalculated);\r
+                tb_drc.Value = drcCalculated;\r
+            }\r
         }\r
 \r
         private void drp_subtitle_SelectedIndexChanged(object sender, EventArgs e)\r
@@ -1272,9 +1409,7 @@ namespace Handbrake
         {\r
             if (Check_ChapterMarkers.Checked)\r
             {\r
-                string destination = text_destination.Text;\r
-                destination = destination.Replace(".mp4", ".m4v");\r
-                text_destination.Text = destination;\r
+                text_destination.Text = text_destination.Text.Replace(".m4v", ".mp4");\r
                 data_chpt.Rows.Clear();\r
                 data_chpt.Enabled = true;\r
                 DataGridView chapterGridView = hb_common_func.chapterNaming(data_chpt, drop_chapterStart.Text, drop_chapterFinish.Text);\r
@@ -1283,9 +1418,7 @@ namespace Handbrake
             }\r
             else\r
             {\r
-                string destination = text_destination.Text;\r
-                destination = destination.Replace(".m4v", ".mp4");\r
-                text_destination.Text = destination;\r
+                text_destination.Text = text_destination.Text.Replace(".m4v", ".mp4");\r
                 data_chpt.Rows.Clear();\r
                 data_chpt.Enabled = false;\r
             }\r
@@ -1400,133 +1533,11 @@ namespace Handbrake
         {\r
             rtf_query.Clear();\r
         }\r
-\r
-        // Presets\r
-        private void btn_addPreset_Click(object sender, EventArgs e)\r
-        {\r
-            // Remember each nodes expanded status so we can reload it\r
-            List<Boolean> nodeStatus = new List<Boolean>();\r
-            foreach (TreeNode node in treeView_presets.Nodes)\r
-                nodeStatus.Add(node.IsExpanded);\r
-            nodeStatus.Add(true);\r
-\r
-            // Now add the new preset\r
-            Form preset = new frmAddPreset(this, queryGen.GenerateTheQuery(this), presetHandler);\r
-            preset.ShowDialog();\r
-\r
-            // And finally, re-expand any of the nodes if required\r
-            int i = 0;\r
-            foreach (TreeNode node in treeView_presets.Nodes)\r
-            {\r
-                if (nodeStatus[i] == true)\r
-                    node.Expand();\r
-\r
-                i++;\r
-            }\r
-        }\r
-        private void btn_removePreset_Click(object sender, EventArgs e)\r
-        {\r
-            DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
-            if (result == DialogResult.Yes)\r
-            {\r
-                if (treeView_presets.SelectedNode != null)\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
-                foreach (TreeNode node in treeView_presets.Nodes)\r
-                    nodeStatus.Add(node.IsExpanded);\r
-\r
-                // Now reload the preset panel\r
-                loadPresetPanel();\r
-\r
-                // And finally, re-expand any of the nodes if required\r
-                int i = 0;\r
-                foreach (TreeNode node in treeView_presets.Nodes)\r
-                {\r
-                    if (nodeStatus[i] == true)\r
-                        node.Expand();\r
-\r
-                    i++;\r
-                }\r
-            }\r
-            treeView_presets.Select();\r
-        }\r
-        private void btn_setDefault_Click(object sender, EventArgs e)\r
-        {\r
-            String query = queryGen.GenerateTheQuery(this);\r
-            Properties.Settings.Default.defaultUserSettings = query;\r
-            // Save the new default Settings\r
-            Properties.Settings.Default.Save();\r
-            MessageBox.Show("New default settings saved.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
-        }\r
-        private void treeView_presets_AfterSelect(object sender, TreeViewEventArgs e)\r
-        {\r
-            // Ok, so, we've selected a preset. Now we want to load it.\r
-            string presetName = treeView_presets.SelectedNode.Text;\r
-            string query = presetHandler.getCliForPreset(presetName);\r
-\r
-            if (query != null)\r
-            {\r
-                //Ok, Reset all the H264 widgets before changing the preset\r
-                x264PanelFunctions.reset2Defaults(this);\r
-\r
-                // Send the query from the file to the Query Parser class\r
-                Functions.QueryParser presetQuery = Functions.QueryParser.Parse(query);\r
-\r
-                // Now load the preset\r
-                presetLoader.presetLoader(this, presetQuery, presetName);\r
-\r
-                // The x264 widgets will need updated, so do this now:\r
-                x264PanelFunctions.X264_StandardizeOptString(this);\r
-                x264PanelFunctions.X264_SetCurrentSettingsInPanel(this);\r
-            }\r
-        }\r
-        private void treeView_presets_deleteKey(object sender, KeyEventArgs e)\r
-        {\r
-            if (e.KeyCode == Keys.Delete)\r
-            {\r
-                DialogResult result = MessageBox.Show("Are you sure you wish to delete the selected preset?", "Preset", MessageBoxButtons.YesNo, MessageBoxIcon.Question);\r
-                if (result == DialogResult.Yes)\r
-                {\r
-                    if (treeView_presets.SelectedNode != null)\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
-                    foreach (TreeNode node in treeView_presets.Nodes)\r
-                        nodeStatus.Add(node.IsExpanded);\r
-\r
-                    // Now reload the preset panel\r
-                    loadPresetPanel();\r
-\r
-                    // And finally, re-expand any of the nodes if required\r
-                    int i = 0;\r
-                    foreach (TreeNode node in treeView_presets.Nodes)\r
-                    {\r
-                        if (nodeStatus[i] == true)\r
-                            node.Expand();\r
-\r
-                        i++;\r
-                    }\r
-                }\r
-            }\r
-        }\r
-\r
         #endregion\r
 \r
-        #region Functions\r
-        private void loadNormalPreset()\r
-        {\r
-            foreach (TreeNode treenode in treeView_presets.Nodes)\r
-            {\r
-                if (treenode.Text.ToString().Equals("Normal"))\r
-                    treeView_presets.SelectedNode = treeView_presets.Nodes[treenode.Index];\r
-            }\r
-        }\r
-        #endregion\r
+        // MainWindow Components, Actions and Functions ***********************\r
 \r
-        #region Drive Detection\r
+        #region DVD Drive Detection\r
         // Source Button Drive Detection\r
         private delegate void ProgressUpdateHandler();\r
         private void getDriveInfoThread()\r
@@ -1568,8 +1579,8 @@ namespace Handbrake
         }\r
         #endregion\r
 \r
-        #region Audio Panel Stuff\r
-        public void setAudioByContainer(String path)\r
+        #region Audio Panel Code Helpers\r
+        private void setAudioByContainer(String path)\r
         {\r
             string oldval = "";\r
 \r
@@ -1582,35 +1593,6 @@ namespace Handbrake
                 if ((oldval != "AAC") && (oldval != "AC3"))\r
                     drp_audenc_1.SelectedIndex = 0;\r
 \r
-                oldval = drp_audenc_2.Text;\r
-                drp_audenc_2.Items.Clear();\r
-                drp_audenc_2.Items.Add("AAC");\r
-                drp_audenc_2.Items.Add("AC3");\r
-                if (drp_audenc_2.Enabled)\r
-                {\r
-                    if ((oldval != "AAC") && (oldval != "AC3"))\r
-                        drp_audenc_2.SelectedIndex = 0;\r
-                }\r
-\r
-                oldval = drp_audenc_3.Text;\r
-                drp_audenc_3.Items.Clear();\r
-                drp_audenc_3.Items.Add("AAC");\r
-                drp_audenc_3.Items.Add("AC3");\r
-                if (drp_audenc_3.Enabled)\r
-                {\r
-                    if ((oldval != "AAC") && (oldval != "AC3"))\r
-                        drp_audenc_3.SelectedIndex = 0;\r
-                }\r
-\r
-                oldval = drp_audenc_4.Text;\r
-                drp_audenc_4.Items.Clear();\r
-                drp_audenc_4.Items.Add("AAC");\r
-                drp_audenc_4.Items.Add("AC3");\r
-                if (drp_audenc_4.Enabled)\r
-                {\r
-                    if ((oldval != "AAC") && (oldval != "AC3"))\r
-                        drp_audenc_4.SelectedIndex = 0;\r
-                }\r
             }\r
             else if (path.EndsWith(".avi"))\r
             {\r
@@ -1621,36 +1603,6 @@ namespace Handbrake
                 if ((oldval != "MP3") && (oldval != "AC3"))\r
                     drp_audenc_1.SelectedIndex = 0;\r
 \r
-                oldval = drp_audenc_2.Text;\r
-                drp_audenc_2.Items.Clear();\r
-                drp_audenc_2.Items.Add("MP3");\r
-                drp_audenc_2.Items.Add("AC3");\r
-                if (drp_audenc_2.Enabled)\r
-                {\r
-                    if ((oldval != "MP3") && (oldval != "AC3"))\r
-                        drp_audenc_2.SelectedIndex = 0;\r
-                }\r
-\r
-\r
-                oldval = drp_audenc_3.Text;\r
-                drp_audenc_3.Items.Clear();\r
-                drp_audenc_3.Items.Add("MP3");\r
-                drp_audenc_3.Items.Add("AC3");\r
-                if (drp_audenc_3.Enabled)\r
-                {\r
-                    if ((oldval != "MP3") && (oldval != "AC3"))\r
-                        drp_audenc_3.SelectedIndex = 0;\r
-                }\r
-\r
-                oldval = drp_audenc_4.Text;\r
-                drp_audenc_4.Items.Clear();\r
-                drp_audenc_4.Items.Add("MP3");\r
-                drp_audenc_4.Items.Add("AC3");\r
-                if (drp_audenc_4.Enabled)\r
-                {\r
-                    if ((oldval != "MP3") && (oldval != "AC3"))\r
-                        drp_audenc_4.SelectedIndex = 0;\r
-                }\r
             }\r
             else if (path.EndsWith(".ogm"))\r
             {\r
@@ -1658,20 +1610,6 @@ namespace Handbrake
                 drp_audenc_1.Items.Add("Vorbis");\r
                 drp_audenc_1.SelectedIndex = 0;\r
 \r
-                drp_audenc_2.Items.Clear();\r
-                drp_audenc_2.Items.Add("Vorbis");\r
-                if (drp_audenc_2.Enabled)\r
-                    drp_audenc_2.SelectedIndex = 0;\r
-\r
-                drp_audenc_3.Items.Clear();\r
-                drp_audenc_3.Items.Add("Vorbis");\r
-                if (drp_audenc_3.Enabled)\r
-                    drp_audenc_3.SelectedIndex = 0;\r
-\r
-                drp_audenc_4.Items.Clear();\r
-                drp_audenc_4.Items.Add("Vorbis");\r
-                if (drp_audenc_4.Enabled)\r
-                    drp_audenc_4.SelectedIndex = 0;\r
             }\r
             else if (path.EndsWith(".mkv"))\r
             {\r
@@ -1682,43 +1620,9 @@ namespace Handbrake
                 drp_audenc_1.Items.Add("Vorbis");\r
                 if (drp_audenc_1.Text == string.Empty)\r
                     drp_audenc_1.SelectedIndex = 0;\r
-\r
-\r
-                drp_audenc_2.Items.Clear();\r
-                drp_audenc_2.Items.Add("AAC");\r
-                drp_audenc_2.Items.Add("MP3");\r
-                drp_audenc_2.Items.Add("AC3");\r
-                drp_audenc_2.Items.Add("Vorbis");\r
-                if (drp_audenc_2.Enabled)\r
-                {\r
-                    if (drp_audenc_2.Text == string.Empty)\r
-                        drp_audenc_2.SelectedIndex = 0;\r
-                }\r
-\r
-                drp_audenc_3.Items.Clear();\r
-                drp_audenc_3.Items.Add("AAC");\r
-                drp_audenc_3.Items.Add("MP3");\r
-                drp_audenc_3.Items.Add("AC3");\r
-                drp_audenc_3.Items.Add("Vorbis");\r
-                if (drp_audenc_3.Enabled)\r
-                {\r
-                    if (drp_audenc_3.Text == string.Empty)\r
-                        drp_audenc_3.SelectedIndex = 0;\r
-                }\r
-\r
-                drp_audenc_4.Items.Clear();\r
-                drp_audenc_4.Items.Add("AAC");\r
-                drp_audenc_4.Items.Add("MP3");\r
-                drp_audenc_4.Items.Add("AC3");\r
-                drp_audenc_4.Items.Add("Vorbis");\r
-                if (drp_audenc_4.Enabled)\r
-                {\r
-                    if (drp_audenc_4.Text == string.Empty)\r
-                        drp_audenc_4.SelectedIndex = 0;\r
-                }\r
             }\r
         }\r
-        public void setVideoByContainer(String path)\r
+        private void setVideoByContainer(String path)\r
         {\r
             string oldval = "";\r
 \r
@@ -1770,7 +1674,7 @@ namespace Handbrake
                 drp_videoEncoder.Text = oldval;\r
             }\r
         }\r
-        public void setBitrateSelections384(ComboBox dropDown)\r
+        private void setBitrateSelections384(ComboBox dropDown)\r
         {\r
             dropDown.Items.Clear();\r
             dropDown.Items.Add("32");\r
@@ -1789,7 +1693,7 @@ namespace Handbrake
             dropDown.Items.Add("320");\r
             dropDown.Items.Add("384");\r
         }\r
-        public void setBitrateSelections320(ComboBox dropDown)\r
+        private void setBitrateSelections320(ComboBox dropDown)\r
         {\r
             dropDown.Items.Clear();\r
             dropDown.Items.Add("32");\r
@@ -1807,7 +1711,7 @@ namespace Handbrake
             dropDown.Items.Add("256");\r
             dropDown.Items.Add("320");\r
         }\r
-        public void setBitrateSelections160(ComboBox dropDown)\r
+        private void setBitrateSelections160(ComboBox dropDown)\r
         {\r
             dropDown.Items.Clear();\r
             dropDown.Items.Add("32");\r
@@ -1821,25 +1725,75 @@ namespace Handbrake
             dropDown.Items.Add("128");\r
             dropDown.Items.Add("160");\r
         }\r
-        #endregion\r
+        private void setMixDownAllOptions(ComboBox dropdown)\r
+        {\r
+            dropdown.Items.Clear();\r
+            dropdown.Items.Add("Automatic");\r
+            dropdown.Items.Add("Mono");\r
+            dropdown.Items.Add("Stereo");\r
+            dropdown.Items.Add("Dolby Surround");\r
+            dropdown.Items.Add("Dolby Pro Logic II");\r
+            dropdown.Items.Add("6 Channel Discrete");\r
+        }\r
+        private void setMixDownNotAAC(ComboBox dropdown)\r
+        {\r
+            dropdown.Items.Clear();\r
+            dropdown.Items.Add("Automatic");\r
+            dropdown.Items.Add("Stereo");\r
+            dropdown.Items.Add("Dolby Surround");\r
+            dropdown.Items.Add("Dolby Pro Logic II");\r
+        }\r
+        private void audioEncoderChange(ComboBox audenc, ComboBox audMix, ComboBox audbit, ComboBox audsr)\r
+        {\r
+            if (audenc.Text == "AC3")\r
+            {\r
+                audMix.Enabled = false;\r
+                audbit.Enabled = false;\r
+                audsr.Enabled = false;\r
 \r
-        #region Encoding\r
+                audMix.Text = "Automatic";\r
+                audbit.Text = "160";\r
+                audsr.Text = "Auto";\r
+            }\r
+            else\r
+            {\r
+                // Just make sure not to re-enable the following boxes if the track above is none\r
+                /* if (drp_track2Audio.Text != "None")\r
+                 {\r
+                     audMix.Enabled = true;\r
+                     audbit.Enabled = true;\r
+                     audsr.Enabled = true;\r
+\r
+                     audMix.Text = "Automatic";\r
+                     audbit.Text = "160";\r
+                     audsr.Text = "Auto";\r
+                 }*/\r
+            }\r
+        }\r
+        #endregion\r
 \r
-        // Declarations\r
-        private delegate void UpdateUIHandler();\r
+        #region Public Methods\r
 \r
-        // Encoding Functions\r
-        private void procMonitor(object state)\r
+        /// <summary>\r
+        /// Setup the GUI for Encoding or finished Encoding.\r
+        /// 1 = Encode Running\r
+        /// 0 = Encode Finished.\r
+        /// </summary>\r
+        /// <param name="i">Int</param>\r
+        public void setEncodeFinished()\r
         {\r
-            // Make sure we are not already encoding and if we are then display an error.\r
-            if (hbProc != null)\r
-                hbProc.CloseMainWindow();\r
-            else\r
+            try\r
             {\r
-                hbProc = cliObj.runCli(this, (string)state);\r
-                hbProc.WaitForExit();\r
-                setEncodeLabelFinished();\r
-                hbProc = null;\r
+                if (this.InvokeRequired)\r
+                {\r
+                    this.BeginInvoke(new UpdateWindowHandler(setEncodeFinished));\r
+                    return;\r
+                }\r
+\r
+                lbl_encode.Text = "Encoding Finished";\r
+                btn_start.Text = "Start";\r
+                btn_start.ToolTipText = "Start the encoding process";\r
+                btn_start.Image = Properties.Resources.Play;\r
 \r
                 // If the window is minimized, display the notification in a popup.\r
                 if (FormWindowState.Minimized == this.WindowState)\r
@@ -1848,37 +1802,32 @@ namespace Handbrake
                     notifyIcon.ShowBalloonTip(500);\r
                 }\r
 \r
-                // After the encode is done, we may want to shutdown, suspend etc.\r
-                cliObj.afterEncodeAction();\r
             }\r
-        }\r
-        private void setEncodeLabelFinished()\r
-        {\r
-            if (this.InvokeRequired)\r
+            catch (Exception exc)\r
             {\r
-                this.BeginInvoke(new UpdateUIHandler(setEncodeLabelFinished));\r
-                return;\r
+                MessageBox.Show(exc.ToString());\r
             }\r
-            lbl_encode.Text = "Encoding Finished";\r
-            btn_start.Text = "Start";\r
-            btn_start.ToolTipText = "Start the encoding process";\r
-            btn_start.Image = Properties.Resources.Play;\r
         }\r
-\r
-        #endregion\r
-\r
-        #region Public Methods\r
-\r
-        /// <summary>\r
-        /// Is the mainWindow currently monitoring an encoding session\r
-        /// </summary>\r
-        /// <returns>boolean</returns>\r
-        public Boolean isEncoding()\r
+        public void setEncodeStarted()\r
         {\r
-            if (hbProc == null)\r
-                return false;\r
-            else\r
-                return true;\r
+            try\r
+            {\r
+                if (this.InvokeRequired)\r
+                {\r
+                    this.BeginInvoke(new UpdateWindowHandler(setEncodeStarted));\r
+                    return;\r
+                }\r
+\r
+                lbl_encode.Visible = true;\r
+                lbl_encode.Text = "Encoding in Progress";\r
+                btn_start.Text = "Stop";\r
+                btn_start.ToolTipText = "Stop the encoding process. \nWarning: This may break your file. Press ctrl-c in the CLI window if you wish it to exit cleanly.";\r
+                btn_start.Image = Properties.Resources.stop;\r
+            }\r
+            catch (Exception exc)\r
+            {\r
+                MessageBox.Show(exc.ToString());\r
+            }\r
         }\r
 \r
         /// <summary>\r
@@ -1947,7 +1896,7 @@ namespace Handbrake
                     }\r
 \r
                     // Third Case - Any presets the sub presets detected in the above if statment.\r
-                    if (preset.Level == 1 && workingLevel == 2 && previousCategory == preset.Category)\r
+                    if (preset.Level == 1 && workingLevel == 2)\r
                     {\r
                         workingLevel = preset.Level;\r
                         currentCategory = preset.Category;\r
@@ -1984,7 +1933,6 @@ namespace Handbrake
                 treeView_presets.Nodes.Add(rootNode);\r
             }\r
 \r
-\r
             // User Presets\r
             presetNames = presetHandler.getUserPresetNames();\r
             foreach (string preset in presetNames)\r
@@ -1999,41 +1947,8 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-        #region Taskbar Tray Icon\r
-        private void frmMain_Resize(object sender, EventArgs e)\r
-        {\r
-            if (FormWindowState.Minimized == this.WindowState)\r
-            {\r
-                notifyIcon.Visible = true;\r
-                if (lbl_encode.Text != "")\r
-                    notifyIcon.BalloonTipText = lbl_encode.Text;\r
-                else\r
-                    notifyIcon.BalloonTipText = "Not Encoding";\r
-                notifyIcon.ShowBalloonTip(500);\r
-                this.Hide();\r
-            }\r
-            else if (FormWindowState.Normal == this.WindowState)\r
-                notifyIcon.Visible = false;\r
-        }\r
-        private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)\r
-        {\r
-            this.Visible = true;\r
-            this.Activate();\r
-            this.WindowState = FormWindowState.Normal;\r
-            notifyIcon.Visible = false;\r
-        }\r
-        private void btn_minimize_Click(object sender, EventArgs e)\r
-        {\r
-            this.WindowState = FormWindowState.Minimized;\r
-        }\r
-        private void btn_restore_Click(object sender, EventArgs e)\r
-        {\r
-            this.Visible = true;\r
-            this.Activate();\r
-            this.WindowState = FormWindowState.Normal;\r
-            notifyIcon.Visible = false;\r
-        }\r
-        #endregion\r
+\r
+\r
 \r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r