- New Audio Panel (Query Parser, Query Generator, Preset Loader Functions all updated)

  This includes minor changes to the UI (e.g in the 'Output Settings' box)
- UI Improvments for Windows Vista and XP where non Classic theme is used.
- Activity Window can now view the log whilst an encode is going. (Doesn't live update... yet TODO!)
- Changed Radio File/Folder option for Source Browse to a single checkbox. Folder view by default.
  Check "File mode" for file selection dialog.
- Misc other UI changes
- Update checker won't display an error message during statup if one occurs whilst checking the update.
  The message was hidden behind the splash screen. This is now not a problem.

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

diff --git a/win/C#/Functions/CLI.cs b/win/C#/Functions/CLI.cs
index 2a956ac..c511953 100644 (file)
--- a/win/C#/Functions/CLI.cs
+++ b/win/C#/Functions/CLI.cs
@@ -1,7 +1,7 @@
 /*  CLI.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 0541fbb..c911b83 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -1,7 +1,7 @@
 /*  Common.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
@@ -43,11 +43,11 @@ namespace Handbrake.Functions
             catch (Exception exc)\r
             {\r
                 if (debug == true)\r
-                    MessageBox.Show("Unable to check for updates, Please try again later. \n" + exc.ToString(),"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                    MessageBox.Show("Unable to check for updates, Please try again later. \n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
                 return false;\r
             }\r
         }\r
-        \r
+\r
         /*\r
          * Function which generates the filename and path automatically based on the Source Name, DVD title and DVD Chapters\r
          */\r
@@ -86,7 +86,7 @@ namespace Handbrake.Functions
                         {\r
                             if (Properties.Settings.Default.autoNamePath.Trim() != "Click 'Browse' to set the default location")\r
                                 filePath = Properties.Settings.Default.autoNamePath + "\\";\r
-                        } \r
+                        }\r
                         mainWindow.text_destination.Text = filePath + source + "_T" + title + "_C" + cs + dash + cf + ".mp4";\r
                     }\r
                     else\r
@@ -163,12 +163,6 @@ namespace Handbrake.Functions
                 mainWindow.text_destination.Text = presetQuery.Destination;\r
 \r
             mainWindow.drp_videoEncoder.Text = presetQuery.VideoEncoder;\r
-            mainWindow.drp_audioCodec.Text = presetQuery.AudioEncoder;\r
-\r
-            if (presetQuery.AudioEncoder == "AAC + AC3")\r
-            {\r
-                mainWindow.text_destination.Text = mainWindow.text_destination.Text.Replace(".mp4", ".m4v");\r
-            }\r
 \r
             if (presetQuery.IpodAtom == true)\r
                 mainWindow.check_iPodAtom.CheckState = CheckState.Checked;\r
@@ -180,7 +174,7 @@ namespace Handbrake.Functions
             else\r
                 mainWindow.check_optimiseMP4.CheckState = CheckState.Unchecked;\r
 \r
-            #endregion  \r
+            #endregion\r
 \r
             // Picture Settings Tab\r
             #region Picture\r
@@ -275,7 +269,7 @@ namespace Handbrake.Functions
                 mainWindow.check_largeFile.BackColor = Color.Transparent;\r
             }\r
 \r
-            \r
+\r
 \r
             #endregion\r
 \r
@@ -294,11 +288,52 @@ namespace Handbrake.Functions
 \r
             // Audio Settings Tab\r
             #region Audio\r
-            mainWindow.drp_audioBitrate.Text = presetQuery.AudioBitrate;\r
-            mainWindow.drp_audioSampleRate.Text = presetQuery.AudioSampleBitrate;\r
-            mainWindow.drp_track1Audio.Text = presetQuery.AudioTrack1;\r
-            mainWindow.drp_track2Audio.Text = presetQuery.AudioTrack2;\r
-            mainWindow.drp_audioMixDown.Text = presetQuery.AudioTrackMix;\r
+            \r
+            if (presetQuery.AudioTrack1 == "")\r
+                mainWindow.drp_track1Audio.Text = "Automatic";\r
+            else\r
+                mainWindow.drp_track1Audio.Text = presetQuery.AudioTrack1;\r
+\r
+            if (presetQuery.AudioTrack2 == "None")\r
+            {\r
+                if (presetQuery.AudioEncoder2 != null)\r
+                {\r
+                    mainWindow.drp_track2Audio.SelectedIndex = 1;\r
+                    mainWindow.drp_audsr_2.Enabled = true;\r
+                    mainWindow.drp_audmix_2.Enabled = true;\r
+                    mainWindow.drp_audenc_2.Enabled = true;\r
+                    mainWindow.drp_audbit_2.Enabled = true;\r
+                }\r
+                else\r
+                {\r
+                    mainWindow.drp_track2Audio.SelectedIndex = 0;\r
+                    mainWindow.drp_audsr_2.Enabled = false;\r
+                    mainWindow.drp_audmix_2.Enabled = false;\r
+                    mainWindow.drp_audenc_2.Enabled = false;\r
+                    mainWindow.drp_audbit_2.Enabled = false;\r
+                }\r
+\r
+            }\r
+            else\r
+                mainWindow.drp_track2Audio.Text = presetQuery.AudioTrack2;\r
+\r
+            if (presetQuery.AudioEncoder1 != null)\r
+            mainWindow.drp_audenc_1.Text = presetQuery.AudioEncoder1;\r
+            mainWindow.drp_audenc_2.Text = presetQuery.AudioEncoder2;\r
+\r
+            if (presetQuery.AudioBitrate1 != null)\r
+            mainWindow.drp_audbit_1.Text = presetQuery.AudioBitrate1;\r
+            mainWindow.drp_audbit_2.Text = presetQuery.AudioBitrate2;\r
+\r
+            if (presetQuery.AudioSamplerate1 != null)\r
+            mainWindow.drp_audsr_1.Text = presetQuery.AudioSamplerate1;\r
+            mainWindow.drp_audsr_2.Text = presetQuery.AudioSamplerate2;\r
+\r
+            mainWindow.drp_audmix_1.Text = presetQuery.AudioTrackMix1;\r
+            mainWindow.drp_audmix_2.Text = presetQuery.AudioTrackMix2;\r
+\r
+            \r
+            \r
             mainWindow.drp_subtitle.Text = presetQuery.Subtitles;\r
 \r
             if (presetQuery.ForcedSubtitles == true)\r
@@ -373,7 +408,6 @@ namespace Handbrake.Functions
 \r
             string destination = mainWindow.text_destination.Text;\r
             string videoEncoder = mainWindow.drp_videoEncoder.Text;\r
-            string audioEncoder = mainWindow.drp_audioCodec.Text;\r
             string width = mainWindow.text_width.Text;\r
             string height = mainWindow.text_height.Text;\r
 \r
@@ -400,28 +434,6 @@ namespace Handbrake.Functions
                     break;\r
             }\r
 \r
-            switch (audioEncoder)\r
-            {\r
-                case "AAC":\r
-                    audioEncoder = " -E faac";\r
-                    break;\r
-                case "MP3":\r
-                    audioEncoder = " -E lame";\r
-                    break;\r
-                case "Vorbis":\r
-                    audioEncoder = " -E vorbis";\r
-                    break;\r
-                case "AC3":\r
-                    audioEncoder = " -E ac3";\r
-                    break;\r
-                case "AAC + AC3":\r
-                    audioEncoder = " -E aac+ac3";\r
-                    break;\r
-                default:\r
-                    audioEncoder = " -E faac";\r
-                    break;\r
-            }\r
-\r
             if (width != "")\r
                 width = " -w " + width;\r
 \r
@@ -436,7 +448,7 @@ namespace Handbrake.Functions
             }\r
 \r
 \r
-            string queryDestination = destination + videoEncoder + audioEncoder + width + height;\r
+            string queryDestination = destination + videoEncoder + width + height;\r
             #endregion\r
 \r
             // Picture Settings Tab\r
@@ -508,7 +520,7 @@ namespace Handbrake.Functions
                 pixelRatio = " -P ";\r
             else\r
                 pixelRatio = " ";\r
-                \r
+\r
 \r
             if (mainWindow.check_deblock.Checked)\r
                 deblock = " --deblock";\r
@@ -519,7 +531,7 @@ namespace Handbrake.Functions
             if (mainWindow.check_vfr.Checked)\r
                 vfr = " -V ";\r
 \r
-            \r
+\r
 \r
             string queryPictureSettings = cropOut + deinterlace + deblock + detelecine + vfr + grayscale + pixelRatio + lanamorphic;\r
             #endregion\r
@@ -610,25 +622,31 @@ namespace Handbrake.Functions
             // Audio Settings Tab\r
             #region Audio Settings Tab\r
 \r
-            string audioBitrate = mainWindow.drp_audioBitrate.Text;\r
-            string audioSampleRate = mainWindow.drp_audioSampleRate.Text;\r
-            string track1 = mainWindow.drp_track1Audio.Text;\r
-            string track2 = mainWindow.drp_track2Audio.Text;\r
+            // Used Varibles\r
+            string audioBitrate = "";\r
             string audioChannels = "";\r
-            string Mixdown = mainWindow.drp_audioMixDown.Text;\r
             string SixChannelAudio = "";\r
-            string subtitles = mainWindow.drp_subtitle.Text;\r
             string subScan = "";\r
             string forced = "";\r
             string drc = "";\r
+            string audioSampleRate = "";\r
+            string audioEncoder = "";\r
 \r
-            if (audioBitrate != "")\r
-                audioBitrate = " -B " + audioBitrate;\r
+            // Track 1\r
+            string track1 = mainWindow.drp_track1Audio.Text;\r
+            string vencoder1 = mainWindow.drp_audenc_1.Text;\r
+            string audioBitrate1 = mainWindow.drp_audbit_1.Text;\r
+            string audioSampleRate1 = mainWindow.drp_audsr_1.Text;\r
+            string Mixdown1 = mainWindow.drp_audmix_1.Text;\r
 \r
-            if (audioSampleRate != "")\r
-                audioSampleRate = " -R " + audioSampleRate;\r
+            // Track 2\r
+            string track2 = mainWindow.drp_track2Audio.Text;\r
+            string vencoder2 = mainWindow.drp_audenc_2.Text;\r
+            string audioBitrate2 = mainWindow.drp_audbit_2.Text;\r
+            string audioSampleRate2 = mainWindow.drp_audsr_2.Text;\r
+            string Mixdown2 = mainWindow.drp_audmix_2.Text;\r
 \r
-            // Audio Track 1\r
+            // Audio Track Selections\r
             if (track1 == "Automatic")\r
                 audioChannels = "";\r
             else if (track1 == "")\r
@@ -642,7 +660,6 @@ namespace Handbrake.Functions
                 audioChannels = " -a " + tempSub[0];\r
             }\r
 \r
-            // Audio Track 2\r
             if (audioChannels != "")\r
             {\r
                 if ((track2 != "") && (track2 != "None"))\r
@@ -662,38 +679,169 @@ namespace Handbrake.Functions
                 }\r
             }\r
 \r
+            // Audio Mixdown Selections\r
+            switch (Mixdown1)\r
+            {\r
+                case "Automatic":\r
+                    Mixdown1 = "";\r
+                    break;\r
+                case "Mono":\r
+                    Mixdown1 = "mono";\r
+                    break;\r
+                case "Stereo":\r
+                    Mixdown1 = "stereo";\r
+                    break;\r
+                case "Dolby Surround":\r
+                    Mixdown1 = "dpl1";\r
+                    break;\r
+                case "Dolby Pro Logic II":\r
+                    Mixdown1 = "dpl2";\r
+                    break;\r
+                case "6 Channel Discrete":\r
+                    Mixdown1 = "6ch";\r
+                    break;\r
+                default:\r
+                    Mixdown1 = "";\r
+                    break;\r
+            }\r
 \r
+            if (Mixdown1 != "")\r
+                SixChannelAudio = " -6 " + Mixdown1;\r
+            else\r
+            {\r
+                if (mainWindow.drp_track2Audio.Text == "None")\r
+                    SixChannelAudio = "";\r
+                else\r
+                {\r
+                    if (mainWindow.drp_audmix_2.Text == "Automatic")\r
+                        SixChannelAudio = "";\r
+                    else\r
+                        SixChannelAudio = " -6 dpl2";\r
+                }\r
+            }\r
 \r
-            switch (Mixdown)\r
+            switch (Mixdown2)\r
             {\r
                 case "Automatic":\r
-                    Mixdown = "";\r
+                    Mixdown2 = "";\r
                     break;\r
                 case "Mono":\r
-                    Mixdown = "mono";\r
+                    Mixdown2 = "mono";\r
                     break;\r
                 case "Stereo":\r
-                    Mixdown = "stereo";\r
+                    Mixdown2 = "stereo";\r
                     break;\r
                 case "Dolby Surround":\r
-                    Mixdown = "dpl1";\r
+                    Mixdown2 = "dpl1";\r
                     break;\r
                 case "Dolby Pro Logic II":\r
-                    Mixdown = "dpl2";\r
+                    Mixdown2 = "dpl2";\r
                     break;\r
                 case "6 Channel Discrete":\r
-                    Mixdown = "6ch";\r
+                    Mixdown2 = "6ch";\r
                     break;\r
                 default:\r
-                    Mixdown = "";\r
+                    Mixdown2 = "";\r
                     break;\r
             }\r
 \r
-            if (Mixdown != "")\r
-                SixChannelAudio = " -6 " + Mixdown;\r
-            else\r
-                SixChannelAudio = "";\r
+            if (Mixdown2 != "")\r
+            {\r
+                if (SixChannelAudio != "")\r
+                    SixChannelAudio = SixChannelAudio + "," + Mixdown2;\r
+                else\r
+                    SixChannelAudio = " -6 " + Mixdown2;\r
+            }\r
 \r
+            // Audio Encoder Selections\r
+            switch (mainWindow.drp_audenc_1.Text)\r
+            {\r
+                case "AAC":\r
+                    audioEncoder = " -E faac";\r
+                    break;\r
+                case "MP3":\r
+                    audioEncoder = " -E lame";\r
+                    break;\r
+                case "Vorbis":\r
+                    audioEncoder = " -E vorbis";\r
+                    break;\r
+                case "AC3":\r
+                    audioEncoder = " -E ac3";\r
+                    break;\r
+                case "AAC + AC3":\r
+                    audioEncoder = " -E aac+ac3";\r
+                    break;\r
+                default:\r
+                    break;\r
+            }\r
+\r
+            switch (mainWindow.drp_audenc_2.Text)\r
+            {\r
+                case "AAC":\r
+                    if (audioEncoder == "")\r
+                        audioEncoder = " -E faac";\r
+                    else\r
+                        audioEncoder = audioEncoder + ",faac";\r
+                    break;\r
+                case "MP3":\r
+                    if (audioEncoder == "")\r
+                        audioEncoder = " -E lame";\r
+                    else\r
+                        audioEncoder = audioEncoder + ",lame";\r
+                    break;\r
+                case "Vorbis":\r
+                    if (audioEncoder == "")\r
+                        audioEncoder = " -E vorbis";\r
+                    else\r
+                        audioEncoder = audioEncoder + ",vorbis";\r
+                    break;\r
+                case "AC3":\r
+                    if (audioEncoder == "")\r
+                        audioEncoder = " -E ac3";\r
+                    else\r
+                        audioEncoder = audioEncoder + ",ac3";\r
+                    break;\r
+                case "AAC + AC3":\r
+                    if (audioEncoder == "")\r
+                        audioEncoder = " -E aac+ac3";\r
+                    else\r
+                        audioEncoder = audioEncoder + ",aac+ac3";\r
+                    break;\r
+                default:\r
+                    break;\r
+            }\r
+\r
+            // Audio BitRate Selections\r
+            if (audioBitrate1 != "")\r
+                audioBitrate = " -B " + audioBitrate1;\r
+\r
+            if (audioBitrate2 != "")\r
+            {\r
+                if (audioBitrate == "")\r
+                    audioBitrate = " -B " + audioBitrate2;\r
+                else\r
+                    audioBitrate = audioBitrate + "," + audioBitrate2;\r
+            }\r
+\r
+            // Audio SampleRate Selections\r
+            if (audioSampleRate1 != "")\r
+                audioSampleRate = " -R " + audioSampleRate1;\r
+\r
+            if (audioSampleRate2 != "")\r
+            {\r
+                if (audioSampleRate == "")\r
+                    audioSampleRate = " -R " + audioSampleRate2;\r
+                else\r
+                    audioSampleRate = audioSampleRate + "," + audioSampleRate2;\r
+            }\r
+\r
+            //Dynamic Range Compression (expects a float but a double is used for ease)\r
+            double value = mainWindow.slider_drc.Value / 10.0;\r
+            value++;\r
+            drc = " -D " + value;\r
+\r
+            // Subtitles\r
+            string subtitles = mainWindow.drp_subtitle.Text;\r
             if (subtitles == "None")\r
                 subtitles = "";\r
             else if (subtitles == "")\r
@@ -713,12 +861,8 @@ namespace Handbrake.Functions
             if (mainWindow.check_forced.Checked)\r
                 forced = " -F ";\r
 \r
-            //Dynamic Range Compression (expects a float but a double is used for ease)\r
-            double value = mainWindow.slider_drc.Value / 10.0;\r
-            value++;\r
-            drc = " -D " + value;\r
 \r
-            string queryAudioSettings = audioBitrate + audioSampleRate + drc + audioChannels + SixChannelAudio + subScan + subtitles + forced;\r
+            string queryAudioSettings = audioChannels + SixChannelAudio + audioEncoder + audioBitrate + audioSampleRate + drc + subScan + subtitles + forced;\r
             #endregion\r
 \r
             // Chapter Markers Tab\r
@@ -773,7 +917,7 @@ namespace Handbrake.Functions
                 {\r
                     string path = Path.Combine(Path.GetTempPath(), "chapters.csv");\r
                     ChapterMarkers = " --markers=" + "\"" + path + "\"";\r
-                } \r
+                }\r
             }\r
 \r
             string chapter_markers = ChapterMarkers;\r
@@ -856,7 +1000,7 @@ namespace Handbrake.Functions
         private Boolean chapterCSVSave(frmMain mainWindow, string file_path_name)\r
         {\r
             try\r
-            {      \r
+            {\r
                 StringBuilder csv = new StringBuilder();\r
 \r
                 foreach (DataGridViewRow row in mainWindow.data_chpt.Rows)\r

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index d83c1dc..6a39e02 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -1,7 +1,7 @@
 /*  QueryParser.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
@@ -111,20 +111,7 @@ namespace Handbrake.Functions
                 return this.q_videoEncoder;\r
             }\r
         }\r
-\r
-        private string q_audioEncoder;\r
-        /// <summary>\r
-        /// Returns an String\r
-        /// The Audio Encoder used.\r
-        /// </summary>\r
-        public string AudioEncoder\r
-        {\r
-            get\r
-            {\r
-                return this.q_audioEncoder;\r
-            }\r
-        }\r
-#endregion\r
+        #endregion\r
 \r
         #region Picture Settings\r
         private int q_videoWidth;\r
@@ -439,63 +426,125 @@ namespace Handbrake.Functions
         #endregion\r
 \r
         #region Audio Settings\r
-        private string q_audioBitrate;\r
+        private string q_audioTrack1;\r
         /// <summary>\r
-        /// Returns a string with the audio bitrate\r
+        /// Returns a string with the First selected Audio track\r
         /// </summary>\r
-        public string AudioBitrate\r
+        public string AudioTrack1\r
         {\r
             get\r
             {\r
-                return this.q_audioBitrate;\r
+                return this.q_audioTrack1;\r
             }\r
         }\r
 \r
-        private string q_audioSamplerate;\r
+        private string q_audioTrack2;\r
         /// <summary>\r
-        /// Returns a string with the audio sample rate\r
+        /// Returns a string with the First selected Audio track\r
         /// </summary>\r
-        public string AudioSampleBitrate\r
+        public string AudioTrack2\r
         {\r
             get\r
             {\r
-                return this.q_audioSamplerate;\r
+                return this.q_audioTrack2;\r
             }\r
         }\r
 \r
-        private string q_audioTrack1;\r
+        private string q_audioTrackMix1;\r
         /// <summary>\r
-        /// Returns a string with the First selected Audio track\r
+        /// Returns a string with the First selected Audio track Mix\r
         /// </summary>\r
-        public string AudioTrack1\r
+        public string AudioTrackMix1\r
         {\r
             get\r
             {\r
-                return this.q_audioTrack1;\r
+                return this.q_audioTrackMix1;\r
             }\r
         }\r
 \r
-        private string q_audioTrack2;\r
+        private string q_audioTrackMix2;\r
         /// <summary>\r
-        /// Returns a string with the First selected Audio track\r
+        /// Returns a string with the First selected Audio track Mix\r
         /// </summary>\r
-        public string AudioTrack2\r
+        public string AudioTrackMix2\r
         {\r
             get\r
             {\r
-                return this.q_audioTrack2;\r
+                return this.q_audioTrackMix2;\r
             }\r
         }\r
 \r
-        private string q_audioTrackMix;\r
+        private string q_audioEncoder1;\r
         /// <summary>\r
-        /// Returns a string with the First selected Audio track Mix\r
+        /// Returns an String\r
+        /// The Audio Encoder used.\r
         /// </summary>\r
-        public string AudioTrackMix\r
+        public string AudioEncoder1\r
         {\r
             get\r
             {\r
-                return this.q_audioTrackMix;\r
+                return this.q_audioEncoder1;\r
+            }\r
+        }\r
+\r
+        private string q_audioEncoder2;\r
+        /// <summary>\r
+        /// Returns an String\r
+        /// The Audio Encoder used.\r
+        /// </summary>\r
+        public string AudioEncoder2\r
+        {\r
+            get\r
+            {\r
+                return this.q_audioEncoder2;\r
+            }\r
+        }\r
+\r
+        private string q_audioBitrate1;\r
+        /// <summary>\r
+        /// Returns a string with the audio bitrate\r
+        /// </summary>\r
+        public string AudioBitrate1\r
+        {\r
+            get\r
+            {\r
+                return this.q_audioBitrate1;\r
+            }\r
+        }\r
+\r
+        private string q_audioBitrate2;\r
+        /// <summary>\r
+        /// Returns a string with the audio bitrate\r
+        /// </summary>\r
+        public string AudioBitrate2\r
+        {\r
+            get\r
+            {\r
+                return this.q_audioBitrate2;\r
+            }\r
+        }\r
+\r
+        private string q_audioSamplerate1;\r
+        /// <summary>\r
+        /// Returns a string with the audio sample rate\r
+        /// </summary>\r
+        public string AudioSamplerate1\r
+        {\r
+            get\r
+            {\r
+                return this.q_audioSamplerate1;\r
+            }\r
+        }\r
+\r
+        private string q_audioSamplerate2;\r
+        /// <summary>\r
+        /// Returns a string with the audio sample rate\r
+        /// </summary>\r
+        public string AudioSamplerate2\r
+        {\r
+            get\r
+            {\r
+                return this.q_audioSamplerate2;\r
             }\r
         }\r
 \r
@@ -511,7 +560,6 @@ namespace Handbrake.Functions
             }\r
         }\r
 \r
-\r
         private string q_subtitles;\r
         /// <summary>\r
         /// Returns a string with the selected subtitle track\r
@@ -570,7 +618,7 @@ namespace Handbrake.Functions
         {\r
             QueryParser thisQuery = new QueryParser();\r
 \r
-            #region reg exp\r
+            #region Regular Expressions\r
             //Source\r
             Regex r1 = new Regex(@"(-i)(?:\s\"")([a-zA-Z0-9:\\\s\.]+)(?:\"")");\r
             Match source = r1.Match(input.Replace('"', '\"'));\r
@@ -581,12 +629,11 @@ namespace Handbrake.Functions
             //Destination\r
             Regex r2 = new Regex(@"(-o)(?:\s\"")([a-zA-Z0-9_\-:\\\s\.]+)(?:\"")");\r
             Match destination = r2.Match(input.Replace('"', '\"'));\r
-            Match width = Regex.Match(input, @"-w ([0-9]*)");\r
-            Match height = Regex.Match(input, @"-l ([0-9]*)");\r
             Match videoEncoder = Regex.Match(input, @"-e ([a-zA-Z0-9]*)");\r
-            Match audioEncoder = Regex.Match(input, @"-E ([a-zA-Z0-9+]*)");\r
 \r
             //Picture Settings Tab\r
+            Match width = Regex.Match(input, @"-w ([0-9]*)");\r
+            Match height = Regex.Match(input, @"-l ([0-9]*)");\r
             Match deinterlace = Regex.Match(input, @"--deinterlace=([a-z]*)");\r
             Match denoise = Regex.Match(input, @"--denoise=([a-z]*)");\r
             Match deblock = Regex.Match(input, @"--deblock");\r
@@ -610,15 +657,21 @@ namespace Handbrake.Functions
             Match optimizeMP4 = Regex.Match(input, @"-O");\r
 \r
             //Audio Settings Tab\r
-            Match subtitles = Regex.Match(input, @"-s ([0-9a-zA-Z]*)");\r
-            Match subScan = Regex.Match(input, @"-U");\r
-            Match audioBitrate = Regex.Match(input, @"-B ([0-9]*)");\r
-            Match audioSampleRate = Regex.Match(input, @"-R ([0-9.]*)");\r
-            Match audioChannelsMix = Regex.Match(input, @"-6 ([0-9a-z0-9]*)");  // 1 -6 dpl2 // Broken\r
             Match audioTrack1 = Regex.Match(input, @"-a ([0-9]*)");\r
             Match audioTrack2 = Regex.Match(input, @"-a ([0-9]*),([0-9]*)");\r
-            Match forcedSubtitles = Regex.Match(input, @"-F");\r
+            Match audioTrack1Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*)");  \r
+            Match audioTrack2Mix = Regex.Match(input, @"-6 ([0-9a-z0-9]*),([0-9a-z0-9]*)");  \r
+            Match audioEncoder1 = Regex.Match(input, @"-E ([a-zA-Z0-9+]*)");\r
+            Match audioEncoder2 = Regex.Match(input, @"-E ([a-zA-Z0-9+]*),([a-zA-Z0-9+]*)");\r
+            Match audioBitrate1 = Regex.Match(input, @"-B ([0-9]*)");\r
+            Match audioBitrate2 = Regex.Match(input, @"-B ([0-9]*),([0-9]*)");\r
+            Match audioSampleRate1 = Regex.Match(input, @"-R ([0-9.]*)");\r
+            Match audioSampleRate2 = Regex.Match(input, @"-R ([0-9.]*),([0-9.]*)");\r
+\r
             Match drc = Regex.Match(input, @"-D ([0-9.]*)");\r
+            Match subtitles = Regex.Match(input, @"-s ([0-9a-zA-Z]*)");\r
+            Match subScan = Regex.Match(input, @"-U");\r
+            Match forcedSubtitles = Regex.Match(input, @"-F");\r
 \r
             //H264 Tab\r
             Match x264 = Regex.Match(input, @"-x ([,a-zA-Z0-9=:-]*)");\r
@@ -627,11 +680,12 @@ namespace Handbrake.Functions
             Match verbose = Regex.Match(input, @"-v");\r
             #endregion\r
 \r
+            #region Set Varibles\r
             try\r
             {\r
-                //\r
-                // Source\r
-                //\r
+                /*\r
+                 * Source\r
+                 */\r
                 #region Source Tab\r
 \r
                 thisQuery.q_source = source.ToString().Replace("-i ", "").Replace("\"", "");\r
@@ -657,9 +711,9 @@ namespace Handbrake.Functions
 \r
                 #endregion\r
 \r
-                //\r
-                // Destination\r
-                //\r
+                /*\r
+                 * Destination\r
+                 */\r
                 #region Destination\r
                 thisQuery.q_destination = destination.ToString().Replace("-o ", "").Replace("\"", "");\r
 \r
@@ -690,30 +744,12 @@ namespace Handbrake.Functions
                 }\r
                 thisQuery.q_videoEncoder = videoEncoderConvertion;\r
 \r
-                audioEncoderConvertion = audioEncoder.ToString().Replace("-E ", "");\r
-                switch (audioEncoderConvertion)\r
-                {\r
-                    case "faac":\r
-                        audioEncoderConvertion = "AAC";\r
-                        break;\r
-                    case "lame":\r
-                        audioEncoderConvertion = "MP3";\r
-                        break;\r
-                    case "vorbis":\r
-                        audioEncoderConvertion = "Vorbis";\r
-                        break;\r
-                    case "ac3":\r
-                        audioEncoderConvertion = "AC3";\r
-                        break;\r
-                    case "aac+ac3":\r
-                        audioEncoderConvertion = "AAC + AC3";\r
-                        break;\r
-                    default:\r
-                        audioEncoderConvertion = "AAC";\r
-                        break;\r
-                }\r
-                thisQuery.q_audioEncoder = audioEncoderConvertion;\r
+                #endregion\r
 \r
+                /*\r
+                 * Picture Settings Tab\r
+                 */\r
+                #region Picture Tab\r
 \r
                 if (width.Success != false)\r
                     thisQuery.q_videoWidth = int.Parse(width.ToString().Replace("-w ", ""));\r
@@ -721,12 +757,7 @@ namespace Handbrake.Functions
                 if (height.Success != false)\r
                     thisQuery.q_videoHeight = int.Parse(height.ToString().Replace("-l ", ""));\r
 \r
-                #endregion\r
 \r
-                //\r
-                //Picture Settings Tab\r
-                //\r
-                #region Picture Tab\r
                 if (crop.Success != false)\r
                 {\r
                     thisQuery.q_cropValues = crop.ToString().Replace("--crop ", "");\r
@@ -791,9 +822,9 @@ namespace Handbrake.Functions
 \r
                 #endregion\r
 \r
-                //\r
-                //Video Settings Tab\r
-                //\r
+                /*\r
+                 * Video Settings Tab\r
+                 */\r
                 #region Video\r
                 thisQuery.q_grayscale = grayscale.Success;\r
                 thisQuery.q_twoPass = twoPass.Success;\r
@@ -802,7 +833,7 @@ namespace Handbrake.Functions
                 if (videoFramerate.Success != false)\r
                     thisQuery.q_videoFramerate = videoFramerate.ToString().Replace("-r ", "");\r
                 else\r
-                    thisQuery.q_videoFramerate = "Automatic";\r
+                    thisQuery.q_videoFramerate = "Same as source";\r
 \r
                 if (videoBitrate.Success != false)\r
                     thisQuery.q_avgBitrate = videoBitrate.ToString().Replace("-b ", "");\r
@@ -821,16 +852,11 @@ namespace Handbrake.Functions
 \r
                 #endregion\r
 \r
-                //\r
-                //Audio Settings Tab\r
-                //\r
+                /*\r
+                 * Audio Settings Tab\r
+                 */\r
                 #region Audio\r
-                if (audioBitrate.Success != false)\r
-                    thisQuery.q_audioBitrate = audioBitrate.ToString().Replace("-B ", "");\r
-\r
-                if (audioSampleRate.Success != false)\r
-                    thisQuery.q_audioSamplerate = audioSampleRate.ToString().Replace("-R ", "");\r
-\r
+                // Tracks\r
                 if (audioTrack1.Success != false)\r
                     thisQuery.q_audioTrack1 = audioTrack1.ToString().Replace("-a ", "");\r
                 else\r
@@ -843,33 +869,145 @@ namespace Handbrake.Functions
                 }\r
                 else\r
                     thisQuery.q_audioTrack2 = "None";\r
+    \r
+                // Mixdowns\r
+                thisQuery.q_audioTrackMix1 = "Automatic";\r
+                if (audioTrack1Mix.Success != false)\r
+                {\r
+                    switch (audioTrack1Mix.ToString().Replace("-6 ", "").Replace(" ", ""))\r
+                    {\r
+                        case "mono":\r
+                            thisQuery.q_audioTrackMix1 = "Mono";\r
+                            break;\r
+                        case "stereo":\r
+                            thisQuery.q_audioTrackMix1 = "Stereo";\r
+                            break;\r
+                        case "dpl1":\r
+                            thisQuery.q_audioTrackMix1 = "Dolby Surround";\r
+                            break;\r
+                        case "dpl2":\r
+                            thisQuery.q_audioTrackMix1 = "Dolby Pro Logic II";\r
+                            break;\r
+                        case "6ch":\r
+                            thisQuery.q_audioTrackMix1 = "6 Channel Discrete";\r
+                            break;\r
+                        default:\r
+                            thisQuery.q_audioTrackMix1 = "Automatic";\r
+                            break;\r
+                    }\r
+                }\r
 \r
-                thisQuery.q_audioTrackMix = "Automatic";\r
-                if (audioChannelsMix.Success != false)\r
+                thisQuery.q_audioTrackMix2 = "Automatic";\r
+                if (audioTrack2Mix.Success != false)\r
                 {\r
-                    switch (audioChannelsMix.ToString().Replace("-6 ", "").Replace(" ", ""))\r
+                    string[] audio2mix = audioTrack2Mix.ToString().Split(',');\r
+                    audio2mix[1] = audio2mix[1].Trim();\r
+                    switch (audio2mix[1])\r
                     {\r
                         case "mono":\r
-                            thisQuery.q_audioTrackMix = "Mono";\r
+                            thisQuery.q_audioTrackMix2 = "Mono";\r
                             break;\r
                         case "stereo":\r
-                            thisQuery.q_audioTrackMix = "Stereo";\r
+                            thisQuery.q_audioTrackMix2 = "Stereo";\r
                             break;\r
                         case "dpl1":\r
-                            thisQuery.q_audioTrackMix = "Dolby Surround";\r
+                            thisQuery.q_audioTrackMix2 = "Dolby Surround";\r
                             break;\r
                         case "dpl2":\r
-                            thisQuery.q_audioTrackMix = "Dolby Pro Logic II";\r
+                            thisQuery.q_audioTrackMix2 = "Dolby Pro Logic II";\r
                             break;\r
                         case "6ch":\r
-                            thisQuery.q_audioTrackMix = "6 Channel Discrete";\r
+                            thisQuery.q_audioTrackMix2 = "6 Channel Discrete";\r
                             break;\r
                         default:\r
-                            thisQuery.q_audioTrackMix = "Automatic";\r
+                            thisQuery.q_audioTrackMix2 = "Automatic";\r
                             break;\r
                     }\r
+                }\r
 \r
+                // Audio Encoders\r
+                if (audioEncoder1.Success != false)\r
+                {\r
+                    audioEncoderConvertion = audioEncoder1.ToString().Replace("-E ", "");\r
+                    switch (audioEncoderConvertion)\r
+                    {\r
+                        case "faac":\r
+                            audioEncoderConvertion = "AAC";\r
+                            break;\r
+                        case "lame":\r
+                            audioEncoderConvertion = "MP3";\r
+                            break;\r
+                        case "vorbis":\r
+                            audioEncoderConvertion = "Vorbis";\r
+                            break;\r
+                        case "ac3":\r
+                            audioEncoderConvertion = "AC3";\r
+                            break;\r
+                        case "aac+ac3":\r
+                            audioEncoderConvertion = "AAC + AC3";\r
+                            break;\r
+                        default:\r
+                            audioEncoderConvertion = "AAC";\r
+                            break;\r
+                    }\r
+                    thisQuery.q_audioEncoder1 = audioEncoderConvertion;\r
                 }\r
+\r
+                if (audioEncoder2.Success != false)\r
+                {\r
+                    audioEncoderConvertion = audioEncoder2.ToString().Replace("-E ", "");\r
+                    string[] audio2enc = audioEncoder2.ToString().Split(',');\r
+                    audio2enc[1] = audio2enc[1].Trim();\r
+                    switch (audio2enc[1])\r
+                    {\r
+                        case "faac":\r
+                            audioEncoderConvertion = "AAC";\r
+                            break;\r
+                        case "lame":\r
+                            audioEncoderConvertion = "MP3";\r
+                            break;\r
+                        case "vorbis":\r
+                            audioEncoderConvertion = "Vorbis";\r
+                            break;\r
+                        case "ac3":\r
+                            audioEncoderConvertion = "AC3";\r
+                            break;\r
+                        case "aac+ac3":\r
+                            audioEncoderConvertion = "AAC + AC3";\r
+                            break;\r
+                        default:\r
+                            audioEncoderConvertion = "AAC";\r
+                            break;\r
+                    }\r
+                    thisQuery.q_audioEncoder2 = audioEncoderConvertion;\r
+                }\r
+\r
+\r
+                // Audio Bitrate\r
+                if (audioBitrate1.Success != false)\r
+                    thisQuery.q_audioBitrate1 = audioBitrate1.ToString().Replace("-B ", "").Trim();\r
+                else\r
+                    thisQuery.q_audioBitrate1 = "";\r
+\r
+                if (audioBitrate2.Success != false)\r
+                {\r
+                    string[] audioBitrateSelect = audioBitrate2.ToString().Split(',');\r
+                    thisQuery.q_audioBitrate2 = audioBitrateSelect[1].Trim();\r
+                }\r
+                else\r
+                    thisQuery.q_audioBitrate2 = "";\r
+\r
+                // Audio Sample Rate\r
+                if (audioSampleRate1.Success != false)\r
+                    thisQuery.q_audioSamplerate1 = audioSampleRate1.ToString().Replace("-R ", "").Trim();\r
+\r
+                if (audioSampleRate2.Success != false)\r
+                {\r
+                    string[] audioSRSelect = audioSampleRate2.ToString().Split(',');\r
+                    thisQuery.q_audioSamplerate2 = audioSRSelect[1].Trim();\r
+                }\r
+\r
+\r
                 if (subtitles.Success != false)\r
                     thisQuery.q_subtitles = subtitles.ToString().Replace("-s ", "");\r
                 else\r
@@ -888,9 +1026,7 @@ namespace Handbrake.Functions
                     thisQuery.q_drc = drcValue;\r
                 }\r
                 else\r
-                {\r
                     thisQuery.q_drc = 0;\r
-                }\r
 \r
                 thisQuery.q_forcedSubs = forcedSubtitles.Success;\r
 \r
@@ -918,6 +1054,7 @@ namespace Handbrake.Functions
             {\r
                 MessageBox.Show("An error has occured in the Query Parser. Please report this error on the forum in the 'Windows' support section. \n\n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
+            #endregion\r
 \r
             return thisQuery;\r
         }\r

diff --git a/win/C#/Functions/RssReader.cs b/win/C#/Functions/RssReader.cs
index c8aa5a7..44fffd2 100644 (file)
--- a/win/C#/Functions/RssReader.cs
+++ b/win/C#/Functions/RssReader.cs
@@ -1,7 +1,7 @@
 /*  RssReader.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/Functions/x264Panel.cs b/win/C#/Functions/x264Panel.cs
index b781a8a..e585a39 100644 (file)
--- a/win/C#/Functions/x264Panel.cs
+++ b/win/C#/Functions/x264Panel.cs
@@ -307,7 +307,7 @@ namespace Handbrake.Functions
         }\r
         \r
 \r
-        #region Some Private Functions used by the above Public Functions\r
+        // Some Private Functions used by the above Public Functions\r
         /*\r
          * Used by on_x264_WidgetChange()\r
          * Called when the current x264 option string contains multiple (or a single) item(s) in it seperated by :\r
@@ -920,7 +920,6 @@ namespace Handbrake.Functions
                 }\r
             }\r
         }\r
-\r
         /*\r
          * Take a single option and standardize it. Returns as a String\r
          * Input: String. - Single X264 Option. Name only\r
@@ -996,7 +995,5 @@ namespace Handbrake.Functions
 \r
             return cleanOptNameString;\r
         }\r
-\r
-        #endregion\r
     }\r
 }\r

diff --git a/win/C#/Parsing/AudioTrack.cs b/win/C#/Parsing/AudioTrack.cs
index 22a5a1b..e41cae2 100644 (file)
--- a/win/C#/Parsing/AudioTrack.cs
+++ b/win/C#/Parsing/AudioTrack.cs
@@ -1,7 +1,7 @@
 /*  AudioTrack.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/Parsing/Chapter.cs b/win/C#/Parsing/Chapter.cs
index 0131916..5269675 100644 (file)
--- a/win/C#/Parsing/Chapter.cs
+++ b/win/C#/Parsing/Chapter.cs
@@ -1,7 +1,7 @@
 /*  Chapter.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/Parsing/DVD.cs b/win/C#/Parsing/DVD.cs
index c110c3e..2ce2110 100644 (file)
--- a/win/C#/Parsing/DVD.cs
+++ b/win/C#/Parsing/DVD.cs
@@ -1,7 +1,7 @@
 /*  DVD.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/Parsing/Parser.cs b/win/C#/Parsing/Parser.cs
index 00dcedb..86e8a50 100644 (file)
--- a/win/C#/Parsing/Parser.cs
+++ b/win/C#/Parsing/Parser.cs
@@ -1,7 +1,7 @@
 /*  Parser.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/Parsing/Subtitle.cs b/win/C#/Parsing/Subtitle.cs
index cf45c02..c5a722b 100644 (file)
--- a/win/C#/Parsing/Subtitle.cs
+++ b/win/C#/Parsing/Subtitle.cs
@@ -1,7 +1,7 @@
 /*  Subtitle.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs
index 55babd2..7582daa 100644 (file)
--- a/win/C#/Parsing/Title.cs
+++ b/win/C#/Parsing/Title.cs
@@ -1,7 +1,7 @@
 /*  Title.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index fb5507c..6051957 100644 (file)
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -1,7 +1,7 @@
 /*  Program.cs \r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs
index 9cf7ca1..d64a9ef 100644 (file)
--- a/win/C#/Properties/AssemblyInfo.cs
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 /*  AssemblyInfo.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System.Reflection;\r

diff --git a/win/C#/frmAbout.Designer.cs b/win/C#/frmAbout.Designer.cs
index 90240bc..2a3054a 100644 (file)
--- a/win/C#/frmAbout.Designer.cs
+++ b/win/C#/frmAbout.Designer.cs
@@ -1,7 +1,7 @@
 /*  frmAbout.Designer.cs \r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r

diff --git a/win/C#/frmAbout.cs b/win/C#/frmAbout.cs
index b2df57e..1657cad 100644 (file)
--- a/win/C#/frmAbout.cs
+++ b/win/C#/frmAbout.cs
@@ -1,7 +1,7 @@
 /*  frmAbout.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
@@ -31,7 +31,7 @@ namespace Handbrake
 \r
         private void label_credits_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)\r
         {\r
-            Process.Start("http://handbrake.m0k.org/trac/wiki/x264Options");\r
+            Process.Start("http://handbrake.frtrac/wiki/x264Options");\r
         }\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmActivityWindow.Designer.cs b/win/C#/frmActivityWindow.Designer.cs
index abddecf..a8cdfc8 100644 (file)
--- a/win/C#/frmActivityWindow.Designer.cs
+++ b/win/C#/frmActivityWindow.Designer.cs
@@ -1,7 +1,7 @@
 /*  frmDvdInfo.Designer.cs \r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index dc8b7a6..031b8d7 100644 (file)
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -1,7 +1,7 @@
 /*  frmActivityWindow.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
@@ -42,15 +42,21 @@ namespace Handbrake
         {\r
             try\r
             {\r
-                string dvdInfoPath = Path.Combine(Path.GetTempPath(), "hb_encode_log.dat");\r
-                FileStream f = System.IO.File.Open(dvdInfoPath, FileMode.Open, FileAccess.Read, FileShare.Read);\r
-\r
-                StreamReader sr = new StreamReader(f);\r
+                // hb_encode_log.dat is the primary log file. Since .NET can't read this file whilst the CLI is outputing to it,\r
+                // we'll need to make a copy of it.\r
+                string logFile = Path.Combine(Path.GetTempPath(), "hb_encode_log.dat");\r
+                string logFile2 = Path.Combine(Path.GetTempPath(), "hb_encode_log_AppReadable.dat");\r
 \r
+                // Make sure the application readable log file does not already exist. FileCopy fill fail if it does.\r
+                if (File.Exists(logFile2))\r
+                    File.Delete(logFile2);\r
 \r
+                // Copy the log file.\r
+                File.Copy(logFile, logFile2);\r
 \r
+                // Begin processing the log file.\r
+                StreamReader sr = new StreamReader(logFile2);\r
                 string line = sr.ReadLine();\r
-\r
                 while (line != null)\r
                 {\r
                     this.rtf_actLog.AppendText(line + System.Environment.NewLine);\r
@@ -58,10 +64,10 @@ namespace Handbrake
                 }\r
                 sr.Close();\r
             }\r
-            catch (Exception)\r
+            catch (Exception exc)\r
             {\r
                 rtf_actLog.Clear();\r
-                rtf_actLog.Text = "Please wait until the encode has finished to view the log.";\r
+                rtf_actLog.Text = "Please wait until the encode has finished to view the log. \n\n\n" + exc.ToString();\r
             }\r
         }\r
 \r

diff --git a/win/C#/frmAddPreset.Designer.cs b/win/C#/frmAddPreset.Designer.cs
index 61884d5..46b3db6 100644 (file)
--- a/win/C#/frmAddPreset.Designer.cs
+++ b/win/C#/frmAddPreset.Designer.cs
@@ -1,4 +1,10 @@
-namespace Handbrake\r
+/*  AudioTrack.cs $\r
+       \r
+          This file is part of the HandBrake source code.\r
+          Homepage: <http://handbrake.fr>.\r
+          It may be used under the terms of the GNU General Public License. */\r
+\r
+namespace Handbrake\r
 {\r
     partial class frmAddPreset\r
     {\r

diff --git a/win/C#/frmAddPreset.cs b/win/C#/frmAddPreset.cs
index cf9b513..2beabc5 100644 (file)
--- a/win/C#/frmAddPreset.cs
+++ b/win/C#/frmAddPreset.cs
@@ -1,4 +1,10 @@
-using System;\r
+/*  frmAddPreset.cs $\r
+       \r
+          This file is part of the HandBrake source code.\r
+          Homepage: <http://handbrake.fr>.\r
+          It may be used under the terms of the GNU General Public License. */\r
+\r
+using System;\r
 using System.Collections.Generic;\r
 using System.ComponentModel;\r
 using System.Data;\r

diff --git a/win/C#/frmDownload.Designer.cs b/win/C#/frmDownload.Designer.cs
index 003c615..368d3d3 100644 (file)
--- a/win/C#/frmDownload.Designer.cs
+++ b/win/C#/frmDownload.Designer.cs
@@ -1,7 +1,7 @@
 /*  frmDownload.Designer.cs \r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r

diff --git a/win/C#/frmDownload.cs b/win/C#/frmDownload.cs
index 73020ff..62f58ac 100644 (file)
--- a/win/C#/frmDownload.cs
+++ b/win/C#/frmDownload.cs
@@ -1,7 +1,7 @@
 /*  frmDownload.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/frmDvdInfo.Designer.cs b/win/C#/frmDvdInfo.Designer.cs
index e9c3bea..0766bcb 100644 (file)
--- a/win/C#/frmDvdInfo.Designer.cs
+++ b/win/C#/frmDvdInfo.Designer.cs
@@ -1,7 +1,7 @@
 /*  frmDvdInfo.Designer.cs \r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r

diff --git a/win/C#/frmDvdInfo.cs b/win/C#/frmDvdInfo.cs
index b37a12a..44c45ce 100644 (file)
--- a/win/C#/frmDvdInfo.cs
+++ b/win/C#/frmDvdInfo.cs
@@ -1,7 +1,7 @@
 /*  frmDvdInfo.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 589b51f..aa338cc 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -1,7 +1,7 @@
 /*  frmMain.Designer.cs \r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r
@@ -44,15 +44,11 @@ namespace Handbrake
             this.drop_chapterFinish = new System.Windows.Forms.ComboBox();\r
             this.drop_chapterStart = new System.Windows.Forms.ComboBox();\r
             this.drp_dvdtitle = new System.Windows.Forms.ComboBox();\r
-            this.RadioISO = new System.Windows.Forms.RadioButton();\r
             this.text_source = new System.Windows.Forms.TextBox();\r
             this.text_destination = new System.Windows.Forms.TextBox();\r
-            this.btn_Browse = new System.Windows.Forms.Button();\r
-            this.btn_destBrowse = new System.Windows.Forms.Button();\r
             this.drp_videoEncoder = new System.Windows.Forms.ComboBox();\r
-            this.drp_audioCodec = new System.Windows.Forms.ComboBox();\r
-            this.drp_audioBitrate = new System.Windows.Forms.ComboBox();\r
-            this.drp_audioSampleRate = new System.Windows.Forms.ComboBox();\r
+            this.drp_audbit_1 = new System.Windows.Forms.ComboBox();\r
+            this.drp_audsr_1 = new System.Windows.Forms.ComboBox();\r
             this.check_largeFile = new System.Windows.Forms.CheckBox();\r
             this.check_turbo = new System.Windows.Forms.CheckBox();\r
             this.drp_videoFramerate = new System.Windows.Forms.ComboBox();\r
@@ -61,10 +57,9 @@ namespace Handbrake
             this.text_bitrate = new System.Windows.Forms.TextBox();\r
             this.drp_subtitle = new System.Windows.Forms.ComboBox();\r
             this.btn_setDefault = new System.Windows.Forms.Button();\r
-            this.drp_audioMixDown = new System.Windows.Forms.ComboBox();\r
+            this.drp_audmix_1 = new System.Windows.Forms.ComboBox();\r
             this.text_height = new System.Windows.Forms.TextBox();\r
             this.text_width = new System.Windows.Forms.TextBox();\r
-            this.RadioDVD = new System.Windows.Forms.RadioButton();\r
             this.check_optimiseMP4 = new System.Windows.Forms.CheckBox();\r
             this.check_iPodAtom = new System.Windows.Forms.CheckBox();\r
             this.data_chpt = new System.Windows.Forms.DataGridView();\r
@@ -72,6 +67,12 @@ namespace Handbrake
             this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.btn_addPreset = new System.Windows.Forms.Button();\r
             this.btn_removePreset = new System.Windows.Forms.Button();\r
+            this.drp_audmix_2 = new System.Windows.Forms.ComboBox();\r
+            this.drp_audenc_1 = new System.Windows.Forms.ComboBox();\r
+            this.drp_audenc_2 = new System.Windows.Forms.ComboBox();\r
+            this.drp_audbit_2 = new System.Windows.Forms.ComboBox();\r
+            this.drp_audsr_2 = new System.Windows.Forms.ComboBox();\r
+            this.check_fileMode = new System.Windows.Forms.CheckBox();\r
             this.slider_drc = new System.Windows.Forms.TrackBar();\r
             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();\r
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
@@ -103,21 +104,29 @@ namespace Handbrake
             this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();\r
             this.frmMainMenu = new System.Windows.Forms.MenuStrip();\r
             this.GroupBox1 = new System.Windows.Forms.GroupBox();\r
+            this.btn_Browse = new System.Windows.Forms.Button();\r
             this.Label13 = new System.Windows.Forms.Label();\r
             this.Label17 = new System.Windows.Forms.Label();\r
             this.Label9 = new System.Windows.Forms.Label();\r
             this.Label10 = new System.Windows.Forms.Label();\r
             this.groupBox_output = new System.Windows.Forms.GroupBox();\r
             this.Label47 = new System.Windows.Forms.Label();\r
-            this.Label12 = new System.Windows.Forms.Label();\r
             this.Label3 = new System.Windows.Forms.Label();\r
             this.lbl_encode = new System.Windows.Forms.Label();\r
             this.TabPage2 = new System.Windows.Forms.TabPage();\r
+            this.groupBox5 = new System.Windows.Forms.GroupBox();\r
+            this.groupBox4 = new System.Windows.Forms.GroupBox();\r
+            this.groupBox3 = new System.Windows.Forms.GroupBox();\r
+            this.label12 = new System.Windows.Forms.Label();\r
+            this.label68 = new System.Windows.Forms.Label();\r
+            this.label67 = new System.Windows.Forms.Label();\r
+            this.label66 = new System.Windows.Forms.Label();\r
+            this.label65 = new System.Windows.Forms.Label();\r
+            this.label14 = new System.Windows.Forms.Label();\r
             this.label30 = new System.Windows.Forms.Label();\r
             this.label29 = new System.Windows.Forms.Label();\r
             this.label23 = new System.Windows.Forms.Label();\r
             this.label7 = new System.Windows.Forms.Label();\r
-            this.label21 = new System.Windows.Forms.Label();\r
             this.lbl_drc = new System.Windows.Forms.Label();\r
             this.check_forced = new System.Windows.Forms.CheckBox();\r
             this.drp_track2Audio = new System.Windows.Forms.ComboBox();\r
@@ -126,11 +135,8 @@ namespace Handbrake
             this.Label19 = new System.Windows.Forms.Label();\r
             this.Label20 = new System.Windows.Forms.Label();\r
             this.drp_track1Audio = new System.Windows.Forms.ComboBox();\r
-            this.Label14 = new System.Windows.Forms.Label();\r
             this.Label5 = new System.Windows.Forms.Label();\r
-            this.Label16 = new System.Windows.Forms.Label();\r
             this.Label32 = new System.Windows.Forms.Label();\r
-            this.Label18 = new System.Windows.Forms.Label();\r
             this.TabPage3 = new System.Windows.Forms.TabPage();\r
             this.label25 = new System.Windows.Forms.Label();\r
             this.lbl_vfr = new System.Windows.Forms.Label();\r
@@ -174,7 +180,6 @@ namespace Handbrake
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.advancedOptions = new System.Windows.Forms.TabControl();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
-            this.lbl_warn_chapt = new System.Windows.Forms.Label();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.h264Tab = new System.Windows.Forms.TabPage();\r
             this.label43 = new System.Windows.Forms.Label();\r
@@ -228,6 +233,7 @@ namespace Handbrake
             this.label33 = new System.Windows.Forms.Label();\r
             this.rtf_query = new System.Windows.Forms.RichTextBox();\r
             this.groupBox_dest = new System.Windows.Forms.GroupBox();\r
+            this.btn_destBrowse = new System.Windows.Forms.Button();\r
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.treeView_presets = new System.Windows.Forms.TreeView();\r
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();\r
@@ -238,6 +244,8 @@ namespace Handbrake
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
             this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
             this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.button1 = new System.Windows.Forms.Button();\r
+            this.button2 = new System.Windows.Forms.Button();\r
             Label38 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.data_chpt)).BeginInit();\r
@@ -284,13 +292,15 @@ namespace Handbrake
             // ToolTip\r
             // \r
             this.ToolTip.Active = false;\r
+            this.ToolTip.AutomaticDelay = 1000;\r
+            this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
             // \r
             // drop_chapterFinish\r
             // \r
             this.drop_chapterFinish.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_chapterFinish.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drop_chapterFinish.FormattingEnabled = true;\r
-            this.drop_chapterFinish.Location = new System.Drawing.Point(408, 55);\r
+            this.drop_chapterFinish.Location = new System.Drawing.Point(397, 52);\r
             this.drop_chapterFinish.Name = "drop_chapterFinish";\r
             this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterFinish.TabIndex = 10;\r
@@ -303,7 +313,7 @@ namespace Handbrake
             this.drop_chapterStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_chapterStart.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drop_chapterStart.FormattingEnabled = true;\r
-            this.drop_chapterStart.Location = new System.Drawing.Point(295, 55);\r
+            this.drop_chapterStart.Location = new System.Drawing.Point(295, 52);\r
             this.drop_chapterStart.Name = "drop_chapterStart";\r
             this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterStart.TabIndex = 9;\r
@@ -327,18 +337,6 @@ namespace Handbrake
             this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);\r
             this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);\r
             // \r
-            // RadioISO\r
-            // \r
-            this.RadioISO.AutoSize = true;\r
-            this.RadioISO.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.RadioISO.Location = new System.Drawing.Point(606, 46);\r
-            this.RadioISO.Name = "RadioISO";\r
-            this.RadioISO.Size = new System.Drawing.Size(44, 17);\r
-            this.RadioISO.TabIndex = 4;\r
-            this.RadioISO.Text = "File";\r
-            this.ToolTip.SetToolTip(this.RadioISO, "For selecting: ISO, TS, MPG");\r
-            this.RadioISO.UseVisualStyleBackColor = true;\r
-            // \r
             // text_source\r
             // \r
             this.text_source.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
@@ -356,43 +354,11 @@ namespace Handbrake
             this.text_destination.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.text_destination.Location = new System.Drawing.Point(99, 19);\r
             this.text_destination.Name = "text_destination";\r
-            this.text_destination.Size = new System.Drawing.Size(429, 21);\r
+            this.text_destination.Size = new System.Drawing.Size(493, 21);\r
             this.text_destination.TabIndex = 1;\r
             this.ToolTip.SetToolTip(this.text_destination, "Location where the encoded file will be saved.");\r
             this.text_destination.TextChanged += new System.EventHandler(this.text_destination_TextChanged);\r
             // \r
-            // btn_Browse\r
-            // \r
-            this.btn_Browse.BackColor = System.Drawing.Color.Transparent;\r
-            this.btn_Browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_Browse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_Browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_Browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_Browse.Location = new System.Drawing.Point(540, 19);\r
-            this.btn_Browse.Name = "btn_Browse";\r
-            this.btn_Browse.Size = new System.Drawing.Size(78, 22);\r
-            this.btn_Browse.TabIndex = 5;\r
-            this.btn_Browse.Text = "Browse";\r
-            this.ToolTip.SetToolTip(this.btn_Browse, "Step 1 - Select a Source. This can be either a DVD or ts/mpg/iso file");\r
-            this.btn_Browse.UseVisualStyleBackColor = false;\r
-            this.btn_Browse.Click += new System.EventHandler(this.btn_Browse_Click);\r
-            // \r
-            // btn_destBrowse\r
-            // \r
-            this.btn_destBrowse.BackColor = System.Drawing.Color.Transparent;\r
-            this.btn_destBrowse.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_destBrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_destBrowse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_destBrowse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_destBrowse.Location = new System.Drawing.Point(540, 18);\r
-            this.btn_destBrowse.Name = "btn_destBrowse";\r
-            this.btn_destBrowse.Size = new System.Drawing.Size(83, 22);\r
-            this.btn_destBrowse.TabIndex = 2;\r
-            this.btn_destBrowse.Text = "Browse";\r
-            this.ToolTip.SetToolTip(this.btn_destBrowse, " Select a location to save your encoded file.");\r
-            this.btn_destBrowse.UseVisualStyleBackColor = false;\r
-            this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click);\r
-            // \r
             // drp_videoEncoder\r
             // \r
             this.drp_videoEncoder.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
@@ -403,38 +369,19 @@ namespace Handbrake
             "Mpeg 4",\r
             "Xvid",\r
             "H.264"});\r
-            this.drp_videoEncoder.Location = new System.Drawing.Point(99, 23);\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
             this.drp_videoEncoder.TabIndex = 1;\r
             this.ToolTip.SetToolTip(this.drp_videoEncoder, "Select a video encoder");\r
             this.drp_videoEncoder.SelectedIndexChanged += new System.EventHandler(this.drp_videoEncoder_SelectedIndexChanged);\r
             // \r
-            // drp_audioCodec\r
+            // drp_audbit_1\r
             // \r
-            this.drp_audioCodec.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drp_audioCodec.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_audioCodec.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audioCodec.FormattingEnabled = true;\r
-            this.drp_audioCodec.Items.AddRange(new object[] {\r
-            "AAC",\r
-            "MP3",\r
-            "Vorbis",\r
-            "AC3",\r
-            "AAC + AC3"});\r
-            this.drp_audioCodec.Location = new System.Drawing.Point(370, 22);\r
-            this.drp_audioCodec.Name = "drp_audioCodec";\r
-            this.drp_audioCodec.Size = new System.Drawing.Size(111, 21);\r
-            this.drp_audioCodec.TabIndex = 3;\r
-            this.ToolTip.SetToolTip(this.drp_audioCodec, "Select an audio encoder.");\r
-            this.drp_audioCodec.SelectedIndexChanged += new System.EventHandler(this.drp_audioCodec_SelectedIndexChanged);\r
-            // \r
-            // drp_audioBitrate\r
-            // \r
-            this.drp_audioBitrate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_audioBitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audioBitrate.FormattingEnabled = true;\r
-            this.drp_audioBitrate.Items.AddRange(new object[] {\r
+            this.drp_audbit_1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audbit_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audbit_1.FormattingEnabled = true;\r
+            this.drp_audbit_1.Items.AddRange(new object[] {\r
             "32",\r
             "40",\r
             "48",\r
@@ -445,43 +392,43 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audioBitrate.Location = new System.Drawing.Point(139, 120);\r
-            this.drp_audioBitrate.Name = "drp_audioBitrate";\r
-            this.drp_audioBitrate.Size = new System.Drawing.Size(101, 21);\r
-            this.drp_audioBitrate.TabIndex = 5;\r
-            this.drp_audioBitrate.Text = "128";\r
-            this.ToolTip.SetToolTip(this.drp_audioBitrate, "Set the Audio Bit-Rate");\r
-            // \r
-            // drp_audioSampleRate\r
-            // \r
-            this.drp_audioSampleRate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_audioSampleRate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audioSampleRate.FormattingEnabled = true;\r
-            this.drp_audioSampleRate.Items.AddRange(new object[] {\r
+            this.drp_audbit_1.Location = new System.Drawing.Point(589, 49);\r
+            this.drp_audbit_1.Name = "drp_audbit_1";\r
+            this.drp_audbit_1.Size = new System.Drawing.Size(93, 20);\r
+            this.drp_audbit_1.TabIndex = 9;\r
+            this.drp_audbit_1.Text = "160";\r
+            this.ToolTip.SetToolTip(this.drp_audbit_1, "Set the Audio Bit-Rate");\r
+            // \r
+            // drp_audsr_1\r
+            // \r
+            this.drp_audsr_1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audsr_1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audsr_1.FormattingEnabled = true;\r
+            this.drp_audsr_1.Items.AddRange(new object[] {\r
             "48",\r
             "44.1",\r
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audioSampleRate.Location = new System.Drawing.Point(139, 154);\r
-            this.drp_audioSampleRate.Name = "drp_audioSampleRate";\r
-            this.drp_audioSampleRate.Size = new System.Drawing.Size(101, 21);\r
-            this.drp_audioSampleRate.TabIndex = 6;\r
-            this.drp_audioSampleRate.Text = "44.1";\r
-            this.ToolTip.SetToolTip(this.drp_audioSampleRate, "Set the Audio Sample Rate");\r
+            this.drp_audsr_1.Location = new System.Drawing.Point(499, 49);\r
+            this.drp_audsr_1.Name = "drp_audsr_1";\r
+            this.drp_audsr_1.Size = new System.Drawing.Size(64, 21);\r
+            this.drp_audsr_1.TabIndex = 11;\r
+            this.drp_audsr_1.Text = "48";\r
+            this.ToolTip.SetToolTip(this.drp_audsr_1, "Set the Audio Sample Rate");\r
             // \r
             // check_largeFile\r
             // \r
             this.check_largeFile.AutoSize = true;\r
             this.check_largeFile.BackColor = System.Drawing.Color.Transparent;\r
             this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_largeFile.Location = new System.Drawing.Point(16, 174);\r
+            this.check_largeFile.Location = new System.Drawing.Point(261, 22);\r
             this.check_largeFile.Name = "check_largeFile";\r
             this.check_largeFile.Size = new System.Drawing.Size(82, 17);\r
             this.check_largeFile.TabIndex = 4;\r
             this.check_largeFile.Text = "64Bit MP4";\r
-            this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of MP4 files greater than 4GB.\r\nWarning: Breaks iPod, Apple TV Ve" +\r
-                    "rsion 1 and PS3 compatibility.");\r
+            this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of MP4 files greater than 4GB.\r\nWarning: Breaks iPod, Apple TV (V" +\r
+                    "ersion 1 only) and PS3 compatibility.\r\nRequires .mp4/.m4v file extension");\r
             this.check_largeFile.UseVisualStyleBackColor = false;\r
             this.check_largeFile.CheckedChanged += new System.EventHandler(this.check_largeFile_CheckedChanged);\r
             // \r
@@ -562,22 +509,20 @@ namespace Handbrake
             this.drp_subtitle.Items.AddRange(new object[] {\r
             "None",\r
             "Autoselect"});\r
-            this.drp_subtitle.Location = new System.Drawing.Point(113, 213);\r
+            this.drp_subtitle.Location = new System.Drawing.Point(393, 221);\r
             this.drp_subtitle.Name = "drp_subtitle";\r
-            this.drp_subtitle.Size = new System.Drawing.Size(213, 21);\r
-            this.drp_subtitle.TabIndex = 12;\r
+            this.drp_subtitle.Size = new System.Drawing.Size(138, 21);\r
+            this.drp_subtitle.TabIndex = 27;\r
             this.drp_subtitle.Text = "None";\r
             this.ToolTip.SetToolTip(this.drp_subtitle, resources.GetString("drp_subtitle.ToolTip"));\r
             this.drp_subtitle.SelectedIndexChanged += new System.EventHandler(this.drp_subtitle_SelectedIndexChanged);\r
             // \r
             // btn_setDefault\r
             // \r
-            this.btn_setDefault.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_setDefault.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_setDefault.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_setDefault.Location = new System.Drawing.Point(115, 483);\r
+            this.btn_setDefault.Location = new System.Drawing.Point(115, 502);\r
             this.btn_setDefault.Name = "btn_setDefault";\r
             this.btn_setDefault.Size = new System.Drawing.Size(72, 22);\r
             this.btn_setDefault.TabIndex = 1;\r
@@ -585,28 +530,28 @@ namespace Handbrake
             this.btn_setDefault.Text = "Set Default";\r
             this.ToolTip.SetToolTip(this.btn_setDefault, "Set current settings as program defaults.\r\nRequires option to be enabled in Tools" +\r
                     " > Options");\r
-            this.btn_setDefault.UseVisualStyleBackColor = false;\r
+            this.btn_setDefault.UseVisualStyleBackColor = true;\r
             this.btn_setDefault.Click += new System.EventHandler(this.btn_setDefault_Click);\r
             // \r
-            // drp_audioMixDown\r
+            // drp_audmix_1\r
             // \r
-            this.drp_audioMixDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_audioMixDown.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audioMixDown.FormattingEnabled = true;\r
-            this.drp_audioMixDown.Items.AddRange(new object[] {\r
+            this.drp_audmix_1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audmix_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audmix_1.FormattingEnabled = true;\r
+            this.drp_audmix_1.Items.AddRange(new object[] {\r
             "Automatic",\r
             "Mono",\r
             "Stereo",\r
             "Dolby Surround",\r
             "Dolby Pro Logic II",\r
             "6 Channel Discrete"});\r
-            this.drp_audioMixDown.Location = new System.Drawing.Point(423, 33);\r
-            this.drp_audioMixDown.Name = "drp_audioMixDown";\r
-            this.drp_audioMixDown.Size = new System.Drawing.Size(173, 21);\r
-            this.drp_audioMixDown.TabIndex = 8;\r
-            this.drp_audioMixDown.Text = "Automatic";\r
-            this.ToolTip.SetToolTip(this.drp_audioMixDown, "Please note: Some options require a 5.1 audio channel to be selected");\r
-            this.drp_audioMixDown.SelectedIndexChanged += new System.EventHandler(this.drp_audioMixDown_SelectedIndexChanged);\r
+            this.drp_audmix_1.Location = new System.Drawing.Point(353, 49);\r
+            this.drp_audmix_1.Name = "drp_audmix_1";\r
+            this.drp_audmix_1.Size = new System.Drawing.Size(129, 20);\r
+            this.drp_audmix_1.TabIndex = 5;\r
+            this.drp_audmix_1.Text = "Automatic";\r
+            this.ToolTip.SetToolTip(this.drp_audmix_1, "Please note: Some options require a 5.1 audio channel to be selected");\r
+            this.drp_audmix_1.SelectedIndexChanged += new System.EventHandler(this.drp_audioMixDown_SelectedIndexChanged);\r
             // \r
             // text_height\r
             // \r
@@ -617,7 +562,7 @@ namespace Handbrake
             this.text_height.Name = "text_height";\r
             this.text_height.Size = new System.Drawing.Size(64, 21);\r
             this.text_height.TabIndex = 28;\r
-            this.ToolTip.SetToolTip(this.text_height, "Video Resolution (Height)");\r
+            this.ToolTip.SetToolTip(this.text_height, "Video Resolution (Height)\r\nCan only be altered when Anamorphic is set to \"None\"");\r
             this.text_height.TextChanged += new System.EventHandler(this.text_height_TextChanged);\r
             // \r
             // text_width\r
@@ -628,35 +573,23 @@ namespace Handbrake
             this.text_width.Name = "text_width";\r
             this.text_width.Size = new System.Drawing.Size(64, 21);\r
             this.text_width.TabIndex = 26;\r
-            this.ToolTip.SetToolTip(this.text_width, "Video Resolution (Width)");\r
+            this.ToolTip.SetToolTip(this.text_width, "Video Resolution (Width)\r\nCan only be altered when Anamorphic is set to \"None\" or" +\r
+                    " \"Loose\"");\r
             this.text_width.TextChanged += new System.EventHandler(this.text_width_TextChanged);\r
             // \r
-            // RadioDVD\r
-            // \r
-            this.RadioDVD.AutoSize = true;\r
-            this.RadioDVD.Checked = true;\r
-            this.RadioDVD.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.RadioDVD.Location = new System.Drawing.Point(540, 46);\r
-            this.RadioDVD.Name = "RadioDVD";\r
-            this.RadioDVD.Size = new System.Drawing.Size(60, 17);\r
-            this.RadioDVD.TabIndex = 3;\r
-            this.RadioDVD.TabStop = true;\r
-            this.RadioDVD.Text = "Folder";\r
-            this.ToolTip.SetToolTip(this.RadioDVD, "For Selecting a \"Video_TS\" folder on your hard drive or DVD");\r
-            this.RadioDVD.UseVisualStyleBackColor = true;\r
-            // \r
             // check_optimiseMP4\r
             // \r
             this.check_optimiseMP4.AutoSize = true;\r
             this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;\r
             this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_optimiseMP4.Location = new System.Drawing.Point(501, 13);\r
+            this.check_optimiseMP4.Location = new System.Drawing.Point(349, 22);\r
             this.check_optimiseMP4.Name = "check_optimiseMP4";\r
             this.check_optimiseMP4.Size = new System.Drawing.Size(143, 17);\r
             this.check_optimiseMP4.TabIndex = 25;\r
             this.check_optimiseMP4.Text = "HTTP Optimized MP4";\r
-            this.ToolTip.SetToolTip(this.check_optimiseMP4, "MP4 files can be optimized for progressive downloads over the Web, but note that " +\r
-                    "QuickTime can only read the files as long as the file extension is .mp4.");\r
+            this.ToolTip.SetToolTip(this.check_optimiseMP4, "MP4 files can be optimized for progressive downloads over the Web,\r\nbut note that" +\r
+                    " QuickTime can only read the files as long as the file extension is .mp4\r\nCan on" +\r
+                    "ly be used with H.264 ");\r
             this.check_optimiseMP4.UseVisualStyleBackColor = false;\r
             this.check_optimiseMP4.CheckedChanged += new System.EventHandler(this.check_optimiseMP4_CheckedChanged);\r
             // \r
@@ -665,13 +598,13 @@ namespace Handbrake
             this.check_iPodAtom.AutoSize = true;\r
             this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;\r
             this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_iPodAtom.Location = new System.Drawing.Point(501, 32);\r
+            this.check_iPodAtom.Location = new System.Drawing.Point(498, 23);\r
             this.check_iPodAtom.Name = "check_iPodAtom";\r
             this.check_iPodAtom.Size = new System.Drawing.Size(122, 17);\r
             this.check_iPodAtom.TabIndex = 26;\r
             this.check_iPodAtom.Text = "Insert iPod Atom";\r
-            this.ToolTip.SetToolTip(this.check_iPodAtom, "Required for 5th and 6th Generation iPods. Encodes will not sync if this is not e" +\r
-                    "nabled for H.264 encodes");\r
+            this.ToolTip.SetToolTip(this.check_iPodAtom, "Required for 5th and 6th Generation iPods.\r\nEncodes will not sync if this is not " +\r
+                    "enabled for H.264 encodes");\r
             this.check_iPodAtom.UseVisualStyleBackColor = false;\r
             this.check_iPodAtom.CheckedChanged += new System.EventHandler(this.check_iPodAtom_CheckedChanged);\r
             // \r
@@ -684,10 +617,10 @@ namespace Handbrake
             this.data_chpt.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.number,\r
             this.name});\r
-            this.data_chpt.Location = new System.Drawing.Point(16, 72);\r
+            this.data_chpt.Location = new System.Drawing.Point(16, 55);\r
             this.data_chpt.Name = "data_chpt";\r
-            this.data_chpt.Size = new System.Drawing.Size(607, 182);\r
-            this.data_chpt.TabIndex = 2;\r
+            this.data_chpt.Size = new System.Drawing.Size(661, 234);\r
+            this.data_chpt.TabIndex = 3;\r
             this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));\r
             // \r
             // number\r
@@ -704,16 +637,14 @@ namespace Handbrake
             // \r
             this.name.HeaderText = "Chapter Name";\r
             this.name.Name = "name";\r
-            this.name.Width = 410;\r
+            this.name.Width = 460;\r
             // \r
             // btn_addPreset\r
             // \r
-            this.btn_addPreset.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_addPreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_addPreset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_addPreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_addPreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_addPreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_addPreset.Location = new System.Drawing.Point(10, 483);\r
+            this.btn_addPreset.Location = new System.Drawing.Point(10, 502);\r
             this.btn_addPreset.Name = "btn_addPreset";\r
             this.btn_addPreset.Size = new System.Drawing.Size(35, 22);\r
             this.btn_addPreset.TabIndex = 3;\r
@@ -721,17 +652,15 @@ namespace Handbrake
             this.btn_addPreset.Text = "Add";\r
             this.ToolTip.SetToolTip(this.btn_addPreset, "Set current settings as program defaults.\r\nRequires option to be enabled in Tools" +\r
                     " > Options");\r
-            this.btn_addPreset.UseVisualStyleBackColor = false;\r
+            this.btn_addPreset.UseVisualStyleBackColor = true;\r
             this.btn_addPreset.Click += new System.EventHandler(this.btn_addPreset_Click);\r
             // \r
             // btn_removePreset\r
             // \r
-            this.btn_removePreset.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_removePreset.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_removePreset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_removePreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_removePreset.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_removePreset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_removePreset.Location = new System.Drawing.Point(51, 483);\r
+            this.btn_removePreset.Location = new System.Drawing.Point(51, 502);\r
             this.btn_removePreset.Name = "btn_removePreset";\r
             this.btn_removePreset.Size = new System.Drawing.Size(58, 22);\r
             this.btn_removePreset.TabIndex = 4;\r
@@ -739,17 +668,128 @@ namespace Handbrake
             this.btn_removePreset.Text = "Remove";\r
             this.ToolTip.SetToolTip(this.btn_removePreset, "Set current settings as program defaults.\r\nRequires option to be enabled in Tools" +\r
                     " > Options");\r
-            this.btn_removePreset.UseVisualStyleBackColor = false;\r
+            this.btn_removePreset.UseVisualStyleBackColor = true;\r
             this.btn_removePreset.Click += new System.EventHandler(this.btn_removePreset_Click);\r
             // \r
+            // drp_audmix_2\r
+            // \r
+            this.drp_audmix_2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audmix_2.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audmix_2.FormattingEnabled = true;\r
+            this.drp_audmix_2.Items.AddRange(new object[] {\r
+            "Automatic",\r
+            "Mono",\r
+            "Stereo",\r
+            "Dolby Surround",\r
+            "Dolby Pro Logic II",\r
+            "6 Channel Discrete"});\r
+            this.drp_audmix_2.Location = new System.Drawing.Point(353, 78);\r
+            this.drp_audmix_2.Name = "drp_audmix_2";\r
+            this.drp_audmix_2.Size = new System.Drawing.Size(129, 20);\r
+            this.drp_audmix_2.TabIndex = 14;\r
+            this.drp_audmix_2.Text = "Automatic";\r
+            this.ToolTip.SetToolTip(this.drp_audmix_2, "Please note: Some options require a 5.1 audio channel to be selected");\r
+            this.drp_audmix_2.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_2_SelectedIndexChanged);\r
+            // \r
+            // drp_audenc_1\r
+            // \r
+            this.drp_audenc_1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audenc_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audenc_1.FormattingEnabled = true;\r
+            this.drp_audenc_1.Items.AddRange(new object[] {\r
+            "AAC",\r
+            "MP3",\r
+            "Vorbis",\r
+            "AC3"});\r
+            this.drp_audenc_1.Location = new System.Drawing.Point(236, 49);\r
+            this.drp_audenc_1.Name = "drp_audenc_1";\r
+            this.drp_audenc_1.Size = new System.Drawing.Size(111, 20);\r
+            this.drp_audenc_1.TabIndex = 7;\r
+            this.drp_audenc_1.Text = "AAC";\r
+            this.ToolTip.SetToolTip(this.drp_audenc_1, "Select an audio encoder.");\r
+            this.drp_audenc_1.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_1_SelectedIndexChanged);\r
+            // \r
+            // drp_audenc_2\r
+            // \r
+            this.drp_audenc_2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audenc_2.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audenc_2.FormattingEnabled = true;\r
+            this.drp_audenc_2.Items.AddRange(new object[] {\r
+            "AAC",\r
+            "MP3",\r
+            "Vorbis",\r
+            "AC3"});\r
+            this.drp_audenc_2.Location = new System.Drawing.Point(236, 78);\r
+            this.drp_audenc_2.Name = "drp_audenc_2";\r
+            this.drp_audenc_2.Size = new System.Drawing.Size(111, 20);\r
+            this.drp_audenc_2.TabIndex = 15;\r
+            this.drp_audenc_2.Text = "AAC";\r
+            this.ToolTip.SetToolTip(this.drp_audenc_2, "Select an audio encoder.");\r
+            this.drp_audenc_2.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_2_SelectedIndexChanged);\r
+            // \r
+            // drp_audbit_2\r
+            // \r
+            this.drp_audbit_2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audbit_2.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audbit_2.FormattingEnabled = true;\r
+            this.drp_audbit_2.Items.AddRange(new object[] {\r
+            "32",\r
+            "40",\r
+            "48",\r
+            "56",\r
+            "64",\r
+            "80",\r
+            "86",\r
+            "112",\r
+            "128",\r
+            "160"});\r
+            this.drp_audbit_2.Location = new System.Drawing.Point(589, 78);\r
+            this.drp_audbit_2.Name = "drp_audbit_2";\r
+            this.drp_audbit_2.Size = new System.Drawing.Size(93, 20);\r
+            this.drp_audbit_2.TabIndex = 16;\r
+            this.drp_audbit_2.Text = "160";\r
+            this.ToolTip.SetToolTip(this.drp_audbit_2, "Set the Audio Bit-Rate");\r
+            // \r
+            // drp_audsr_2\r
+            // \r
+            this.drp_audsr_2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audsr_2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audsr_2.FormattingEnabled = true;\r
+            this.drp_audsr_2.Items.AddRange(new object[] {\r
+            "48",\r
+            "44.1",\r
+            "32",\r
+            "24",\r
+            "22.05"});\r
+            this.drp_audsr_2.Location = new System.Drawing.Point(499, 77);\r
+            this.drp_audsr_2.Name = "drp_audsr_2";\r
+            this.drp_audsr_2.Size = new System.Drawing.Size(64, 21);\r
+            this.drp_audsr_2.TabIndex = 17;\r
+            this.drp_audsr_2.Text = "48";\r
+            this.ToolTip.SetToolTip(this.drp_audsr_2, "Set the Audio Sample Rate");\r
+            // \r
+            // check_fileMode\r
+            // \r
+            this.check_fileMode.AutoSize = true;\r
+            this.check_fileMode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_fileMode.Location = new System.Drawing.Point(618, 21);\r
+            this.check_fileMode.Name = "check_fileMode";\r
+            this.check_fileMode.Size = new System.Drawing.Size(79, 17);\r
+            this.check_fileMode.TabIndex = 11;\r
+            this.check_fileMode.Text = "File Mode";\r
+            this.ToolTip.SetToolTip(this.check_fileMode, "Displays a File selection dialog box instead of the standard folder selection.\r\nW" +\r
+                    "ith the file dialog box, you can select the folllowing file types:\r\n.vob, .ts, ." +\r
+                    "mpg, .mpeg and .m2t");\r
+            this.check_fileMode.UseVisualStyleBackColor = true;\r
+            // \r
             // slider_drc\r
             // \r
             this.slider_drc.LargeChange = 0;\r
-            this.slider_drc.Location = new System.Drawing.Point(317, 137);\r
+            this.slider_drc.Location = new System.Drawing.Point(16, 239);\r
             this.slider_drc.Maximum = 30;\r
             this.slider_drc.Name = "slider_drc";\r
             this.slider_drc.Size = new System.Drawing.Size(241, 42);\r
-            this.slider_drc.TabIndex = 18;\r
+            this.slider_drc.TabIndex = 19;\r
             this.slider_drc.TickFrequency = 10;\r
             this.slider_drc.Scroll += new System.EventHandler(this.slider_drc_Scroll);\r
             // \r
@@ -862,7 +902,6 @@ namespace Handbrake
             // \r
             // PresetsToolStripMenuItem\r
             // \r
-            this.PresetsToolStripMenuItem.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.mnu_SelectDefault,\r
             this.toolStripSeparator7,\r
@@ -969,7 +1008,6 @@ namespace Handbrake
             // \r
             // frmMainMenu\r
             // \r
-            this.frmMainMenu.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.frmMainMenu.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.frmMainMenu.GripStyle = System.Windows.Forms.ToolStripGripStyle.Visible;\r
             this.frmMainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -979,20 +1017,18 @@ namespace Handbrake
             this.HelpToolStripMenuItem});\r
             this.frmMainMenu.Location = new System.Drawing.Point(0, 0);\r
             this.frmMainMenu.Name = "frmMainMenu";\r
-            this.frmMainMenu.Size = new System.Drawing.Size(900, 24);\r
+            this.frmMainMenu.Size = new System.Drawing.Size(931, 24);\r
             this.frmMainMenu.TabIndex = 0;\r
             this.frmMainMenu.Text = "MenuStrip1";\r
             // \r
             // GroupBox1\r
             // \r
-            this.GroupBox1.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.GroupBox1.Controls.Add(this.btn_Browse);\r
+            this.GroupBox1.Controls.Add(this.check_fileMode);\r
             this.GroupBox1.Controls.Add(this.Label13);\r
             this.GroupBox1.Controls.Add(this.drop_chapterFinish);\r
             this.GroupBox1.Controls.Add(this.drop_chapterStart);\r
             this.GroupBox1.Controls.Add(this.drp_dvdtitle);\r
-            this.GroupBox1.Controls.Add(this.RadioDVD);\r
-            this.GroupBox1.Controls.Add(this.RadioISO);\r
-            this.GroupBox1.Controls.Add(this.btn_Browse);\r
             this.GroupBox1.Controls.Add(this.Label17);\r
             this.GroupBox1.Controls.Add(this.text_source);\r
             this.GroupBox1.Controls.Add(this.Label9);\r
@@ -1001,16 +1037,27 @@ namespace Handbrake
             this.GroupBox1.ForeColor = System.Drawing.Color.Black;\r
             this.GroupBox1.Location = new System.Drawing.Point(14, 73);\r
             this.GroupBox1.Name = "GroupBox1";\r
-            this.GroupBox1.Size = new System.Drawing.Size(657, 87);\r
+            this.GroupBox1.Size = new System.Drawing.Size(705, 87);\r
             this.GroupBox1.TabIndex = 1;\r
             this.GroupBox1.TabStop = false;\r
             this.GroupBox1.Text = "Source";\r
             // \r
+            // btn_Browse\r
+            // \r
+            this.btn_Browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_Browse.Location = new System.Drawing.Point(534, 18);\r
+            this.btn_Browse.Name = "btn_Browse";\r
+            this.btn_Browse.Size = new System.Drawing.Size(75, 23);\r
+            this.btn_Browse.TabIndex = 12;\r
+            this.btn_Browse.Text = "Browse";\r
+            this.btn_Browse.UseVisualStyleBackColor = true;\r
+            this.btn_Browse.Click += new System.EventHandler(this.btn_Browse_Click);\r
+            // \r
             // Label13\r
             // \r
             this.Label13.AutoSize = true;\r
             this.Label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label13.Location = new System.Drawing.Point(374, 58);\r
+            this.Label13.Location = new System.Drawing.Point(370, 55);\r
             this.Label13.Name = "Label13";\r
             this.Label13.Size = new System.Drawing.Size(21, 13);\r
             this.Label13.TabIndex = 10;\r
@@ -1032,7 +1079,7 @@ namespace Handbrake
             this.Label9.AutoSize = true;\r
             this.Label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label9.ForeColor = System.Drawing.Color.Black;\r
-            this.Label9.Location = new System.Drawing.Point(224, 58);\r
+            this.Label9.Location = new System.Drawing.Point(225, 55);\r
             this.Label9.Name = "Label9";\r
             this.Label9.Size = new System.Drawing.Size(64, 13);\r
             this.Label9.TabIndex = 8;\r
@@ -1051,18 +1098,16 @@ namespace Handbrake
             // \r
             // groupBox_output\r
             // \r
-            this.groupBox_output.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.groupBox_output.Controls.Add(this.drp_videoEncoder);\r
             this.groupBox_output.Controls.Add(this.Label47);\r
-            this.groupBox_output.Controls.Add(this.drp_audioCodec);\r
+            this.groupBox_output.Controls.Add(this.check_largeFile);\r
             this.groupBox_output.Controls.Add(this.check_iPodAtom);\r
-            this.groupBox_output.Controls.Add(this.Label12);\r
             this.groupBox_output.Controls.Add(this.check_optimiseMP4);\r
             this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox_output.ForeColor = System.Drawing.Color.Black;\r
             this.groupBox_output.Location = new System.Drawing.Point(14, 217);\r
             this.groupBox_output.Name = "groupBox_output";\r
-            this.groupBox_output.Size = new System.Drawing.Size(657, 58);\r
+            this.groupBox_output.Size = new System.Drawing.Size(705, 50);\r
             this.groupBox_output.TabIndex = 3;\r
             this.groupBox_output.TabStop = false;\r
             this.groupBox_output.Text = "Output Settings (Preset: None)";\r
@@ -1072,23 +1117,12 @@ namespace Handbrake
             this.Label47.AutoSize = true;\r
             this.Label47.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label47.ForeColor = System.Drawing.Color.Black;\r
-            this.Label47.Location = new System.Drawing.Point(17, 27);\r
+            this.Label47.Location = new System.Drawing.Point(17, 24);\r
             this.Label47.Name = "Label47";\r
             this.Label47.Size = new System.Drawing.Size(62, 13);\r
             this.Label47.TabIndex = 0;\r
             this.Label47.Text = "Encoder: ";\r
             // \r
-            // Label12\r
-            // \r
-            this.Label12.AutoSize = true;\r
-            this.Label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label12.ForeColor = System.Drawing.Color.Black;\r
-            this.Label12.Location = new System.Drawing.Point(270, 27);\r
-            this.Label12.Name = "Label12";\r
-            this.Label12.Size = new System.Drawing.Size(94, 13);\r
-            this.Label12.TabIndex = 2;\r
-            this.Label12.Text = "Audio Encoder:";\r
-            // \r
             // Label3\r
             // \r
             this.Label3.AutoSize = true;\r
@@ -1103,8 +1137,9 @@ namespace Handbrake
             // lbl_encode\r
             // \r
             this.lbl_encode.AutoSize = true;\r
+            this.lbl_encode.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_encode.Location = new System.Drawing.Point(429, 35);\r
+            this.lbl_encode.Location = new System.Drawing.Point(448, 36);\r
             this.lbl_encode.Name = "lbl_encode";\r
             this.lbl_encode.Size = new System.Drawing.Size(129, 13);\r
             this.lbl_encode.TabIndex = 5;\r
@@ -1113,12 +1148,25 @@ namespace Handbrake
             // \r
             // TabPage2\r
             // \r
-            this.TabPage2.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.TabPage2.BackColor = System.Drawing.Color.Transparent;\r
+            this.TabPage2.Controls.Add(this.groupBox5);\r
+            this.TabPage2.Controls.Add(this.groupBox4);\r
+            this.TabPage2.Controls.Add(this.groupBox3);\r
+            this.TabPage2.Controls.Add(this.label12);\r
+            this.TabPage2.Controls.Add(this.label68);\r
+            this.TabPage2.Controls.Add(this.label67);\r
+            this.TabPage2.Controls.Add(this.drp_audsr_2);\r
+            this.TabPage2.Controls.Add(this.label66);\r
+            this.TabPage2.Controls.Add(this.drp_audbit_2);\r
+            this.TabPage2.Controls.Add(this.label65);\r
+            this.TabPage2.Controls.Add(this.label14);\r
+            this.TabPage2.Controls.Add(this.drp_audenc_2);\r
+            this.TabPage2.Controls.Add(this.drp_audenc_1);\r
+            this.TabPage2.Controls.Add(this.drp_audmix_2);\r
             this.TabPage2.Controls.Add(this.label30);\r
             this.TabPage2.Controls.Add(this.label29);\r
             this.TabPage2.Controls.Add(this.label23);\r
             this.TabPage2.Controls.Add(this.label7);\r
-            this.TabPage2.Controls.Add(this.label21);\r
             this.TabPage2.Controls.Add(this.lbl_drc);\r
             this.TabPage2.Controls.Add(this.slider_drc);\r
             this.TabPage2.Controls.Add(this.check_forced);\r
@@ -1128,84 +1176,159 @@ namespace Handbrake
             this.TabPage2.Controls.Add(this.drp_subtitle);\r
             this.TabPage2.Controls.Add(this.Label19);\r
             this.TabPage2.Controls.Add(this.Label20);\r
-            this.TabPage2.Controls.Add(this.drp_audioMixDown);\r
+            this.TabPage2.Controls.Add(this.drp_audmix_1);\r
             this.TabPage2.Controls.Add(this.drp_track1Audio);\r
-            this.TabPage2.Controls.Add(this.drp_audioBitrate);\r
-            this.TabPage2.Controls.Add(this.Label14);\r
+            this.TabPage2.Controls.Add(this.drp_audbit_1);\r
             this.TabPage2.Controls.Add(this.Label5);\r
-            this.TabPage2.Controls.Add(this.Label16);\r
             this.TabPage2.Controls.Add(this.Label32);\r
-            this.TabPage2.Controls.Add(this.Label18);\r
-            this.TabPage2.Controls.Add(this.drp_audioSampleRate);\r
+            this.TabPage2.Controls.Add(this.drp_audsr_1);\r
             this.TabPage2.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage2.Name = "TabPage2";\r
             this.TabPage2.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage2.Size = new System.Drawing.Size(649, 302);\r
+            this.TabPage2.Size = new System.Drawing.Size(697, 302);\r
             this.TabPage2.TabIndex = 3;\r
             this.TabPage2.Text = "Audio && Subtitles";\r
-            this.TabPage2.UseVisualStyleBackColor = true;\r
+            // \r
+            // groupBox5\r
+            // \r
+            this.groupBox5.Location = new System.Drawing.Point(107, 13);\r
+            this.groupBox5.Name = "groupBox5";\r
+            this.groupBox5.Size = new System.Drawing.Size(577, 10);\r
+            this.groupBox5.TabIndex = 32;\r
+            this.groupBox5.TabStop = false;\r
+            // \r
+            // groupBox4\r
+            // \r
+            this.groupBox4.Location = new System.Drawing.Point(109, 200);\r
+            this.groupBox4.Name = "groupBox4";\r
+            this.groupBox4.Size = new System.Drawing.Size(178, 10);\r
+            this.groupBox4.TabIndex = 31;\r
+            this.groupBox4.TabStop = false;\r
+            // \r
+            // groupBox3\r
+            // \r
+            this.groupBox3.Location = new System.Drawing.Point(397, 200);\r
+            this.groupBox3.Name = "groupBox3";\r
+            this.groupBox3.Size = new System.Drawing.Size(287, 10);\r
+            this.groupBox3.TabIndex = 30;\r
+            this.groupBox3.TabStop = false;\r
+            // \r
+            // label12\r
+            // \r
+            this.label12.AutoSize = true;\r
+            this.label12.BackColor = System.Drawing.Color.Transparent;\r
+            this.label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label12.Location = new System.Drawing.Point(19, 221);\r
+            this.label12.Name = "label12";\r
+            this.label12.Size = new System.Drawing.Size(181, 13);\r
+            this.label12.TabIndex = 29;\r
+            this.label12.Text = "Dynamic Range Compression:";\r
+            // \r
+            // label68\r
+            // \r
+            this.label68.AutoSize = true;\r
+            this.label68.BackColor = System.Drawing.Color.Transparent;\r
+            this.label68.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label68.Location = new System.Drawing.Point(13, 13);\r
+            this.label68.Name = "label68";\r
+            this.label68.Size = new System.Drawing.Size(92, 13);\r
+            this.label68.TabIndex = 0;\r
+            this.label68.Text = "Audio Tracks";\r
+            // \r
+            // label67\r
+            // \r
+            this.label67.AutoSize = true;\r
+            this.label67.BackColor = System.Drawing.Color.Transparent;\r
+            this.label67.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label67.Location = new System.Drawing.Point(487, 32);\r
+            this.label67.Name = "label67";\r
+            this.label67.Size = new System.Drawing.Size(99, 12);\r
+            this.label67.TabIndex = 10;\r
+            this.label67.Text = "Sample Rate (kHz)";\r
+            // \r
+            // label66\r
+            // \r
+            this.label66.AutoSize = true;\r
+            this.label66.BackColor = System.Drawing.Color.Transparent;\r
+            this.label66.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label66.Location = new System.Drawing.Point(594, 32);\r
+            this.label66.Name = "label66";\r
+            this.label66.Size = new System.Drawing.Size(78, 12);\r
+            this.label66.TabIndex = 8;\r
+            this.label66.Text = "Bitrate (Kbps)";\r
+            // \r
+            // label65\r
+            // \r
+            this.label65.AutoSize = true;\r
+            this.label65.BackColor = System.Drawing.Color.Transparent;\r
+            this.label65.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label65.Location = new System.Drawing.Point(255, 32);\r
+            this.label65.Name = "label65";\r
+            this.label65.Size = new System.Drawing.Size(66, 12);\r
+            this.label65.TabIndex = 6;\r
+            this.label65.Text = "Audio Codec";\r
+            // \r
+            // label14\r
+            // \r
+            this.label14.AutoSize = true;\r
+            this.label14.BackColor = System.Drawing.Color.Transparent;\r
+            this.label14.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label14.Location = new System.Drawing.Point(380, 32);\r
+            this.label14.Name = "label14";\r
+            this.label14.Size = new System.Drawing.Size(49, 12);\r
+            this.label14.TabIndex = 4;\r
+            this.label14.Text = "Mixdown";\r
             // \r
             // label30\r
             // \r
             this.label30.AutoSize = true;\r
             this.label30.BackColor = System.Drawing.Color.Transparent;\r
             this.label30.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label30.Location = new System.Drawing.Point(470, 169);\r
+            this.label30.Location = new System.Drawing.Point(139, 271);\r
             this.label30.Name = "label30";\r
-            this.label30.Size = new System.Drawing.Size(39, 12);\r
-            this.label30.TabIndex = 25;\r
-            this.label30.Text = "Louder";\r
+            this.label30.Size = new System.Drawing.Size(67, 12);\r
+            this.label30.TabIndex = 23;\r
+            this.label30.Text = "3.0 (Louder)";\r
             // \r
             // label29\r
             // \r
             this.label29.AutoSize = true;\r
             this.label29.BackColor = System.Drawing.Color.Transparent;\r
             this.label29.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label29.Location = new System.Drawing.Point(398, 169);\r
+            this.label29.Location = new System.Drawing.Point(74, 271);\r
             this.label29.Name = "label29";\r
-            this.label29.Size = new System.Drawing.Size(29, 12);\r
-            this.label29.TabIndex = 24;\r
-            this.label29.Text = "Loud";\r
+            this.label29.Size = new System.Drawing.Size(57, 12);\r
+            this.label29.TabIndex = 22;\r
+            this.label29.Text = "2.0 (Loud)";\r
             // \r
             // label23\r
             // \r
             this.label23.AutoSize = true;\r
             this.label23.BackColor = System.Drawing.Color.Transparent;\r
             this.label23.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label23.Location = new System.Drawing.Point(543, 169);\r
+            this.label23.Location = new System.Drawing.Point(211, 271);\r
             this.label23.Name = "label23";\r
-            this.label23.Size = new System.Drawing.Size(45, 12);\r
-            this.label23.TabIndex = 23;\r
-            this.label23.Text = "Loudest";\r
+            this.label23.Size = new System.Drawing.Size(73, 12);\r
+            this.label23.TabIndex = 24;\r
+            this.label23.Text = "4.0 (Loudest)";\r
             // \r
             // label7\r
             // \r
             this.label7.AutoSize = true;\r
             this.label7.BackColor = System.Drawing.Color.Transparent;\r
             this.label7.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label7.Location = new System.Drawing.Point(321, 169);\r
+            this.label7.Location = new System.Drawing.Point(20, 271);\r
             this.label7.Name = "label7";\r
-            this.label7.Size = new System.Drawing.Size(17, 12);\r
-            this.label7.TabIndex = 22;\r
-            this.label7.Text = "off";\r
-            // \r
-            // label21\r
-            // \r
-            this.label21.AutoSize = true;\r
-            this.label21.BackColor = System.Drawing.Color.Transparent;\r
-            this.label21.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label21.Location = new System.Drawing.Point(322, 120);\r
-            this.label21.Name = "label21";\r
-            this.label21.Size = new System.Drawing.Size(181, 13);\r
-            this.label21.TabIndex = 21;\r
-            this.label21.Text = "Dynamic Range Compression:";\r
+            this.label7.Size = new System.Drawing.Size(48, 12);\r
+            this.label7.TabIndex = 21;\r
+            this.label7.Text = "1.0 (Off)";\r
             // \r
             // lbl_drc\r
             // \r
             this.lbl_drc.AutoSize = true;\r
             this.lbl_drc.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_drc.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_drc.Location = new System.Drawing.Point(564, 142);\r
+            this.lbl_drc.Location = new System.Drawing.Point(206, 221);\r
             this.lbl_drc.Name = "lbl_drc";\r
             this.lbl_drc.Size = new System.Drawing.Size(14, 13);\r
             this.lbl_drc.TabIndex = 20;\r
@@ -1216,57 +1339,58 @@ namespace Handbrake
             this.check_forced.AutoSize = true;\r
             this.check_forced.BackColor = System.Drawing.Color.Transparent;\r
             this.check_forced.Enabled = false;\r
-            this.check_forced.Location = new System.Drawing.Point(332, 215);\r
+            this.check_forced.Location = new System.Drawing.Point(537, 224);\r
             this.check_forced.Name = "check_forced";\r
             this.check_forced.Size = new System.Drawing.Size(147, 17);\r
-            this.check_forced.TabIndex = 17;\r
+            this.check_forced.TabIndex = 28;\r
             this.check_forced.Text = "Forced Subtitles Only";\r
             this.check_forced.UseVisualStyleBackColor = false;\r
             // \r
             // drp_track2Audio\r
             // \r
             this.drp_track2Audio.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_track2Audio.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_track2Audio.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_track2Audio.FormattingEnabled = true;\r
             this.drp_track2Audio.Items.AddRange(new object[] {\r
-            "None"});\r
-            this.drp_track2Audio.Location = new System.Drawing.Point(113, 60);\r
+            "None",\r
+            "Automatic"});\r
+            this.drp_track2Audio.Location = new System.Drawing.Point(36, 77);\r
             this.drp_track2Audio.Name = "drp_track2Audio";\r
-            this.drp_track2Audio.Size = new System.Drawing.Size(213, 21);\r
-            this.drp_track2Audio.TabIndex = 16;\r
-            this.drp_track2Audio.Text = "None";\r
+            this.drp_track2Audio.Size = new System.Drawing.Size(194, 20);\r
+            this.drp_track2Audio.TabIndex = 13;\r
+            this.drp_track2Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track2Audio_SelectedIndexChanged);\r
             // \r
             // label28\r
             // \r
             this.label28.AutoSize = true;\r
             this.label28.BackColor = System.Drawing.Color.Transparent;\r
             this.label28.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label28.Location = new System.Drawing.Point(13, 63);\r
+            this.label28.Location = new System.Drawing.Point(13, 80);\r
             this.label28.Name = "label28";\r
-            this.label28.Size = new System.Drawing.Size(55, 13);\r
-            this.label28.TabIndex = 15;\r
-            this.label28.Text = "Track 2:";\r
+            this.label28.Size = new System.Drawing.Size(19, 13);\r
+            this.label28.TabIndex = 12;\r
+            this.label28.Text = "2:";\r
             // \r
             // label27\r
             // \r
             this.label27.AutoSize = true;\r
             this.label27.BackColor = System.Drawing.Color.Transparent;\r
-            this.label27.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label27.Location = new System.Drawing.Point(13, 13);\r
+            this.label27.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label27.Location = new System.Drawing.Point(107, 32);\r
             this.label27.Name = "label27";\r
-            this.label27.Size = new System.Drawing.Size(92, 13);\r
-            this.label27.TabIndex = 14;\r
-            this.label27.Text = "Audio Tracks";\r
+            this.label27.Size = new System.Drawing.Size(38, 12);\r
+            this.label27.TabIndex = 1;\r
+            this.label27.Text = "Source";\r
             // \r
             // Label19\r
             // \r
             this.Label19.AutoSize = true;\r
             this.Label19.BackColor = System.Drawing.Color.Transparent;\r
             this.Label19.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label19.Location = new System.Drawing.Point(13, 192);\r
+            this.Label19.Location = new System.Drawing.Point(327, 200);\r
             this.Label19.Name = "Label19";\r
             this.Label19.Size = new System.Drawing.Size(64, 13);\r
-            this.Label19.TabIndex = 10;\r
+            this.Label19.TabIndex = 25;\r
             this.Label19.Text = "Subtitles";\r
             // \r
             // Label20\r
@@ -1274,87 +1398,53 @@ namespace Handbrake
             this.Label20.AutoSize = true;\r
             this.Label20.BackColor = System.Drawing.Color.Transparent;\r
             this.Label20.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label20.Location = new System.Drawing.Point(13, 216);\r
+            this.Label20.Location = new System.Drawing.Point(327, 224);\r
             this.Label20.Name = "Label20";\r
             this.Label20.Size = new System.Drawing.Size(61, 13);\r
-            this.Label20.TabIndex = 11;\r
+            this.Label20.TabIndex = 26;\r
             this.Label20.Text = "Subtitles:";\r
             // \r
             // drp_track1Audio\r
             // \r
             this.drp_track1Audio.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_track1Audio.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_track1Audio.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_track1Audio.FormattingEnabled = true;\r
             this.drp_track1Audio.Items.AddRange(new object[] {\r
             "Automatic",\r
             "None"});\r
-            this.drp_track1Audio.Location = new System.Drawing.Point(113, 33);\r
+            this.drp_track1Audio.Location = new System.Drawing.Point(36, 50);\r
             this.drp_track1Audio.Name = "drp_track1Audio";\r
-            this.drp_track1Audio.Size = new System.Drawing.Size(213, 21);\r
-            this.drp_track1Audio.TabIndex = 7;\r
-            this.drp_track1Audio.Text = "Automatic";\r
-            // \r
-            // Label14\r
-            // \r
-            this.Label14.AutoSize = true;\r
-            this.Label14.BackColor = System.Drawing.Color.Transparent;\r
-            this.Label14.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label14.Location = new System.Drawing.Point(339, 36);\r
-            this.Label14.Name = "Label14";\r
-            this.Label14.Size = new System.Drawing.Size(78, 13);\r
-            this.Label14.TabIndex = 4;\r
-            this.Label14.Text = "Track 1 Mix:";\r
+            this.drp_track1Audio.Size = new System.Drawing.Size(194, 20);\r
+            this.drp_track1Audio.TabIndex = 3;\r
+            this.drp_track1Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track1Audio_SelectedIndexChanged);\r
             // \r
             // Label5\r
             // \r
             this.Label5.AutoSize = true;\r
             this.Label5.BackColor = System.Drawing.Color.Transparent;\r
             this.Label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label5.Location = new System.Drawing.Point(13, 94);\r
+            this.Label5.Location = new System.Drawing.Point(13, 200);\r
             this.Label5.Name = "Label5";\r
-            this.Label5.Size = new System.Drawing.Size(94, 13);\r
-            this.Label5.TabIndex = 0;\r
-            this.Label5.Text = "Audio Quality";\r
-            // \r
-            // Label16\r
-            // \r
-            this.Label16.AutoSize = true;\r
-            this.Label16.BackColor = System.Drawing.Color.Transparent;\r
-            this.Label16.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label16.Location = new System.Drawing.Point(13, 123);\r
-            this.Label16.Name = "Label16";\r
-            this.Label16.Size = new System.Drawing.Size(91, 13);\r
-            this.Label16.TabIndex = 1;\r
-            this.Label16.Text = "Bitrate (kbps):";\r
+            this.Label5.Size = new System.Drawing.Size(93, 13);\r
+            this.Label5.TabIndex = 18;\r
+            this.Label5.Text = "Audio Effects";\r
             // \r
             // Label32\r
             // \r
             this.Label32.AutoSize = true;\r
             this.Label32.BackColor = System.Drawing.Color.Transparent;\r
             this.Label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label32.Location = new System.Drawing.Point(13, 36);\r
+            this.Label32.Location = new System.Drawing.Point(13, 53);\r
             this.Label32.Name = "Label32";\r
-            this.Label32.Size = new System.Drawing.Size(55, 13);\r
-            this.Label32.TabIndex = 3;\r
-            this.Label32.Text = "Track 1:";\r
-            // \r
-            // Label18\r
-            // \r
-            this.Label18.AutoSize = true;\r
-            this.Label18.BackColor = System.Drawing.Color.Transparent;\r
-            this.Label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label18.Location = new System.Drawing.Point(13, 157);\r
-            this.Label18.Name = "Label18";\r
-            this.Label18.Size = new System.Drawing.Size(120, 13);\r
-            this.Label18.TabIndex = 2;\r
-            this.Label18.Text = "Sample Rate (kHz):";\r
+            this.Label32.Size = new System.Drawing.Size(19, 13);\r
+            this.Label32.TabIndex = 2;\r
+            this.Label32.Text = "1:";\r
             // \r
             // TabPage3\r
             // \r
-            this.TabPage3.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.TabPage3.BackColor = System.Drawing.Color.Transparent;\r
             this.TabPage3.Controls.Add(this.label25);\r
             this.TabPage3.Controls.Add(this.lbl_vfr);\r
-            this.TabPage3.Controls.Add(this.check_largeFile);\r
             this.TabPage3.Controls.Add(this.check_grayscale);\r
             this.TabPage3.Controls.Add(this.check_turbo);\r
             this.TabPage3.Controls.Add(this.Label22);\r
@@ -1372,10 +1462,9 @@ namespace Handbrake
             this.TabPage3.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage3.Name = "TabPage3";\r
             this.TabPage3.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage3.Size = new System.Drawing.Size(649, 302);\r
+            this.TabPage3.Size = new System.Drawing.Size(697, 302);\r
             this.TabPage3.TabIndex = 2;\r
             this.TabPage3.Text = "Video";\r
-            this.TabPage3.UseVisualStyleBackColor = true;\r
             // \r
             // label25\r
             // \r
@@ -1493,7 +1582,7 @@ namespace Handbrake
             // \r
             // TabPage1\r
             // \r
-            this.TabPage1.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.TabPage1.BackColor = System.Drawing.Color.Transparent;\r
             this.TabPage1.Controls.Add(this.label6);\r
             this.TabPage1.Controls.Add(this.drp_anamorphic);\r
             this.TabPage1.Controls.Add(this.text_bottom);\r
@@ -1527,10 +1616,9 @@ namespace Handbrake
             this.TabPage1.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage1.Name = "TabPage1";\r
             this.TabPage1.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage1.Size = new System.Drawing.Size(649, 302);\r
+            this.TabPage1.Size = new System.Drawing.Size(697, 302);\r
             this.TabPage1.TabIndex = 0;\r
             this.TabPage1.Text = "Picture Settings";\r
-            this.TabPage1.UseVisualStyleBackColor = true;\r
             // \r
             // label6\r
             // \r
@@ -1561,7 +1649,6 @@ namespace Handbrake
             // \r
             // text_bottom\r
             // \r
-            this.text_bottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_bottom.Location = new System.Drawing.Point(133, 146);\r
             this.text_bottom.Maximum = new decimal(new int[] {\r
             1080,\r
@@ -1574,7 +1661,6 @@ namespace Handbrake
             // \r
             // text_top\r
             // \r
-            this.text_top.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_top.Location = new System.Drawing.Point(133, 105);\r
             this.text_top.Maximum = new decimal(new int[] {\r
             1080,\r
@@ -1587,7 +1673,6 @@ namespace Handbrake
             // \r
             // text_left\r
             // \r
-            this.text_left.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_left.Location = new System.Drawing.Point(77, 126);\r
             this.text_left.Maximum = new decimal(new int[] {\r
             1920,\r
@@ -1600,7 +1685,6 @@ namespace Handbrake
             // \r
             // text_right\r
             // \r
-            this.text_right.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_right.Location = new System.Drawing.Point(187, 126);\r
             this.text_right.Maximum = new decimal(new int[] {\r
             1920,\r
@@ -1881,7 +1965,7 @@ namespace Handbrake
             this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32);\r
             this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";\r
             this.Check_ChapterMarkers.Size = new System.Drawing.Size(164, 17);\r
-            this.Check_ChapterMarkers.TabIndex = 22;\r
+            this.Check_ChapterMarkers.TabIndex = 1;\r
             this.Check_ChapterMarkers.Text = "Create chapter markers";\r
             this.Check_ChapterMarkers.UseVisualStyleBackColor = false;\r
             this.Check_ChapterMarkers.CheckedChanged += new System.EventHandler(this.Check_ChapterMarkers_CheckedChanged);\r
@@ -1898,32 +1982,21 @@ namespace Handbrake
             this.advancedOptions.Location = new System.Drawing.Point(14, 281);\r
             this.advancedOptions.Name = "advancedOptions";\r
             this.advancedOptions.SelectedIndex = 0;\r
-            this.advancedOptions.Size = new System.Drawing.Size(657, 328);\r
+            this.advancedOptions.Size = new System.Drawing.Size(705, 328);\r
             this.advancedOptions.TabIndex = 5;\r
             this.advancedOptions.TabStop = false;\r
             // \r
             // tab_chapters\r
             // \r
-            this.tab_chapters.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.tab_chapters.Controls.Add(this.lbl_warn_chapt);\r
+            this.tab_chapters.BackColor = System.Drawing.Color.Transparent;\r
             this.tab_chapters.Controls.Add(this.label31);\r
             this.tab_chapters.Controls.Add(this.data_chpt);\r
             this.tab_chapters.Controls.Add(this.Check_ChapterMarkers);\r
             this.tab_chapters.Location = new System.Drawing.Point(4, 22);\r
             this.tab_chapters.Name = "tab_chapters";\r
-            this.tab_chapters.Size = new System.Drawing.Size(649, 302);\r
+            this.tab_chapters.Size = new System.Drawing.Size(697, 302);\r
             this.tab_chapters.TabIndex = 6;\r
             this.tab_chapters.Text = "Chapters";\r
-            this.tab_chapters.UseVisualStyleBackColor = true;\r
-            // \r
-            // lbl_warn_chapt\r
-            // \r
-            this.lbl_warn_chapt.AutoSize = true;\r
-            this.lbl_warn_chapt.Location = new System.Drawing.Point(13, 52);\r
-            this.lbl_warn_chapt.Name = "lbl_warn_chapt";\r
-            this.lbl_warn_chapt.Size = new System.Drawing.Size(394, 13);\r
-            this.lbl_warn_chapt.TabIndex = 23;\r
-            this.lbl_warn_chapt.Text = "Please make sure you have selected a DVD tile in the \"Source\" box";\r
             // \r
             // label31\r
             // \r
@@ -1933,11 +2006,12 @@ namespace Handbrake
             this.label31.Location = new System.Drawing.Point(13, 13);\r
             this.label31.Name = "label31";\r
             this.label31.Size = new System.Drawing.Size(115, 13);\r
-            this.label31.TabIndex = 15;\r
+            this.label31.TabIndex = 0;\r
             this.label31.Text = "Chapter Markers";\r
             // \r
             // h264Tab\r
             // \r
+            this.h264Tab.BackColor = System.Drawing.Color.Transparent;\r
             this.h264Tab.Controls.Add(this.label43);\r
             this.h264Tab.Controls.Add(this.btn_reset);\r
             this.h264Tab.Controls.Add(this.rtf_x264Query);\r
@@ -1985,10 +2059,9 @@ namespace Handbrake
             this.h264Tab.Location = new System.Drawing.Point(4, 22);\r
             this.h264Tab.Name = "h264Tab";\r
             this.h264Tab.Padding = new System.Windows.Forms.Padding(3);\r
-            this.h264Tab.Size = new System.Drawing.Size(649, 302);\r
+            this.h264Tab.Size = new System.Drawing.Size(697, 302);\r
             this.h264Tab.TabIndex = 8;\r
             this.h264Tab.Text = "Advanced";\r
-            this.h264Tab.UseVisualStyleBackColor = true;\r
             // \r
             // label43\r
             // \r
@@ -2013,10 +2086,10 @@ namespace Handbrake
             // \r
             // rtf_x264Query\r
             // \r
-            this.rtf_x264Query.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
+            this.rtf_x264Query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.rtf_x264Query.Location = new System.Drawing.Point(13, 253);\r
             this.rtf_x264Query.Name = "rtf_x264Query";\r
-            this.rtf_x264Query.Size = new System.Drawing.Size(606, 43);\r
+            this.rtf_x264Query.Size = new System.Drawing.Size(667, 43);\r
             this.rtf_x264Query.TabIndex = 42;\r
             this.rtf_x264Query.Text = "";\r
             this.rtf_x264Query.LostFocus += new System.EventHandler(this.rtf_x264Query_TextChanged);\r
@@ -2026,7 +2099,7 @@ namespace Handbrake
             // \r
             this.label35.AutoSize = true;\r
             this.label35.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label35.Location = new System.Drawing.Point(476, 213);\r
+            this.label35.Location = new System.Drawing.Point(534, 213);\r
             this.label35.Name = "label35";\r
             this.label35.Size = new System.Drawing.Size(128, 12);\r
             this.label35.TabIndex = 29;\r
@@ -2036,7 +2109,7 @@ namespace Handbrake
             // \r
             this.check_Cabac.AutoSize = true;\r
             this.check_Cabac.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_Cabac.Location = new System.Drawing.Point(610, 214);\r
+            this.check_Cabac.Location = new System.Drawing.Point(668, 214);\r
             this.check_Cabac.Name = "check_Cabac";\r
             this.check_Cabac.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
             this.check_Cabac.Size = new System.Drawing.Size(12, 11);\r
@@ -2049,7 +2122,7 @@ namespace Handbrake
             // \r
             this.label36.AutoSize = true;\r
             this.label36.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label36.Location = new System.Drawing.Point(503, 194);\r
+            this.label36.Location = new System.Drawing.Point(561, 194);\r
             this.label36.Name = "label36";\r
             this.label36.Size = new System.Drawing.Size(102, 12);\r
             this.label36.TabIndex = 28;\r
@@ -2059,7 +2132,7 @@ namespace Handbrake
             // \r
             this.check_noDCTDecimate.AutoSize = true;\r
             this.check_noDCTDecimate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_noDCTDecimate.Location = new System.Drawing.Point(610, 195);\r
+            this.check_noDCTDecimate.Location = new System.Drawing.Point(668, 195);\r
             this.check_noDCTDecimate.Name = "check_noDCTDecimate";\r
             this.check_noDCTDecimate.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
             this.check_noDCTDecimate.Size = new System.Drawing.Size(12, 11);\r
@@ -2072,7 +2145,7 @@ namespace Handbrake
             // \r
             this.label37.AutoSize = true;\r
             this.label37.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label37.Location = new System.Drawing.Point(386, 193);\r
+            this.label37.Location = new System.Drawing.Point(444, 193);\r
             this.label37.Name = "label37";\r
             this.label37.Size = new System.Drawing.Size(87, 12);\r
             this.label37.TabIndex = 27;\r
@@ -2082,7 +2155,7 @@ namespace Handbrake
             // \r
             this.check_noFastPSkip.AutoSize = true;\r
             this.check_noFastPSkip.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_noFastPSkip.Location = new System.Drawing.Point(479, 194);\r
+            this.check_noFastPSkip.Location = new System.Drawing.Point(537, 194);\r
             this.check_noFastPSkip.Name = "check_noFastPSkip";\r
             this.check_noFastPSkip.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
             this.check_noFastPSkip.Size = new System.Drawing.Size(12, 11);\r
@@ -2095,7 +2168,7 @@ namespace Handbrake
             // \r
             this.label39.AutoSize = true;\r
             this.label39.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label39.Location = new System.Drawing.Point(432, 169);\r
+            this.label39.Location = new System.Drawing.Point(490, 169);\r
             this.label39.Name = "label39";\r
             this.label39.Size = new System.Drawing.Size(41, 12);\r
             this.label39.TabIndex = 26;\r
@@ -2106,9 +2179,9 @@ namespace Handbrake
             this.drop_trellis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_trellis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_trellis.FormattingEnabled = true;\r
-            this.drop_trellis.Location = new System.Drawing.Point(479, 166);\r
+            this.drop_trellis.Location = new System.Drawing.Point(537, 166);\r
             this.drop_trellis.Name = "drop_trellis";\r
-            this.drop_trellis.Size = new System.Drawing.Size(139, 20);\r
+            this.drop_trellis.Size = new System.Drawing.Size(143, 20);\r
             this.drop_trellis.TabIndex = 37;\r
             this.drop_trellis.SelectedIndexChanged += new System.EventHandler(this.drop_trellis_SelectedIndexChanged);\r
             // \r
@@ -2117,7 +2190,7 @@ namespace Handbrake
             this.drop_deblockBeta.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_deblockBeta.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_deblockBeta.FormattingEnabled = true;\r
-            this.drop_deblockBeta.Location = new System.Drawing.Point(553, 139);\r
+            this.drop_deblockBeta.Location = new System.Drawing.Point(611, 139);\r
             this.drop_deblockBeta.Name = "drop_deblockBeta";\r
             this.drop_deblockBeta.Size = new System.Drawing.Size(69, 20);\r
             this.drop_deblockBeta.TabIndex = 36;\r
@@ -2127,7 +2200,7 @@ namespace Handbrake
             // \r
             this.label41.AutoSize = true;\r
             this.label41.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label41.Location = new System.Drawing.Point(408, 147);\r
+            this.label41.Location = new System.Drawing.Point(466, 147);\r
             this.label41.Name = "label41";\r
             this.label41.Size = new System.Drawing.Size(65, 12);\r
             this.label41.TabIndex = 25;\r
@@ -2138,7 +2211,7 @@ namespace Handbrake
             this.drop_deblockAlpha.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_deblockAlpha.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_deblockAlpha.FormattingEnabled = true;\r
-            this.drop_deblockAlpha.Location = new System.Drawing.Point(479, 139);\r
+            this.drop_deblockAlpha.Location = new System.Drawing.Point(537, 139);\r
             this.drop_deblockAlpha.Name = "drop_deblockAlpha";\r
             this.drop_deblockAlpha.Size = new System.Drawing.Size(68, 20);\r
             this.drop_deblockAlpha.TabIndex = 35;\r
@@ -2147,7 +2220,7 @@ namespace Handbrake
             // panel3\r
             // \r
             this.panel3.BackColor = System.Drawing.Color.Black;\r
-            this.panel3.Location = new System.Drawing.Point(338, 131);\r
+            this.panel3.Location = new System.Drawing.Point(396, 131);\r
             this.panel3.Margin = new System.Windows.Forms.Padding(0);\r
             this.panel3.Name = "panel3";\r
             this.panel3.Size = new System.Drawing.Size(284, 1);\r
@@ -2165,7 +2238,7 @@ namespace Handbrake
             // panel2\r
             // \r
             this.panel2.BackColor = System.Drawing.Color.Black;\r
-            this.panel2.Location = new System.Drawing.Point(338, 95);\r
+            this.panel2.Location = new System.Drawing.Point(396, 95);\r
             this.panel2.Margin = new System.Windows.Forms.Padding(0);\r
             this.panel2.Name = "panel2";\r
             this.panel2.Size = new System.Drawing.Size(284, 1);\r
@@ -2175,7 +2248,7 @@ namespace Handbrake
             // \r
             this.label44.AutoSize = true;\r
             this.label44.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label44.Location = new System.Drawing.Point(532, 108);\r
+            this.label44.Location = new System.Drawing.Point(590, 108);\r
             this.label44.Name = "label44";\r
             this.label44.Size = new System.Drawing.Size(55, 12);\r
             this.label44.TabIndex = 23;\r
@@ -2185,7 +2258,7 @@ namespace Handbrake
             // \r
             this.check_8x8DCT.AutoSize = true;\r
             this.check_8x8DCT.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_8x8DCT.Location = new System.Drawing.Point(590, 108);\r
+            this.check_8x8DCT.Location = new System.Drawing.Point(648, 108);\r
             this.check_8x8DCT.Name = "check_8x8DCT";\r
             this.check_8x8DCT.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
             this.check_8x8DCT.Size = new System.Drawing.Size(12, 11);\r
@@ -2198,7 +2271,7 @@ namespace Handbrake
             // \r
             this.label45.AutoSize = true;\r
             this.label45.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label45.Location = new System.Drawing.Point(420, 108);\r
+            this.label45.Location = new System.Drawing.Point(478, 108);\r
             this.label45.Name = "label45";\r
             this.label45.Size = new System.Drawing.Size(53, 12);\r
             this.label45.TabIndex = 22;\r
@@ -2209,7 +2282,7 @@ namespace Handbrake
             this.drop_analysis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_analysis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_analysis.FormattingEnabled = true;\r
-            this.drop_analysis.Location = new System.Drawing.Point(479, 105);\r
+            this.drop_analysis.Location = new System.Drawing.Point(537, 105);\r
             this.drop_analysis.Name = "drop_analysis";\r
             this.drop_analysis.Size = new System.Drawing.Size(47, 20);\r
             this.drop_analysis.TabIndex = 33;\r
@@ -2219,7 +2292,7 @@ namespace Handbrake
             // \r
             this.label48.AutoSize = true;\r
             this.label48.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label48.Location = new System.Drawing.Point(327, 72);\r
+            this.label48.Location = new System.Drawing.Point(385, 72);\r
             this.label48.Name = "label48";\r
             this.label48.Size = new System.Drawing.Size(146, 12);\r
             this.label48.TabIndex = 20;\r
@@ -2230,7 +2303,7 @@ namespace Handbrake
             this.drop_subpixelMotionEstimation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_subpixelMotionEstimation.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_subpixelMotionEstimation.FormattingEnabled = true;\r
-            this.drop_subpixelMotionEstimation.Location = new System.Drawing.Point(479, 69);\r
+            this.drop_subpixelMotionEstimation.Location = new System.Drawing.Point(537, 69);\r
             this.drop_subpixelMotionEstimation.Name = "drop_subpixelMotionEstimation";\r
             this.drop_subpixelMotionEstimation.Size = new System.Drawing.Size(139, 20);\r
             this.drop_subpixelMotionEstimation.TabIndex = 32;\r
@@ -2240,7 +2313,7 @@ namespace Handbrake
             // \r
             this.label49.AutoSize = true;\r
             this.label49.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label49.Location = new System.Drawing.Point(339, 43);\r
+            this.label49.Location = new System.Drawing.Point(397, 43);\r
             this.label49.Name = "label49";\r
             this.label49.Size = new System.Drawing.Size(134, 12);\r
             this.label49.TabIndex = 19;\r
@@ -2251,7 +2324,7 @@ namespace Handbrake
             this.drop_MotionEstimationRange.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
             this.drop_MotionEstimationRange.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_MotionEstimationRange.FormattingEnabled = true;\r
-            this.drop_MotionEstimationRange.Location = new System.Drawing.Point(479, 40);\r
+            this.drop_MotionEstimationRange.Location = new System.Drawing.Point(537, 40);\r
             this.drop_MotionEstimationRange.Name = "drop_MotionEstimationRange";\r
             this.drop_MotionEstimationRange.Size = new System.Drawing.Size(139, 20);\r
             this.drop_MotionEstimationRange.TabIndex = 31;\r
@@ -2261,7 +2334,7 @@ namespace Handbrake
             // \r
             this.label54.AutoSize = true;\r
             this.label54.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label54.Location = new System.Drawing.Point(333, 14);\r
+            this.label54.Location = new System.Drawing.Point(391, 14);\r
             this.label54.Name = "label54";\r
             this.label54.Size = new System.Drawing.Size(140, 12);\r
             this.label54.TabIndex = 18;\r
@@ -2273,7 +2346,7 @@ namespace Handbrake
             this.drop_MotionEstimationMethod.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_MotionEstimationMethod.FormattingEnabled = true;\r
             this.drop_MotionEstimationMethod.ItemHeight = 12;\r
-            this.drop_MotionEstimationMethod.Location = new System.Drawing.Point(479, 11);\r
+            this.drop_MotionEstimationMethod.Location = new System.Drawing.Point(537, 11);\r
             this.drop_MotionEstimationMethod.Name = "drop_MotionEstimationMethod";\r
             this.drop_MotionEstimationMethod.Size = new System.Drawing.Size(139, 20);\r
             this.drop_MotionEstimationMethod.TabIndex = 30;\r
@@ -2459,7 +2532,6 @@ namespace Handbrake
             // \r
             // tabPage4\r
             // \r
-            this.tabPage4.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.tabPage4.Controls.Add(this.btn_clear);\r
             this.tabPage4.Controls.Add(this.btn_copy2C);\r
             this.tabPage4.Controls.Add(this.label34);\r
@@ -2468,31 +2540,26 @@ namespace Handbrake
             this.tabPage4.Controls.Add(this.rtf_query);\r
             this.tabPage4.Location = new System.Drawing.Point(4, 22);\r
             this.tabPage4.Name = "tabPage4";\r
-            this.tabPage4.Size = new System.Drawing.Size(649, 302);\r
+            this.tabPage4.Size = new System.Drawing.Size(697, 302);\r
             this.tabPage4.TabIndex = 7;\r
             this.tabPage4.Text = "Query Editor";\r
-            this.tabPage4.UseVisualStyleBackColor = true;\r
             // \r
             // btn_clear\r
             // \r
-            this.btn_clear.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_clear.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_clear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_clear.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_clear.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_clear.Location = new System.Drawing.Point(555, 75);\r
+            this.btn_clear.Location = new System.Drawing.Point(602, 75);\r
             this.btn_clear.Name = "btn_clear";\r
             this.btn_clear.Size = new System.Drawing.Size(75, 22);\r
             this.btn_clear.TabIndex = 4;\r
             this.btn_clear.Text = "Clear";\r
-            this.btn_clear.UseVisualStyleBackColor = false;\r
+            this.btn_clear.UseVisualStyleBackColor = true;\r
             this.btn_clear.Click += new System.EventHandler(this.btn_clear_Click);\r
             // \r
             // btn_copy2C\r
             // \r
-            this.btn_copy2C.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_copy2C.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_copy2C.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_copy2C.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_copy2C.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
             this.btn_copy2C.Location = new System.Drawing.Point(148, 75);\r
@@ -2500,7 +2567,7 @@ namespace Handbrake
             this.btn_copy2C.Size = new System.Drawing.Size(136, 22);\r
             this.btn_copy2C.TabIndex = 3;\r
             this.btn_copy2C.Text = "Copy to clipboard";\r
-            this.btn_copy2C.UseVisualStyleBackColor = false;\r
+            this.btn_copy2C.UseVisualStyleBackColor = true;\r
             this.btn_copy2C.Click += new System.EventHandler(this.btn_copy2C_Click);\r
             // \r
             // label34\r
@@ -2515,9 +2582,7 @@ namespace Handbrake
             // \r
             // btn_generate_Query\r
             // \r
-            this.btn_generate_Query.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_generate_Query.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_generate_Query.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_generate_Query.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_generate_Query.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
             this.btn_generate_Query.Location = new System.Drawing.Point(16, 75);\r
@@ -2525,7 +2590,7 @@ namespace Handbrake
             this.btn_generate_Query.Size = new System.Drawing.Size(126, 22);\r
             this.btn_generate_Query.TabIndex = 2;\r
             this.btn_generate_Query.Text = "Generate Query";\r
-            this.btn_generate_Query.UseVisualStyleBackColor = false;\r
+            this.btn_generate_Query.UseVisualStyleBackColor = true;\r
             this.btn_generate_Query.Click += new System.EventHandler(this.btn_generate_Query_Click);\r
             // \r
             // label33\r
@@ -2544,24 +2609,35 @@ namespace Handbrake
             this.rtf_query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.rtf_query.Location = new System.Drawing.Point(16, 103);\r
             this.rtf_query.Name = "rtf_query";\r
-            this.rtf_query.Size = new System.Drawing.Size(614, 108);\r
+            this.rtf_query.Size = new System.Drawing.Size(661, 182);\r
             this.rtf_query.TabIndex = 5;\r
             this.rtf_query.Text = "";\r
             // \r
             // groupBox_dest\r
             // \r
+            this.groupBox_dest.Controls.Add(this.btn_destBrowse);\r
             this.groupBox_dest.Controls.Add(this.Label3);\r
             this.groupBox_dest.Controls.Add(this.text_destination);\r
-            this.groupBox_dest.Controls.Add(this.btn_destBrowse);\r
             this.groupBox_dest.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox_dest.ForeColor = System.Drawing.Color.Black;\r
             this.groupBox_dest.Location = new System.Drawing.Point(14, 163);\r
             this.groupBox_dest.Name = "groupBox_dest";\r
-            this.groupBox_dest.Size = new System.Drawing.Size(657, 50);\r
+            this.groupBox_dest.Size = new System.Drawing.Size(705, 50);\r
             this.groupBox_dest.TabIndex = 2;\r
             this.groupBox_dest.TabStop = false;\r
             this.groupBox_dest.Text = "Destination";\r
             // \r
+            // btn_destBrowse\r
+            // \r
+            this.btn_destBrowse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_destBrowse.Location = new System.Drawing.Point(598, 18);\r
+            this.btn_destBrowse.Name = "btn_destBrowse";\r
+            this.btn_destBrowse.Size = new System.Drawing.Size(75, 23);\r
+            this.btn_destBrowse.TabIndex = 13;\r
+            this.btn_destBrowse.Text = "Browse";\r
+            this.btn_destBrowse.UseVisualStyleBackColor = true;\r
+            this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click);\r
+            // \r
             // groupBox2\r
             // \r
             this.groupBox2.Controls.Add(this.btn_removePreset);\r
@@ -2570,16 +2646,15 @@ namespace Handbrake
             this.groupBox2.Controls.Add(this.btn_setDefault);\r
             this.groupBox2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox2.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox2.Location = new System.Drawing.Point(687, 73);\r
+            this.groupBox2.Location = new System.Drawing.Point(729, 73);\r
             this.groupBox2.Name = "groupBox2";\r
-            this.groupBox2.Size = new System.Drawing.Size(198, 517);\r
+            this.groupBox2.Size = new System.Drawing.Size(198, 536);\r
             this.groupBox2.TabIndex = 11;\r
             this.groupBox2.TabStop = false;\r
             this.groupBox2.Text = "Presets";\r
             // \r
             // treeView_presets\r
             // \r
-            this.treeView_presets.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.treeView_presets.ForeColor = System.Drawing.Color.Navy;\r
             this.treeView_presets.FullRowSelect = true;\r
             this.treeView_presets.HideSelection = false;\r
@@ -2587,13 +2662,12 @@ namespace Handbrake
             this.treeView_presets.Location = new System.Drawing.Point(10, 23);\r
             this.treeView_presets.Name = "treeView_presets";\r
             this.treeView_presets.ShowLines = false;\r
-            this.treeView_presets.Size = new System.Drawing.Size(177, 454);\r
+            this.treeView_presets.Size = new System.Drawing.Size(177, 473);\r
             this.treeView_presets.TabIndex = 2;\r
             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);\r
             // \r
             // toolStrip1\r
             // \r
-            this.toolStrip1.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;\r
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.btn_start,\r
@@ -2605,8 +2679,7 @@ namespace Handbrake
             this.toolStripSeparator8});\r
             this.toolStrip1.Location = new System.Drawing.Point(0, 24);\r
             this.toolStrip1.Name = "toolStrip1";\r
-            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;\r
-            this.toolStrip1.Size = new System.Drawing.Size(900, 39);\r
+            this.toolStrip1.Size = new System.Drawing.Size(931, 39);\r
             this.toolStrip1.TabIndex = 13;\r
             this.toolStrip1.Text = "toolStrip1";\r
             // \r
@@ -2670,13 +2743,33 @@ namespace Handbrake
             this.toolStripSeparator8.Name = "toolStripSeparator8";\r
             this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);\r
             // \r
+            // button1\r
+            // \r
+            this.button1.Location = new System.Drawing.Point(620, 29);\r
+            this.button1.Name = "button1";\r
+            this.button1.Size = new System.Drawing.Size(75, 23);\r
+            this.button1.TabIndex = 3;\r
+            this.button1.Text = "load";\r
+            this.button1.UseVisualStyleBackColor = true;\r
+            this.button1.Click += new System.EventHandler(this.button1_Click);\r
+            // \r
+            // button2\r
+            // \r
+            this.button2.Location = new System.Drawing.Point(699, 29);\r
+            this.button2.Name = "button2";\r
+            this.button2.Size = new System.Drawing.Size(75, 23);\r
+            this.button2.TabIndex = 15;\r
+            this.button2.Text = "save";\r
+            this.button2.UseVisualStyleBackColor = true;\r
+            this.button2.Click += new System.EventHandler(this.button2_Click);\r
+            // \r
             // frmMain\r
             // \r
-            this.AllowDrop = true;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(900, 621);\r
+            this.ClientSize = new System.Drawing.Size(931, 617);\r
+            this.Controls.Add(this.button2);\r
+            this.Controls.Add(this.button1);\r
             this.Controls.Add(this.lbl_encode);\r
             this.Controls.Add(this.toolStrip1);\r
             this.Controls.Add(this.groupBox2);\r
@@ -2754,32 +2847,23 @@ namespace Handbrake
         internal System.Windows.Forms.ComboBox drop_chapterFinish;\r
         internal System.Windows.Forms.ComboBox drop_chapterStart;\r
         internal System.Windows.Forms.ComboBox drp_dvdtitle;\r
-        internal System.Windows.Forms.RadioButton RadioDVD;\r
-        internal System.Windows.Forms.RadioButton RadioISO;\r
-        internal System.Windows.Forms.Button btn_Browse;\r
         internal System.Windows.Forms.Label Label17;\r
         internal System.Windows.Forms.TextBox text_source;\r
         internal System.Windows.Forms.Label Label9;\r
         internal System.Windows.Forms.Label Label10;\r
         internal System.Windows.Forms.GroupBox groupBox_output;\r
-        internal System.Windows.Forms.Button btn_destBrowse;\r
         internal System.Windows.Forms.Label Label3;\r
         internal System.Windows.Forms.ComboBox drp_videoEncoder;\r
         internal System.Windows.Forms.Label Label47;\r
         internal System.Windows.Forms.TextBox text_destination;\r
-        internal System.Windows.Forms.ComboBox drp_audioCodec;\r
-        internal System.Windows.Forms.Label Label12;\r
         private System.Windows.Forms.Label lbl_encode;\r
         internal System.Windows.Forms.TabPage TabPage2;\r
-        internal System.Windows.Forms.ComboBox drp_audioMixDown;\r
+        internal System.Windows.Forms.ComboBox drp_audmix_1;\r
         internal System.Windows.Forms.ComboBox drp_track1Audio;\r
-        internal System.Windows.Forms.ComboBox drp_audioBitrate;\r
-        internal System.Windows.Forms.Label Label14;\r
+        internal System.Windows.Forms.ComboBox drp_audbit_1;\r
         internal System.Windows.Forms.Label Label5;\r
-        internal System.Windows.Forms.Label Label16;\r
         internal System.Windows.Forms.Label Label32;\r
-        internal System.Windows.Forms.Label Label18;\r
-        internal System.Windows.Forms.ComboBox drp_audioSampleRate;\r
+        internal System.Windows.Forms.ComboBox drp_audsr_1;\r
         internal System.Windows.Forms.TabPage TabPage3;\r
         internal System.Windows.Forms.CheckBox check_largeFile;\r
         internal System.Windows.Forms.CheckBox check_turbo;\r
@@ -2847,15 +2931,12 @@ namespace Handbrake
         internal System.Windows.Forms.Label label28;\r
         internal System.Windows.Forms.TrackBar slider_drc;\r
         internal System.Windows.Forms.Label lbl_drc;\r
-        internal System.Windows.Forms.Label label21;\r
         private System.Windows.Forms.Label label30;\r
         private System.Windows.Forms.Label label29;\r
         private System.Windows.Forms.Label label23;\r
         private System.Windows.Forms.Label label7;\r
         private System.Windows.Forms.TabPage tab_chapters;\r
         internal System.Windows.Forms.Label label31;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn number;\r
-        private System.Windows.Forms.DataGridViewTextBoxColumn name;\r
         internal System.Windows.Forms.NumericUpDown text_right;\r
         internal System.Windows.Forms.NumericUpDown text_bottom;\r
         internal System.Windows.Forms.NumericUpDown text_top;\r
@@ -2878,7 +2959,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;\r
         private System.Windows.Forms.ToolStripButton btn_ActivityWindow;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;\r
-        private System.Windows.Forms.Label lbl_warn_chapt;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_handbrake_home;\r
         internal System.Windows.Forms.Button btn_removePreset;\r
         internal System.Windows.Forms.Button btn_addPreset;\r
@@ -2929,6 +3009,27 @@ namespace Handbrake
         internal System.Windows.Forms.Label label64;\r
         internal System.Windows.Forms.ComboBox drop_refFrames;\r
         internal System.Windows.Forms.CheckBox check_mixedReferences;\r
+        private System.Windows.Forms.Button button1;\r
+        private System.Windows.Forms.Button button2;\r
+        internal System.Windows.Forms.ComboBox drp_audmix_2;\r
+        internal System.Windows.Forms.Label label65;\r
+        internal System.Windows.Forms.Label label14;\r
+        internal System.Windows.Forms.ComboBox drp_audenc_2;\r
+        internal System.Windows.Forms.ComboBox drp_audenc_1;\r
+        internal System.Windows.Forms.Label label66;\r
+        internal System.Windows.Forms.ComboBox drp_audbit_2;\r
+        internal System.Windows.Forms.Label label67;\r
+        internal System.Windows.Forms.ComboBox drp_audsr_2;\r
+        internal System.Windows.Forms.Label label68;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn number;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn name;\r
+        internal System.Windows.Forms.Label label12;\r
+        private System.Windows.Forms.GroupBox groupBox4;\r
+        private System.Windows.Forms.GroupBox groupBox3;\r
+        private System.Windows.Forms.GroupBox groupBox5;\r
+        private System.Windows.Forms.CheckBox check_fileMode;\r
+        private System.Windows.Forms.Button btn_Browse;\r
+        private System.Windows.Forms.Button btn_destBrowse;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 728cd44..8e2d36c 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -471,15 +471,15 @@ namespace Handbrake
             text_source.Text = "";\r
             frmDvdInfo dvdInfoWindow = new frmDvdInfo();\r
 \r
-            if (RadioDVD.Checked)\r
+            if (check_fileMode.Checked)\r
             {\r
-                DVD_Open.ShowDialog();\r
-                filename = DVD_Open.SelectedPath;\r
+                ISO_Open.ShowDialog();\r
+                filename = ISO_Open.FileName;\r
             }\r
             else\r
             {\r
-                ISO_Open.ShowDialog();\r
-                filename = ISO_Open.FileName;\r
+                DVD_Open.ShowDialog();\r
+                filename = DVD_Open.SelectedPath;\r
             }\r
 \r
             if (filename.StartsWith("\\"))\r
@@ -537,33 +537,55 @@ namespace Handbrake
         {\r
             if ((path.EndsWith(".mp4")) || (path.EndsWith(".mp4")))\r
             {\r
-                drp_audioCodec.Items.Clear();\r
-                drp_audioCodec.Items.Add("AAC");\r
-                drp_audioCodec.Items.Add("AAC + AC3");\r
-                drp_audioCodec.SelectedIndex = 0;\r
+                drp_audenc_1.Items.Clear();\r
+                drp_audenc_1.Items.Add("AAC");\r
+                drp_audenc_1.SelectedIndex = 0;\r
+\r
+                drp_audenc_2.Items.Clear();\r
+                drp_audenc_2.Items.Add("AAC");\r
+                if (drp_audenc_2.Enabled)\r
+                    drp_audenc_2.SelectedIndex = 0;\r
             }\r
             else if (path.EndsWith(".avi"))\r
             {\r
-                drp_audioCodec.Items.Clear();\r
-                drp_audioCodec.Items.Add("MP3");\r
-                drp_audioCodec.Items.Add("AC3");\r
-                drp_audioCodec.SelectedIndex = 0;\r
+                drp_audenc_1.Items.Clear();\r
+                drp_audenc_1.Items.Add("MP3");\r
+                drp_audenc_1.Items.Add("AC3");\r
+                drp_audenc_1.SelectedIndex = 0;\r
+\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
+                    drp_audenc_2.SelectedIndex = 0;\r
             }\r
             else if (path.EndsWith(".ogm"))\r
             {\r
-                drp_audioCodec.Items.Clear();\r
-                drp_audioCodec.Items.Add("Vorbis");\r
-                drp_audioCodec.SelectedIndex = 0;\r
+                drp_audenc_1.Items.Clear();\r
+                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
             else if (path.EndsWith(".mkv"))\r
             {\r
-                drp_audioCodec.Items.Clear();\r
-                drp_audioCodec.Items.Add("AAC");\r
-                drp_audioCodec.Items.Add("AAC + AC3");\r
-                drp_audioCodec.Items.Add("MP3");\r
-                drp_audioCodec.Items.Add("AC3");\r
-                drp_audioCodec.Items.Add("Vorbis");\r
-                drp_audioCodec.SelectedIndex = 0;\r
+                drp_audenc_1.Items.Clear();\r
+                drp_audenc_1.Items.Add("AAC");\r
+                drp_audenc_1.Items.Add("MP3");\r
+                drp_audenc_1.Items.Add("AC3");\r
+                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("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
+                    drp_audenc_2.SelectedIndex = 0;\r
             }\r
         }\r
         #endregion\r
@@ -702,11 +724,6 @@ namespace Handbrake
             text_filesize.Text = "";\r
         }\r
 \r
-        private void label_h264_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)\r
-        {\r
-            Process.Start("http://handbrake.fr/trac/wiki/x264Options");\r
-        }\r
-\r
         private void text_width_TextChanged(object sender, EventArgs e)\r
         {\r
             try\r
@@ -920,100 +937,259 @@ namespace Handbrake
                 MessageBox.Show("There are no titles to select. Please scan the DVD by clicking the 'browse' button above before trying to select a title.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
         }\r
 \r
-        private void drp_audioCodec_SelectedIndexChanged(object sender, EventArgs e)\r
+        // Audio Track Changed\r
+        private void drp_track1Audio_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if (drp_audioCodec.Text == "AAC + AC3")\r
+            if (drp_track1Audio.SelectedItem.Equals("None"))\r
             {\r
-                drp_audioMixDown.Enabled = false;\r
-                drp_audioMixDown.Text = "Automatic";\r
-                text_destination.Text.Replace(".mp4", ".m4v");\r
+                drp_audbit_1.Enabled = false;\r
+                drp_audenc_1.Enabled = false;\r
+                drp_audsr_1.Enabled = false;\r
+                drp_audmix_1.Enabled = false;\r
+                drp_audbit_1.Text = "";\r
+                drp_audenc_1.Text = "";\r
+                drp_audsr_1.Text = "";\r
+                drp_audmix_1.Text = "";\r
             }\r
             else\r
             {\r
-                drp_audioMixDown.Enabled = true;\r
+                drp_audbit_1.Enabled = true;\r
+                drp_audenc_1.Enabled = true;\r
+                drp_audsr_1.Enabled = true;\r
+                drp_audmix_1.Enabled = true;\r
+                drp_audbit_1.Text = "160";\r
+                drp_audenc_1.Text = "AAC";\r
+                drp_audsr_1.Text = "48";\r
+                drp_audmix_1.Text = "Automatic";\r
             }\r
-\r
-            if (drp_audioCodec.Text == "AC3")\r
+        }\r
+        private void drp_track2Audio_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            if (drp_track2Audio.SelectedItem.Equals("None"))\r
             {\r
-                drp_audioBitrate.Enabled = false;\r
-                drp_audioSampleRate.Enabled = false;\r
-                drp_audioBitrate.Text = "";\r
-                drp_audioSampleRate.Text = "";\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
+                drp_audbit_2.Text = "";\r
+                drp_audenc_2.Text = "";\r
+                drp_audsr_2.Text = "";\r
+                drp_audmix_2.Text = "";\r
             }\r
             else\r
             {\r
-                drp_audioBitrate.Enabled = true;\r
-                drp_audioSampleRate.Enabled = true;\r
-                drp_audioBitrate.Text = "160";\r
-                drp_audioSampleRate.Text = "48";\r
-            }\r
-            if (drp_audioCodec.Text == "AAC")\r
-            {\r
-                drp_audioMixDown.Items.Clear();\r
-                drp_audioMixDown.Items.Add("Mono");\r
-                drp_audioMixDown.Items.Add("Stereo");\r
-                drp_audioMixDown.Items.Add("Dolby Surround");\r
-                drp_audioMixDown.Items.Add("Dolby Pro Logic II");\r
-                drp_audioMixDown.Items.Add("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_audbit_2.Enabled = true;\r
+                drp_audenc_2.Enabled = true;\r
+                drp_audsr_2.Enabled = true;\r
+                drp_audmix_2.Enabled = true;\r
+                drp_audbit_2.Text = "160";\r
+                drp_audenc_2.Text = "AAC";\r
+                drp_audsr_2.Text = "48";\r
+                drp_audmix_2.Text = "Automatic";\r
+            }\r
+        }\r
+        \r
+        // Audio Mixdown Selection Changed\r
+        private void drp_audioMixDown_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text == "6 Channel Discrete"))\r
+            {\r
+                drp_audbit_1.Items.Clear();\r
+                drp_audbit_1.Items.Add("32");\r
+                drp_audbit_1.Items.Add("40");\r
+                drp_audbit_1.Items.Add("48");\r
+                drp_audbit_1.Items.Add("56");\r
+                drp_audbit_1.Items.Add("64");\r
+                drp_audbit_1.Items.Add("80");\r
+                drp_audbit_1.Items.Add("86");\r
+                drp_audbit_1.Items.Add("112");\r
+                drp_audbit_1.Items.Add("128");\r
+                drp_audbit_1.Items.Add("160");\r
+                drp_audbit_1.Items.Add("192");\r
+                drp_audbit_1.Items.Add("224");\r
+                drp_audbit_1.Items.Add("256");\r
+                drp_audbit_1.Items.Add("320");\r
+                drp_audbit_1.Items.Add("384");\r
+            }\r
+            else if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text != "6 Channel Discrete"))\r
+            {\r
+                drp_audbit_1.Items.Clear();\r
+                drp_audbit_1.Items.Add("32");\r
+                drp_audbit_1.Items.Add("40");\r
+                drp_audbit_1.Items.Add("48");\r
+                drp_audbit_1.Items.Add("56");\r
+                drp_audbit_1.Items.Add("64");\r
+                drp_audbit_1.Items.Add("80");\r
+                drp_audbit_1.Items.Add("86");\r
+                drp_audbit_1.Items.Add("112");\r
+                drp_audbit_1.Items.Add("128");\r
+                drp_audbit_1.Items.Add("160");\r
+                drp_audbit_1.Text = "160";\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
+            {\r
+                drp_audbit_2.Items.Clear();\r
+                drp_audbit_2.Items.Add("32");\r
+                drp_audbit_2.Items.Add("40");\r
+                drp_audbit_2.Items.Add("48");\r
+                drp_audbit_2.Items.Add("56");\r
+                drp_audbit_2.Items.Add("64");\r
+                drp_audbit_2.Items.Add("80");\r
+                drp_audbit_2.Items.Add("86");\r
+                drp_audbit_2.Items.Add("112");\r
+                drp_audbit_2.Items.Add("128");\r
+                drp_audbit_2.Items.Add("160");\r
+                drp_audbit_2.Items.Add("192");\r
+                drp_audbit_2.Items.Add("224");\r
+                drp_audbit_2.Items.Add("256");\r
+                drp_audbit_2.Items.Add("320");\r
+                drp_audbit_2.Items.Add("384");\r
+            }\r
+        }\r
+\r
+        // Audio Encoder Selection Changed\r
+        private void drp_audenc_1_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            if (drp_audenc_1.Text == "AC3")\r
+            {\r
+                drp_audmix_1.Enabled = false;\r
+                drp_audbit_1.Enabled = false;\r
+                drp_audsr_1.Enabled = false;\r
+            }\r
+            else\r
+            {\r
+                drp_audmix_1.Enabled = true;\r
+                drp_audbit_1.Enabled = true;\r
+                drp_audsr_1.Enabled = true;\r
+\r
+                drp_audmix_1.Text = "Automatic";\r
+                drp_audbit_1.Text = "160";\r
+                drp_audsr_1.Text = "48";\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
+                drp_audbit_1.Items.Clear();\r
+                drp_audbit_1.Items.Add("32");\r
+                drp_audbit_1.Items.Add("40");\r
+                drp_audbit_1.Items.Add("48");\r
+                drp_audbit_1.Items.Add("56");\r
+                drp_audbit_1.Items.Add("64");\r
+                drp_audbit_1.Items.Add("80");\r
+                drp_audbit_1.Items.Add("86");\r
+                drp_audbit_1.Items.Add("112");\r
+                drp_audbit_1.Items.Add("128");\r
+                drp_audbit_1.Items.Add("160");\r
 \r
             }\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
+                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
+                drp_audbit_1.Items.Clear();\r
+                drp_audbit_1.Items.Add("32");\r
+                drp_audbit_1.Items.Add("40");\r
+                drp_audbit_1.Items.Add("48");\r
+                drp_audbit_1.Items.Add("56");\r
+                drp_audbit_1.Items.Add("64");\r
+                drp_audbit_1.Items.Add("80");\r
+                drp_audbit_1.Items.Add("86");\r
+                drp_audbit_1.Items.Add("112");\r
+                drp_audbit_1.Items.Add("128");\r
+                drp_audbit_1.Items.Add("160");\r
+                drp_audbit_1.Items.Add("192");\r
+                drp_audbit_1.Items.Add("224");\r
+                drp_audbit_1.Items.Add("256");\r
+                drp_audbit_1.Items.Add("320");\r
             }\r
         }\r
-\r
-        private void drp_audioMixDown_SelectedIndexChanged(object sender, EventArgs e)\r
+        private void drp_audenc_2_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if ((drp_audioCodec.Text == "AAC") && (drp_audioMixDown.Text == "6 Channel Discrete"))\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 = "";\r
+                drp_audbit_2.Text = "";\r
+                drp_audsr_2.Text = "";\r
+            }\r
+            else\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 = "48";\r
+                }\r
+\r
+\r
+            }\r
+\r
+            if (drp_audenc_2.Text == "AAC")\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
+                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
+                drp_audbit_2.Items.Clear();\r
+                drp_audbit_2.Items.Add("32");\r
+                drp_audbit_2.Items.Add("40");\r
+                drp_audbit_2.Items.Add("48");\r
+                drp_audbit_2.Items.Add("56");\r
+                drp_audbit_2.Items.Add("64");\r
+                drp_audbit_2.Items.Add("80");\r
+                drp_audbit_2.Items.Add("86");\r
+                drp_audbit_2.Items.Add("112");\r
+                drp_audbit_2.Items.Add("128");\r
+                drp_audbit_2.Items.Add("160");\r
+\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
+                drp_audbit_2.Items.Clear();\r
+                drp_audbit_2.Items.Add("32");\r
+                drp_audbit_2.Items.Add("40");\r
+                drp_audbit_2.Items.Add("48");\r
+                drp_audbit_2.Items.Add("56");\r
+                drp_audbit_2.Items.Add("64");\r
+                drp_audbit_2.Items.Add("80");\r
+                drp_audbit_2.Items.Add("86");\r
+                drp_audbit_2.Items.Add("112");\r
+                drp_audbit_2.Items.Add("128");\r
+                drp_audbit_2.Items.Add("160");\r
+                drp_audbit_2.Items.Add("192");\r
+                drp_audbit_2.Items.Add("224");\r
+                drp_audbit_2.Items.Add("256");\r
+                drp_audbit_2.Items.Add("320");\r
             }\r
         }\r
 \r
@@ -1604,6 +1780,61 @@ namespace Handbrake
 \r
         #endregion\r
 \r
+        private void button1_Click(object sender, EventArgs e)\r
+        {\r
+            string filename;\r
+            File_Open.ShowDialog();\r
+            filename = File_Open.FileName;\r
+\r
+            if (filename != "")\r
+            {\r
+                try\r
+                {\r
+                    // Create StreamReader & open file\r
+                    StreamReader line = new StreamReader(filename);\r
+\r
+                    // Send the query from the file to the Query Parser class then load the preset\r
+                    Functions.QueryParser presetQuery = Functions.QueryParser.Parse(line.ReadLine());\r
+                    hb_common_func.presetLoader(this, presetQuery, filename);\r
+\r
+                    // Close the stream\r
+                    line.Close();\r
+\r
+                }\r
+                catch (Exception exc)\r
+                {\r
+                    MessageBox.Show("Unable to load profile. \n\n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+                }\r
+            }\r
+        }\r
+\r
+        private void button2_Click(object sender, EventArgs e)\r
+        {\r
+            string filename;\r
+            File_Save.ShowDialog();\r
+            filename = File_Save.FileName;\r
+            if (filename != "")\r
+            {\r
+                try\r
+                {\r
+                    // Create a StreamWriter and open the file\r
+                    StreamWriter line = new StreamWriter(filename);\r
+\r
+                    // Generate and write the query string to the file\r
+                    String query = hb_common_func.GenerateTheQuery(this);\r
+                    line.WriteLine(query);\r
+\r
+                    // close the stream\r
+                    line.Close();\r
+                    MessageBox.Show("Your profile has been sucessfully saved.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
+                }\r
+                catch (Exception)\r
+                {\r
+                    MessageBox.Show("Unable to write to the file. Please make sure the location has the correct permissions for file writing.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);\r
+                }\r
+\r
+            }\r
+        }\r
 \r
 \r
 \r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 94bba95..7276f60 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -1,7 +1,7 @@
 /*  frmOptions.Designer.cs \r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 000afdc..d233b57 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -1,7 +1,7 @@
 /*  frmOptions.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index d4e5346..3d860ce 100644 (file)
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -1,7 +1,7 @@
 /*  frmQueue.Designer.cs \r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 61e07d3..280d48b 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -1,7 +1,7 @@
 /*  frmQueue.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
@@ -236,7 +236,7 @@ namespace Handbrake
                 }\r
 \r
                 lbl_vEnc.Text = parsed.VideoEncoder;\r
-                lbl_aEnc.Text = parsed.AudioEncoder;\r
+                lbl_aEnc.Text = parsed.AudioEncoder1;\r
             }\r
             catch (Exception)\r
             {\r

diff --git a/win/C#/frmReadDVD.Designer.cs b/win/C#/frmReadDVD.Designer.cs
index 903d7fc..b92bd3c 100644 (file)
--- a/win/C#/frmReadDVD.Designer.cs
+++ b/win/C#/frmReadDVD.Designer.cs
@@ -1,7 +1,7 @@
 /*  frmReadDVD.Designer.cs \r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index 300c21e..edb5987 100644 (file)
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -1,7 +1,7 @@
 /*  frmReadDVD.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/frmSplashScreen.Designer.cs b/win/C#/frmSplashScreen.Designer.cs
index caf36fc..51891e4 100644 (file)
--- a/win/C#/frmSplashScreen.Designer.cs
+++ b/win/C#/frmSplashScreen.Designer.cs
@@ -1,7 +1,7 @@
 /*  frmSplashScreen.Designer.cs \r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r

diff --git a/win/C#/frmSplashScreen.cs b/win/C#/frmSplashScreen.cs
index a60703b..6525072 100644 (file)
--- a/win/C#/frmSplashScreen.cs
+++ b/win/C#/frmSplashScreen.cs
@@ -1,7 +1,7 @@
 /*  frmSplashScreen.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r

diff --git a/win/C#/frmUpdater.Designer.cs b/win/C#/frmUpdater.Designer.cs
index 33ebf6b..db1caa4 100644 (file)
--- a/win/C#/frmUpdater.Designer.cs
+++ b/win/C#/frmUpdater.Designer.cs
@@ -1,7 +1,7 @@
 /*  frmUpdater.Designer.cs \r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r

diff --git a/win/C#/frmUpdater.cs b/win/C#/frmUpdater.cs
index 9180f6d..67f850d 100644 (file)
--- a/win/C#/frmUpdater.cs
+++ b/win/C#/frmUpdater.cs
@@ -1,7 +1,7 @@
 /*  frmUpdater.cs $\r
        \r
           This file is part of the HandBrake source code.\r
-          Homepage: <http://handbrake.m0k.org/>.\r
+          Homepage: <http://handbrake.fr>.\r
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r