OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 27 Nov 2007 21:27:19 +0000 (21:27 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 27 Nov 2007 21:27:19 +0000 (21:27 +0000)
- Removed some duplicate code and fixed a few small bugs.
- Changed the layout of the code slightly.
- Changed the DVD parser to use verbose CLI which can be displayed on the DVD information log page.

git-svn-id: svn://localhost/HandBrake/trunk@1081 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/C#/frmDvdInfo.Designer.cs
win/C#/frmMain.Designer.cs
win/C#/frmMain.cs
win/C#/frmReadDVD.cs

index c80add3..88f5cf8 100644 (file)
@@ -93,9 +93,9 @@ namespace Handbrake
             this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.label1.Location = new System.Drawing.Point(59, 25);\r
             this.label1.Name = "label1";\r
-            this.label1.Size = new System.Drawing.Size(127, 13);\r
+            this.label1.Size = new System.Drawing.Size(154, 13);\r
             this.label1.TabIndex = 40;\r
-            this.label1.Text = "Media Information";\r
+            this.label1.Text = "Media Information Log";\r
             // \r
             // ToolTip\r
             // \r
index c67ef71..9ff14a3 100644 (file)
@@ -357,8 +357,7 @@ namespace Handbrake
             "Mpeg 4",\r
             "Xvid",\r
             "H.264",\r
-            "H.264 (iPod)",\r
-            "H.264 Baseline 1.3"});\r
+            "H.264 (iPod)"});\r
             this.drp_videoEncoder.Location = new System.Drawing.Point(99, 20);\r
             this.drp_videoEncoder.Name = "drp_videoEncoder";\r
             this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21);\r
index 0945873..6c6e348 100644 (file)
@@ -83,19 +83,25 @@ namespace Handbrake
             {\r
                 lblStatus.Text = "Updaing Presets ...";\r
                 Application.DoEvents();\r
-                updatePresets();\r
+                grabCLIPresets();\r
                 Thread.Sleep(200);\r
             }\r
 \r
+            // Load the presets for the preset box\r
+            updatePresets();\r
+\r
             // Now load the users default if required. (Will overide the above setting)\r
             if (Properties.Settings.Default.defaultSettings == "Checked")\r
             {\r
                 lblStatus.Text = "Loading User Default Settings...";\r
                 Application.DoEvents();\r
-                loadNormalPreset();\r
                 loadUserDefaults();\r
                 Thread.Sleep(100);\r
             }\r
+            else\r
+            {\r
+                loadNormalPreset();\r
+            }\r
 \r
             // Enable or disable tooltips\r
             if (Properties.Settings.Default.tooltipEnable == "Checked")\r
@@ -107,7 +113,11 @@ namespace Handbrake
             }\r
 \r
             // Hide the preset bar if required.\r
-            hidePresetBar();\r
+            if (Properties.Settings.Default.hidePresets == "Checked")\r
+            {\r
+                mnu_showPresets.Visible = true;\r
+                this.Width = 591;\r
+            }\r
 \r
             //Finished Loading\r
             lblStatus.Text = "Loading Complete!";\r
@@ -140,17 +150,6 @@ namespace Handbrake
             splash.Close(); // Then close.\r
         }\r
 \r
-        private void loadNormalPreset()\r
-        {\r
-            ListViewItem item = listview_presets.FindItemWithText("Normal");\r
-\r
-            if (item != null)\r
-            {\r
-                //listview_presets.SelectedItems.Clear();\r
-                item.Selected = true;\r
-            }\r
-        }\r
-\r
         private void loadUserDefaults()\r
         {\r
             string userDefaults = Properties.Settings.Default.defaultUserSettings;\r
@@ -167,19 +166,8 @@ namespace Handbrake
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show("Unable to load profile.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
-                MessageBox.Show(exc.ToString());\r
-            }\r
-        }\r
-\r
-        private void hidePresetBar()\r
-        {\r
-            if (Properties.Settings.Default.hidePresets == "Checked")\r
-            {\r
-                mnu_showPresets.Visible = true;\r
-                this.Width = 591;\r
+                MessageBox.Show("Unable to load user Default Settings. \n\n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
             }\r
-\r
         }\r
 \r
         #endregion\r
@@ -304,19 +292,14 @@ namespace Handbrake
         private void mnu_presetReset_Click(object sender, EventArgs e)\r
         {\r
             listview_presets.Items.Clear();\r
+            grabCLIPresets();\r
             updatePresets();\r
             MessageBox.Show("Presets have been updated", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
         }\r
 \r
         private void mnu_SelectDefault_Click(object sender, EventArgs e)\r
         {\r
-            ListViewItem item = listview_presets.FindItemWithText("Normal");\r
-\r
-            if (item != null)\r
-            {\r
-                listview_presets.SelectedItems.Clear();\r
-                item.Selected = true;\r
-            }\r
+            loadNormalPreset();\r
         }\r
 \r
         #endregion\r
@@ -378,7 +361,7 @@ namespace Handbrake
         #endregion\r
 \r
         // -------------------------------------------------------------- \r
-        // Buttons on the main Window\r
+        // Buttons on the main Window and items that require actions\r
         // --------------------------------------------------------------\r
 \r
         #region Buttons\r
@@ -393,30 +376,21 @@ namespace Handbrake
             {\r
                 DVD_Open.ShowDialog();\r
                 filename = DVD_Open.SelectedPath;\r
-                if (filename != "")\r
-                {\r
-                    Form frmRD = new frmReadDVD(filename, this, dvdInfoWindow);\r
-                    text_source.Text = filename;\r
-                    frmRD.ShowDialog();\r
-                }\r
             }\r
             else\r
             {\r
                 ISO_Open.ShowDialog();\r
                 filename = ISO_Open.FileName;\r
-                if (filename != "")\r
-                {\r
-                    Form frmRD = new frmReadDVD(filename, this, dvdInfoWindow);\r
-                    text_source.Text = filename;\r
-                    frmRD.ShowDialog();\r
-                }\r
             }\r
 \r
-            // Check if there was titles in the dvd title dropdown \r
-            if (filename == "")\r
+            if (filename != "")\r
             {\r
-                text_source.Text = "Click 'Browse' to continue";\r
+                Form frmRD = new frmReadDVD(filename, this, dvdInfoWindow);\r
+                text_source.Text = filename;\r
+                frmRD.ShowDialog();\r
             }\r
+            else\r
+                text_source.Text = "Click 'Browse' to continue";\r
 \r
             // If there are no titles in the dropdown menu then the scan has obviously failed. Display an error message explaining to the user.\r
             if (drp_dvdtitle.Items.Count == 0)\r
@@ -461,344 +435,117 @@ namespace Handbrake
             QueryEditorText.Text = "";\r
         }\r
 \r
-        private void btn_queue_Click(object sender, EventArgs e)\r
-        {\r
-\r
-            if (text_source.Text == "" || text_source.Text == "Click 'Browse' to continue" || text_destination.Text == "")\r
-                MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-            else\r
-            {\r
-                string query;\r
-                if (QueryEditorText.Text == "")\r
-                {\r
-                    query = GenerateTheQuery();\r
-                }\r
-                else\r
-                {\r
-                    query = QueryEditorText.Text;\r
-                }\r
-                queueWindow.list_queue.Items.Add(query);\r
-                queueWindow.Show();\r
-            }\r
-        }\r
-\r
         private void btn_copy_Click(object sender, EventArgs e)\r
         {\r
             if (QueryEditorText.Text != "")\r
                 Clipboard.SetText(QueryEditorText.Text, TextDataFormat.Text);\r
         }\r
 \r
-        private void showQueue()\r
-        {\r
-            queueWindow.Show();\r
-        }\r
-\r
         #endregion\r
 \r
-        // -------------------------------------------------------------- \r
-        // Main Window Preset System\r
-        // --------------------------------------------------------------\r
-\r
-        #region Preset System\r
+        #region frmMain Actions\r
 \r
-        // Import Current Presets\r
-        private void updatePresets()\r
+        private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            string[] presets = new string[17];\r
-            presets[0] = "Animation";\r
-            presets[1] = "AppleTV";\r
-            presets[2] = "Bedlam";\r
-            presets[3] = "Blind";\r
-            presets[4] = "Broke";\r
-            presets[5] = "Classic";\r
-            presets[6] = "Constant Quality Rate";\r
-            presets[7] = "Deux Six Quatre";\r
-            presets[8] = "Film";\r
-            presets[9] = "iPhone / iPod Touch";\r
-            presets[10] = "iPod High-Rez";\r
-            presets[11] = "iPod Low-Rez";\r
-            presets[12] = "Normal";\r
-            presets[13] = "PS3";\r
-            presets[14] = "PSP";\r
-            presets[15] = "QuickTime";\r
-            presets[16] = "Television";\r
-\r
-            ListViewItem preset_listview = new ListViewItem();\r
-            string[] presetList = new string[1];\r
+            // Reset some values on the form\r
+            lbl_Aspect.Text = "Select a Title";\r
+            lbl_RecomendedCrop.Text = "Select a Title";\r
+            drop_chapterStart.Items.Clear();\r
+            drop_chapterFinish.Items.Clear();\r
+            QueryEditorText.Text = "";\r
 \r
-            foreach (string preset in presets)\r
+            // If the dropdown is set to automatic nothing else needs to be done.\r
+            // Otheriwse if its not, title data has to be loased from parsing.\r
+            if (drp_dvdtitle.Text != "Automatic")\r
             {\r
-                presetList[0] = preset;\r
-                preset_listview = new ListViewItem(presetList);\r
-\r
-                // Now Fill Out List View with Items\r
-                listview_presets.Items.Add(preset_listview);\r
-            }\r
+                Parsing.Title selectedTitle = drp_dvdtitle.SelectedItem as Parsing.Title;\r
 \r
-            string appPath = Application.StartupPath.ToString() + "\\";\r
-            string strCmdLine = "cmd /c " + '"' + '"' + appPath + "HandBrakeCLI.exe" + '"' + " --preset-list >" + '"' + appPath + "presets.dat" + '"' + " 2>&1" + '"';\r
-            Process hbproc = Process.Start("CMD.exe", strCmdLine);\r
-            hbproc.WaitForExit();\r
-            hbproc.Dispose();\r
-            hbproc.Close();\r
+                // Set the Aspect Ratio\r
+                lbl_Aspect.Text = selectedTitle.AspectRatio.ToString();\r
 \r
-        }\r
+                // Set the Recommended Cropping values\r
+                lbl_RecomendedCrop.Text = string.Format("{0}/{1}/{2}/{3}", selectedTitle.AutoCropDimensions[0], selectedTitle.AutoCropDimensions[1], selectedTitle.AutoCropDimensions[2], selectedTitle.AutoCropDimensions[3]);\r
 \r
-        // Buttons\r
-        private void btn_setDefault_Click(object sender, EventArgs e)\r
-        {\r
-            String query = GenerateTheQuery();\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
+                // Populate the Start chapter Dropdown\r
+                drop_chapterStart.Items.Clear();\r
+                drop_chapterStart.Items.AddRange(selectedTitle.Chapters.ToArray());\r
+                if (drop_chapterStart.Items.Count > 0)\r
+                {\r
+                    drop_chapterStart.Text = drop_chapterStart.Items[0].ToString();\r
+                }\r
 \r
-        // Preset Selection\r
-        private void listview_presets_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
+                // Populate the Final Chapter Dropdown\r
+                drop_chapterFinish.Items.Clear();\r
+                drop_chapterFinish.Items.AddRange(selectedTitle.Chapters.ToArray());\r
+                if (drop_chapterFinish.Items.Count > 0)\r
+                {\r
+                    drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString();\r
+                }\r
 \r
-            string selectedPreset = null;\r
-            ListView.SelectedListViewItemCollection name = null;\r
-            name = listview_presets.SelectedItems;\r
+                // Populate the Audio Channels Dropdown\r
+                drp_audioChannels.Items.Clear();\r
+                drp_audioChannels.Items.Add("Automatic");\r
+                drp_audioChannels.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
+                if (drp_audioChannels.Items.Count > 0)\r
+                {\r
+                    drp_audioChannels.Text = drp_audioChannels.Items[0].ToString();\r
+                }\r
 \r
-            if (listview_presets.SelectedItems.Count != 0)\r
-                selectedPreset = name[0].SubItems[0].Text;\r
+                // Populate the Subtitles dropdown\r
+                drp_subtitle.Items.Clear();\r
+                drp_subtitle.Items.Add("None");\r
+                drp_subtitle.Items.AddRange(selectedTitle.Subtitles.ToArray());\r
+                if (drp_subtitle.Items.Count > 0)\r
+                {\r
+                    drp_subtitle.Text = drp_subtitle.Items[0].ToString();\r
+                }\r
+            }\r
+        }\r
 \r
-            try\r
+        private void drop_chapterStart_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            drop_chapterStart.BackColor = Color.White;\r
+            QueryEditorText.Text = "";\r
+            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
             {\r
-                string appPath = Application.StartupPath.ToString() + "\\";\r
-                StreamReader presetInput = new StreamReader(appPath + "presets.dat");\r
-\r
-                while (!presetInput.EndOfStream)\r
+                try\r
                 {\r
-                    if ((char)presetInput.Peek() == '+')\r
-                    {\r
-                        string preset = presetInput.ReadLine().Replace("+ ", "");\r
-                        Regex r = new Regex("(:  )"); // Split on hyphens. \r
-                        string[] presetName = r.Split(preset);\r
-\r
-                        if (selectedPreset == presetName[0])\r
-                        {\r
-                            // Need to disable anamorphic now, otherwise it may overide the width / height values later.\r
-                            CheckPixelRatio.CheckState = CheckState.Unchecked;\r
-\r
-                            // Send the query from the file to the Query Parser class\r
-                            Functions.QueryParser presetQuery = Functions.QueryParser.Parse(preset);\r
-\r
-                            // Now load the preset\r
-                            presetLoader(presetQuery, selectedPreset);\r
-                        }\r
+                    int chapterFinish = int.Parse(drop_chapterFinish.Text);\r
+                    int chapterStart = int.Parse(drop_chapterStart.Text);\r
 \r
-                    }\r
-                    else\r
+                    if (chapterFinish < chapterStart)\r
                     {\r
-                        presetInput.ReadLine();\r
+                        drop_chapterStart.BackColor = Color.LightCoral;\r
                     }\r
                 }\r
-            }\r
-            catch (Exception exc)\r
-            {\r
-                MessageBox.Show(exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                catch (Exception)\r
+                {\r
+                    drop_chapterStart.BackColor = Color.LightCoral;\r
+                }\r
             }\r
 \r
 \r
         }\r
 \r
-        #endregion\r
-\r
-        //---------------------------------------------------\r
-        // Encode / Cancel Buttons\r
-        // Encode Progress Text Handler\r
-        //---------------------------------------------------\r
-\r
-        #region Encode/CLI\r
-\r
-        Functions.CLI process = new Functions.CLI();\r
-\r
-        private void btn_encode_Click(object sender, EventArgs e)\r
+        private void drop_chapterFinish_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if (text_source.Text == "" || text_source.Text == "Click 'Browse' to continue" || text_destination.Text == "")\r
-                MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-            else\r
+            drop_chapterFinish.BackColor = Color.White;\r
+            QueryEditorText.Text = "";\r
+            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
             {\r
-                btn_eCancel.Enabled = true;\r
-                String query = "";\r
-                if (QueryEditorText.Text == "")\r
+                try\r
                 {\r
-                    query = GenerateTheQuery();\r
+                    int chapterFinish = int.Parse(drop_chapterFinish.Text);\r
+                    int chapterStart = int.Parse(drop_chapterStart.Text);\r
+\r
+                    if (chapterFinish < chapterStart)\r
+                    {\r
+                        drop_chapterFinish.BackColor = Color.LightCoral;\r
+                    }\r
                 }\r
-                else\r
+                catch (Exception)\r
                 {\r
-                    query = QueryEditorText.Text;\r
-                }\r
-\r
-                ThreadPool.QueueUserWorkItem(procMonitor, query);\r
-                lbl_encode.Visible = true;\r
-                lbl_encode.Text = "Encoding in Progress";\r
-            }\r
-        }\r
-\r
-        private void btn_eCancel_Click(object sender, EventArgs e)\r
-        {\r
-            process.killCLI();\r
-            process.setNull();\r
-            lbl_encode.Text = "Encoding Canceled";\r
-        }\r
-\r
-        [DllImport("user32.dll")]\r
-        public static extern void LockWorkStation();\r
-        [DllImport("user32.dll")]\r
-        public static extern int ExitWindowsEx(int uFlags, int dwReason);\r
-\r
-        private void procMonitor(object state)\r
-        {\r
-            // Make sure we are not already encoding and if we are then display an error.\r
-            if (hbProc != null)\r
-            {\r
-                MessageBox.Show("Handbrake is already encoding a video!", "Status", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
-            }\r
-            else\r
-            {\r
-                hbProc = process.runCli(this, (string)state, false, false, false, false);\r
-                hbProc.WaitForExit();\r
-\r
-                try\r
-                {\r
-                    /*\r
-                    //*****************************************************************************************\r
-                    // BUG!\r
-                    // When the below code is used and standard error is set to true, hbcli is outputing a\r
-                    // video stream which has mild corruption issues every few seconds.\r
-                    // Maybe an issue with the Parser cauing the CLI to hickup/pause?\r
-                    //*****************************************************************************************\r
-\r
-                    \r
-                    Parsing.Parser encode = new Parsing.Parser(hbProc.StandardOutput.BaseStream);\r
-                    encode.OnEncodeProgress += encode_OnEncodeProgress;\r
-                    while (!encode.EndOfStream)\r
-                    {\r
-                        encode.ReadLine();\r
-                    }\r
-\r
-                    hbProc.WaitForExit();\r
-                    process.closeCLI();\r
-                     */\r
-\r
-                }\r
-                catch (Exception exc)\r
-                {\r
-                    // Do nothing\r
-                    MessageBox.Show(exc.ToString());\r
-                }\r
-\r
-\r
-                setEncodeLabel();\r
-                hbProc = null;\r
-\r
-                // Do something whent he encode ends.\r
-                switch (Properties.Settings.Default.CompletionOption)\r
-                {\r
-                    case "Shutdown":\r
-                        System.Diagnostics.Process.Start("Shutdown", "-s -t 60");\r
-                        break;\r
-                    case "Log Off":\r
-                        ExitWindowsEx(0, 0);\r
-                        break;\r
-                    case "Suspend":\r
-                        Application.SetSuspendState(PowerState.Suspend, true, true);\r
-                        break;\r
-                    case "Hibernate":\r
-                        Application.SetSuspendState(PowerState.Hibernate, true, true);\r
-                        break;\r
-                    case "Lock System":\r
-                        LockWorkStation();\r
-                        break;\r
-                    case "Quit HandBrake":\r
-                        Application.Exit();\r
-                        break;\r
-                    default:\r
-                        break;\r
-                }\r
-            }\r
-        }\r
-\r
-        private delegate void UpdateUIHandler();\r
-\r
-        private void setEncodeLabel()\r
-        {\r
-            if (this.InvokeRequired)\r
-            {\r
-                this.BeginInvoke(new UpdateUIHandler(setEncodeLabel));\r
-                return;\r
-            }\r
-            lbl_encode.Text = "Encoding Finished";\r
-        }\r
-\r
-        private void encode_OnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete, float CurrentFps, float AverageFps, TimeSpan TimeRemaining)\r
-        {\r
-\r
-            if (this.InvokeRequired)\r
-            {\r
-                this.BeginInvoke(new Parsing.EncodeProgressEventHandler(encode_OnEncodeProgress),\r
-                    new object[] { Sender, CurrentTask, TaskCount, PercentComplete, CurrentFps, AverageFps, TimeRemaining });\r
-                return;\r
-            }\r
-            lbl_encode.Text = string.Format("Encode Progress: {0}%,       FPS: {1},       Avg FPS: {2},       Time Remaining: {3} ", PercentComplete, CurrentFps, AverageFps, TimeRemaining);\r
-        }\r
-\r
-        #endregion\r
-\r
-        //---------------------------------------------------\r
-        //  Items that require actions on frmMain\r
-        //---------------------------------------------------\r
-\r
-        #region frmMain Actions\r
-\r
-        private void drop_chapterStart_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            drop_chapterStart.BackColor = Color.White;\r
-            QueryEditorText.Text = "";\r
-            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
-            {\r
-                try\r
-                {\r
-                    int chapterFinish = int.Parse(drop_chapterFinish.Text);\r
-                    int chapterStart = int.Parse(drop_chapterStart.Text);\r
-\r
-                    if (chapterFinish < chapterStart)\r
-                    {\r
-                        drop_chapterStart.BackColor = Color.LightCoral;\r
-                    }\r
-                }\r
-                catch (Exception)\r
-                {\r
-                    drop_chapterStart.BackColor = Color.LightCoral;\r
-                }\r
-            }\r
-\r
-\r
-        }\r
-\r
-        private void drop_chapterFinish_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            drop_chapterFinish.BackColor = Color.White;\r
-            QueryEditorText.Text = "";\r
-            if ((drop_chapterFinish.Text != "Auto") && (drop_chapterStart.Text != "Auto"))\r
-            {\r
-                try\r
-                {\r
-                    int chapterFinish = int.Parse(drop_chapterFinish.Text);\r
-                    int chapterStart = int.Parse(drop_chapterStart.Text);\r
-\r
-                    if (chapterFinish < chapterStart)\r
-                    {\r
-                        drop_chapterFinish.BackColor = Color.LightCoral;\r
-                    }\r
-                }\r
-                catch (Exception)\r
-                {\r
-                    drop_chapterFinish.BackColor = Color.LightCoral;\r
+                    drop_chapterFinish.BackColor = Color.LightCoral;\r
                 }\r
             }\r
         }\r
@@ -928,10 +675,7 @@ namespace Handbrake
                 text_right.Enabled = false;\r
                 text_top.Enabled = false;\r
                 text_bottom.Enabled = false;\r
-                text_left.Text = "";\r
-                text_right.Text = "";\r
-                text_top.Text = "";\r
-                text_bottom.Text = "";\r
+\r
 \r
                 if (lbl_RecomendedCrop.Text != "Select a Title")\r
                 {\r
@@ -942,6 +686,13 @@ namespace Handbrake
                     text_top.Text = temp[0];\r
                     text_bottom.Text = temp[1];\r
                 }\r
+                else\r
+                {\r
+                    text_left.Text = "";\r
+                    text_right.Text = "";\r
+                    text_top.Text = "";\r
+                    text_bottom.Text = "";\r
+                }\r
             }\r
 \r
             if ((string)drp_crop.SelectedItem == "No Crop")\r
@@ -1008,11 +759,6 @@ namespace Handbrake
 \r
         private void drp_audioCodec_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-\r
-            //CLI Audio mixdown Names: mono stereo dpl1 dpl2 6ch\r
-\r
-            drp_audioMixDown.Items.Clear();\r
-\r
             if (drp_audioCodec.Text == "AAC")\r
             {\r
                 drp_audioMixDown.Items.Clear();\r
@@ -1035,162 +781,387 @@ namespace Handbrake
                 drp_audioBitrate.Items.Add("160");\r
 \r
             }\r
-            else\r
+            else\r
+            {\r
+                drp_audioMixDown.Items.Clear();\r
+                drp_audioMixDown.Items.Add("Stereo");\r
+                drp_audioMixDown.Items.Add("Dolby Surround");\r
+                drp_audioMixDown.Items.Add("Dolby Pro Logic II");\r
+\r
+                drp_audioBitrate.Items.Clear();\r
+                drp_audioBitrate.Items.Add("32");\r
+                drp_audioBitrate.Items.Add("40");\r
+                drp_audioBitrate.Items.Add("48");\r
+                drp_audioBitrate.Items.Add("56");\r
+                drp_audioBitrate.Items.Add("64");\r
+                drp_audioBitrate.Items.Add("80");\r
+                drp_audioBitrate.Items.Add("86");\r
+                drp_audioBitrate.Items.Add("112");\r
+                drp_audioBitrate.Items.Add("128");\r
+                drp_audioBitrate.Items.Add("160");\r
+                drp_audioBitrate.Items.Add("192");\r
+                drp_audioBitrate.Items.Add("224");\r
+                drp_audioBitrate.Items.Add("256");\r
+                drp_audioBitrate.Items.Add("320");\r
+            }\r
+        }\r
+\r
+        private void drp_audioMixDown_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            if ((drp_audioCodec.Text == "AAC") && (drp_audioMixDown.Text == "6 Channel Discrete"))\r
+            {\r
+                    drp_audioBitrate.Items.Clear();\r
+                    drp_audioBitrate.Items.Add("32");\r
+                    drp_audioBitrate.Items.Add("40");\r
+                    drp_audioBitrate.Items.Add("48");\r
+                    drp_audioBitrate.Items.Add("56");\r
+                    drp_audioBitrate.Items.Add("64");\r
+                    drp_audioBitrate.Items.Add("80");\r
+                    drp_audioBitrate.Items.Add("86");\r
+                    drp_audioBitrate.Items.Add("112");\r
+                    drp_audioBitrate.Items.Add("128");\r
+                    drp_audioBitrate.Items.Add("160");\r
+                    drp_audioBitrate.Items.Add("192");\r
+                    drp_audioBitrate.Items.Add("224");\r
+                    drp_audioBitrate.Items.Add("256");\r
+                    drp_audioBitrate.Items.Add("320");\r
+                    drp_audioBitrate.Items.Add("384");\r
+            }\r
+        }\r
+\r
+        private void Check_ChapterMarkers_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            if (Check_ChapterMarkers.Checked)\r
+            {\r
+                string destination = text_destination.Text;\r
+                destination = destination.Replace(".mp4", ".m4v");\r
+                text_destination.Text = destination;\r
+            }\r
+            else\r
+            {\r
+                string destination = text_destination.Text;\r
+                destination = destination.Replace(".m4v", ".mp4");\r
+                text_destination.Text = destination;\r
+            }\r
+        }\r
+\r
+        private void drp_videoEncoder_SelectedIndexChanged(object sender, EventArgs e)\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
+                check_turbo.CheckState = CheckState.Unchecked;\r
+                CheckCRF.CheckState = CheckState.Unchecked;\r
+                CheckCRF.Enabled = false;\r
+                check_turbo.Enabled = false;\r
+                h264Tab.Enabled = false;\r
+                rtf_h264advanced.Text = "";\r
+            }\r
+            else\r
+            {\r
+                CheckCRF.Enabled = true;\r
+                if (check_2PassEncode.CheckState == CheckState.Checked)\r
+                {\r
+                    check_turbo.Enabled = true;\r
+                }\r
+                h264Tab.Enabled = true;\r
+            }\r
+\r
+        }\r
+\r
+        #endregion\r
+\r
+        // -------------------------------------------------------------- \r
+        // Main Window Preset System\r
+        // --------------------------------------------------------------\r
+\r
+        #region Preset System\r
+\r
+        // Import Current Presets\r
+        private void updatePresets()\r
+        {\r
+            string[] presets = new string[17];\r
+            presets[0] = "Animation";\r
+            presets[1] = "AppleTV";\r
+            presets[2] = "Bedlam";\r
+            presets[3] = "Blind";\r
+            presets[4] = "Broke";\r
+            presets[5] = "Classic";\r
+            presets[6] = "Constant Quality Rate";\r
+            presets[7] = "Deux Six Quatre";\r
+            presets[8] = "Film";\r
+            presets[9] = "iPhone / iPod Touch";\r
+            presets[10] = "iPod High-Rez";\r
+            presets[11] = "iPod Low-Rez";\r
+            presets[12] = "Normal";\r
+            presets[13] = "PS3";\r
+            presets[14] = "PSP";\r
+            presets[15] = "QuickTime";\r
+            presets[16] = "Television";\r
+\r
+            ListViewItem preset_listview = new ListViewItem();\r
+            string[] presetList = new string[1];\r
+\r
+            foreach (string preset in presets)\r
+            {\r
+                presetList[0] = preset;\r
+                preset_listview = new ListViewItem(presetList);\r
+\r
+                // Now Fill Out List View with Items\r
+                listview_presets.Items.Add(preset_listview);\r
+            }\r
+        }\r
+\r
+        private void grabCLIPresets()\r
+        {\r
+            string appPath = Application.StartupPath.ToString() + "\\";\r
+            string strCmdLine = "cmd /c " + '"' + '"' + appPath + "HandBrakeCLI.exe" + '"' + " --preset-list >" + '"' + appPath + "presets.dat" + '"' + " 2>&1" + '"';\r
+            Process hbproc = Process.Start("CMD.exe", strCmdLine);\r
+            hbproc.WaitForExit();\r
+            hbproc.Dispose();\r
+            hbproc.Close();\r
+        }\r
+\r
+        // Function to select the default preset.\r
+        private void loadNormalPreset()\r
+        {\r
+            ListViewItem item = listview_presets.FindItemWithText("Normal");\r
+            \r
+            if (item != null)\r
+            {\r
+                item.Selected = true;\r
+            }\r
+        }\r
+\r
+        // Buttons\r
+        private void btn_setDefault_Click(object sender, EventArgs e)\r
+        {\r
+            String query = GenerateTheQuery();\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
+\r
+        // Preset Selection\r
+        private void listview_presets_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+\r
+            string selectedPreset = null;\r
+            ListView.SelectedListViewItemCollection name = null;\r
+            name = listview_presets.SelectedItems;\r
+\r
+            if (listview_presets.SelectedItems.Count != 0)\r
+                selectedPreset = name[0].SubItems[0].Text;\r
+\r
+            try\r
+            {\r
+                string appPath = Application.StartupPath.ToString() + "\\";\r
+                StreamReader presetInput = new StreamReader(appPath + "presets.dat");\r
+\r
+                while (!presetInput.EndOfStream)\r
+                {\r
+                    if ((char)presetInput.Peek() == '+')\r
+                    {\r
+                        string preset = presetInput.ReadLine().Replace("+ ", "");\r
+                        Regex r = new Regex("(:  )"); // Split on hyphens. \r
+                        string[] presetName = r.Split(preset);\r
+\r
+                        if (selectedPreset == presetName[0])\r
+                        {\r
+                            // Need to disable anamorphic now, otherwise it may overide the width / height values later.\r
+                            CheckPixelRatio.CheckState = CheckState.Unchecked;\r
+\r
+                            // Send the query from the file to the Query Parser class\r
+                            Functions.QueryParser presetQuery = Functions.QueryParser.Parse(preset);\r
+\r
+                            // Now load the preset\r
+                            presetLoader(presetQuery, selectedPreset);\r
+                        }\r
+\r
+                    }\r
+                    else\r
+                    {\r
+                        presetInput.ReadLine();\r
+                    }\r
+                }\r
+            }\r
+            catch (Exception exc)\r
             {\r
-                drp_audioMixDown.Items.Clear();\r
-                drp_audioMixDown.Items.Add("Stereo");\r
-                drp_audioMixDown.Items.Add("Dolby Surround");\r
-                drp_audioMixDown.Items.Add("Dolby Pro Logic II");\r
-\r
-                drp_audioBitrate.Items.Clear();\r
-                drp_audioBitrate.Items.Add("32");\r
-                drp_audioBitrate.Items.Add("40");\r
-                drp_audioBitrate.Items.Add("48");\r
-                drp_audioBitrate.Items.Add("56");\r
-                drp_audioBitrate.Items.Add("64");\r
-                drp_audioBitrate.Items.Add("80");\r
-                drp_audioBitrate.Items.Add("86");\r
-                drp_audioBitrate.Items.Add("112");\r
-                drp_audioBitrate.Items.Add("128");\r
-                drp_audioBitrate.Items.Add("160");\r
-                drp_audioBitrate.Items.Add("192");\r
-                drp_audioBitrate.Items.Add("224");\r
-                drp_audioBitrate.Items.Add("256");\r
-                drp_audioBitrate.Items.Add("320");\r
+                MessageBox.Show(exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
         }\r
 \r
-        private void drp_audioMixDown_SelectedIndexChanged(object sender, EventArgs e)\r
+        #endregion\r
+\r
+        //---------------------------------------------------\r
+        // Encode / Cancel Buttons\r
+        // Encode Progress Text Handler\r
+        //---------------------------------------------------\r
+\r
+        #region Encodeing and Queue\r
+\r
+        Functions.CLI process = new Functions.CLI();\r
+        private delegate void UpdateUIHandler();\r
+\r
+        [DllImport("user32.dll")]\r
+        public static extern void LockWorkStation();\r
+        [DllImport("user32.dll")]\r
+        public static extern int ExitWindowsEx(int uFlags, int dwReason);\r
+\r
+        private void btn_queue_Click(object sender, EventArgs e)\r
         {\r
-            if (drp_audioCodec.Text == "AAC")\r
+\r
+            if (text_source.Text == "" || text_source.Text == "Click 'Browse' to continue" || text_destination.Text == "")\r
+                MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            else\r
             {\r
-                if (drp_audioMixDown.Text == "6 Channel Discrete")\r
+                string query;\r
+                if (QueryEditorText.Text == "")\r
                 {\r
-\r
-                    drp_audioBitrate.Items.Clear();\r
-                    drp_audioBitrate.Items.Add("32");\r
-                    drp_audioBitrate.Items.Add("40");\r
-                    drp_audioBitrate.Items.Add("48");\r
-                    drp_audioBitrate.Items.Add("56");\r
-                    drp_audioBitrate.Items.Add("64");\r
-                    drp_audioBitrate.Items.Add("80");\r
-                    drp_audioBitrate.Items.Add("86");\r
-                    drp_audioBitrate.Items.Add("112");\r
-                    drp_audioBitrate.Items.Add("128");\r
-                    drp_audioBitrate.Items.Add("160");\r
-                    drp_audioBitrate.Items.Add("192");\r
-                    drp_audioBitrate.Items.Add("224");\r
-                    drp_audioBitrate.Items.Add("256");\r
-                    drp_audioBitrate.Items.Add("320");\r
-                    drp_audioBitrate.Items.Add("384");\r
+                    query = GenerateTheQuery();\r
                 }\r
+                else\r
+                {\r
+                    query = QueryEditorText.Text;\r
+                }\r
+                queueWindow.list_queue.Items.Add(query);\r
+                queueWindow.Show();\r
             }\r
         }\r
 \r
-        private void Check_ChapterMarkers_CheckedChanged(object sender, EventArgs e)\r
+        private void showQueue()\r
         {\r
-            if (Check_ChapterMarkers.Checked)\r
-            {\r
-                string destination = text_destination.Text;\r
-                destination = destination.Replace(".mp4", ".m4v");\r
-                text_destination.Text = destination;\r
-            }\r
-            else\r
-            {\r
-                string destination = text_destination.Text;\r
-                destination = destination.Replace(".m4v", ".mp4");\r
-                text_destination.Text = destination;\r
-            }\r
+            queueWindow.Show();\r
         }\r
 \r
-        private void drp_videoEncoder_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void btn_encode_Click(object sender, EventArgs e)\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
-                check_turbo.CheckState = CheckState.Unchecked;\r
-                CheckCRF.CheckState = CheckState.Unchecked;\r
-                CheckCRF.Enabled = false;\r
-                check_turbo.Enabled = false;\r
-                h264Tab.Enabled = false;\r
-                rtf_h264advanced.Text = "";\r
-            }\r
+            if (text_source.Text == "" || text_source.Text == "Click 'Browse' to continue" || text_destination.Text == "")\r
+                MessageBox.Show("No source OR destination selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             else\r
             {\r
-                CheckCRF.Enabled = true;\r
-                if (check_2PassEncode.CheckState.ToString() == "Checked")\r
+                btn_eCancel.Enabled = true;\r
+                String query = "";\r
+                if (QueryEditorText.Text == "")\r
                 {\r
-                    check_turbo.Enabled = true;\r
+                    query = GenerateTheQuery();\r
+                }\r
+                else\r
+                {\r
+                    query = QueryEditorText.Text;\r
                 }\r
-                h264Tab.Enabled = true;\r
-            }\r
 \r
+                ThreadPool.QueueUserWorkItem(procMonitor, query);\r
+                lbl_encode.Visible = true;\r
+                lbl_encode.Text = "Encoding in Progress";\r
+            }\r
         }\r
 \r
-        public void setStreamReader(Parsing.DVD dvd)\r
+        private void btn_eCancel_Click(object sender, EventArgs e)\r
         {\r
-            this.thisDVD = dvd;\r
+            process.killCLI();\r
+            process.setNull();\r
+            lbl_encode.Text = "Encoding Canceled";\r
         }\r
 \r
-        private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void procMonitor(object state)\r
         {\r
-            // Reset some values on the form\r
-            lbl_Aspect.Text = "Select a Title";\r
-            lbl_RecomendedCrop.Text = "Select a Title";\r
-            drop_chapterStart.Items.Clear();\r
-            drop_chapterFinish.Items.Clear();\r
-            QueryEditorText.Text = "";\r
-\r
-            // If the dropdown is set to automatic nothing else needs to be done.\r
-            // Otheriwse if its not, title data has to be loased from parsing.\r
-            if (drp_dvdtitle.Text != "Automatic")\r
+            // Make sure we are not already encoding and if we are then display an error.\r
+            if (hbProc != null)\r
             {\r
-                Parsing.Title selectedTitle = drp_dvdtitle.SelectedItem as Parsing.Title;\r
+                MessageBox.Show("Handbrake is already encoding a video!", "Status", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+            }\r
+            else\r
+            {\r
+                hbProc = process.runCli(this, (string)state, false, false, false, false);\r
+                hbProc.WaitForExit();\r
 \r
-                // Set the Aspect Ratio\r
-                lbl_Aspect.Text = selectedTitle.AspectRatio.ToString();\r
+                try\r
+                {\r
+                    /*\r
+                    //*****************************************************************************************\r
+                    // BUG!\r
+                    // When the below code is used and standard error is set to true, hbcli is outputing a\r
+                    // video stream which has mild corruption issues every few seconds.\r
+                    // Maybe an issue with the Parser cauing the CLI to hickup/pause?\r
+                    //*****************************************************************************************\r
 \r
-                // Set the Recommended Cropping values\r
-                lbl_RecomendedCrop.Text = string.Format("{0}/{1}/{2}/{3}", selectedTitle.AutoCropDimensions[0], selectedTitle.AutoCropDimensions[1], selectedTitle.AutoCropDimensions[2], selectedTitle.AutoCropDimensions[3]);\r
+                    \r
+                    Parsing.Parser encode = new Parsing.Parser(hbProc.StandardOutput.BaseStream);\r
+                    encode.OnEncodeProgress += encode_OnEncodeProgress;\r
+                    while (!encode.EndOfStream)\r
+                    {\r
+                        encode.ReadLine();\r
+                    }\r
 \r
-                // Populate the Start chapter Dropdown\r
-                drop_chapterStart.Items.Clear();\r
-                drop_chapterStart.Items.AddRange(selectedTitle.Chapters.ToArray());\r
-                if (drop_chapterStart.Items.Count > 0)\r
-                {\r
-                    drop_chapterStart.Text = drop_chapterStart.Items[0].ToString();\r
-                }\r
+                    hbProc.WaitForExit();\r
+                    process.closeCLI();\r
+                     */\r
 \r
-                // Populate the Final Chapter Dropdown\r
-                drop_chapterFinish.Items.Clear();\r
-                drop_chapterFinish.Items.AddRange(selectedTitle.Chapters.ToArray());\r
-                if (drop_chapterFinish.Items.Count > 0)\r
-                {\r
-                    drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString();\r
                 }\r
-\r
-                // Populate the Audio Channels Dropdown\r
-                drp_audioChannels.Items.Clear();\r
-                drp_audioChannels.Items.Add("Automatic");\r
-                drp_audioChannels.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                if (drp_audioChannels.Items.Count > 0)\r
+                catch (Exception exc)\r
                 {\r
-                    drp_audioChannels.Text = drp_audioChannels.Items[0].ToString();\r
+                    // Do nothing\r
+                    MessageBox.Show(exc.ToString());\r
                 }\r
 \r
-                // Populate the Subtitles dropdown\r
-                drp_subtitle.Items.Clear();\r
-                drp_subtitle.Items.Add("None");\r
-                drp_subtitle.Items.AddRange(selectedTitle.Subtitles.ToArray());\r
-                if (drp_subtitle.Items.Count > 0)\r
+\r
+                setEncodeLabel();\r
+                hbProc = null;\r
+\r
+                // Do something whent he encode ends.\r
+                switch (Properties.Settings.Default.CompletionOption)\r
                 {\r
-                    drp_subtitle.Text = drp_subtitle.Items[0].ToString();\r
+                    case "Shutdown":\r
+                        System.Diagnostics.Process.Start("Shutdown", "-s -t 60");\r
+                        break;\r
+                    case "Log Off":\r
+                        ExitWindowsEx(0, 0);\r
+                        break;\r
+                    case "Suspend":\r
+                        Application.SetSuspendState(PowerState.Suspend, true, true);\r
+                        break;\r
+                    case "Hibernate":\r
+                        Application.SetSuspendState(PowerState.Hibernate, true, true);\r
+                        break;\r
+                    case "Lock System":\r
+                        LockWorkStation();\r
+                        break;\r
+                    case "Quit HandBrake":\r
+                        Application.Exit();\r
+                        break;\r
+                    default:\r
+                        break;\r
                 }\r
             }\r
+        }   \r
+\r
+        private void setEncodeLabel()\r
+        {\r
+            if (this.InvokeRequired)\r
+            {\r
+                this.BeginInvoke(new UpdateUIHandler(setEncodeLabel));\r
+                return;\r
+            }\r
+            lbl_encode.Text = "Encoding Finished";\r
+        }\r
+\r
+        private void encode_OnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete, float CurrentFps, float AverageFps, TimeSpan TimeRemaining)\r
+        {\r
+\r
+            if (this.InvokeRequired)\r
+            {\r
+                this.BeginInvoke(new Parsing.EncodeProgressEventHandler(encode_OnEncodeProgress),\r
+                    new object[] { Sender, CurrentTask, TaskCount, PercentComplete, CurrentFps, AverageFps, TimeRemaining });\r
+                return;\r
+            }\r
+            lbl_encode.Text = string.Format("Encode Progress: {0}%,       FPS: {1},       Avg FPS: {2},       Time Remaining: {3} ", PercentComplete, CurrentFps, AverageFps, TimeRemaining);\r
         }\r
 \r
         #endregion\r
 \r
+\r
         //---------------------------------------------------\r
         //  Some Functions\r
         //  - Query Generation\r
@@ -1255,9 +1226,6 @@ namespace Handbrake
                 case "H.264":\r
                     videoEncoder = " -e x264";\r
                     break;\r
-                case "H.264 Baseline 1.3":\r
-                    videoEncoder = " -e x264b13";\r
-                    break;\r
                 case "H.264 (iPod)":\r
                     videoEncoder = " -e x264b30";\r
                     break;\r
@@ -1779,6 +1747,11 @@ namespace Handbrake
             }\r
         }\r
 \r
+        public void setStreamReader(Parsing.DVD dvd)\r
+        {\r
+            this.thisDVD = dvd;\r
+        }\r
+\r
         #endregion\r
 \r
 \r
index 516f746..49197ea 100644 (file)
@@ -90,7 +90,7 @@ namespace Handbrake
             try\r
             {\r
                 string appPath = Application.StartupPath.ToString()+ "\\";\r
-                string strCmdLine = "cmd /c " + '"' + '"' + appPath + "HandBrakeCLI.exe" + '"' + " -i " + '"' + inputFile + '"' + " -t0 >" + '"' + appPath + "dvdinfo.dat" + '"' + " 2>&1" + '"';\r
+                string strCmdLine = "cmd /c " + '"' + '"' + appPath + "HandBrakeCLI.exe" + '"' + " -i " + '"' + inputFile + '"' + " -t0 -v >" + '"' + appPath + "dvdinfo.dat" + '"' + " 2>&1" + '"';\r
                 Process hbproc = Process.Start("CMD.exe", strCmdLine);\r
                 hbproc.WaitForExit();\r
                 hbproc.Dispose();\r