WinGui: Couple of Audio and Advanced Panel bug fixes.
authorsr55 <sr55.hb@outlook.com>
Sat, 24 Nov 2012 11:24:43 +0000 (11:24 +0000)
committersr55 <sr55.hb@outlook.com>
Sat, 24 Nov 2012 11:24:43 +0000 (11:24 +0000)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5080 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
win/CS/HandBrakeWPF/Views/AdvancedView.xaml

index 25d59529b62d6e1326fa35f9ed2b202cfc38e642..83e551b429234aebe6d42bd254c48e326418c561 100644 (file)
@@ -723,12 +723,8 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
                 if (!string.IsNullOrEmpty(fallbackEncoders))\r
                 {\r
-                    // Special Case, The CLI alredy defaults to ALL, so if all area selected, then just set copy-mask to none\r
-                    if (fallbackEncoders == "aac,ac3,dtshd,dts,mp3")\r
-                    {\r
-                        query += string.Format(" --audio-copy-mask none");\r
-                    }\r
-                    else\r
+                    // Special Case, The CLI alredy defaults to ALL, so if all area selected, then don't need to set copy mask\r
+                    if (fallbackEncoders != "aac,ac3,dtshd,dts,mp3")\r
                     {\r
                         query += string.Format(" --audio-copy-mask {0}", fallbackEncoders);\r
                     }\r
index 5cfa1f413423ec1d480eaf613e27ad994a2af169..e66ea09208c2730b3e3b346d69aba051352fc772 100644 (file)
@@ -14,11 +14,8 @@ namespace HandBrakeWPF.ViewModels
     using System.Globalization;\r
     using System.Linq;\r
 \r
-    using Caliburn.Micro;\r
-\r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Parsing;\r
-    using HandBrake.ApplicationServices.Services.Interfaces;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
     using HandBrakeWPF.Helpers;\r
@@ -32,6 +29,11 @@ namespace HandBrakeWPF.ViewModels
     {\r
         #region Constants and Fields\r
 \r
+        /// <summary>\r
+        /// AdvancedOptionsCache;\r
+        /// </summary>\r
+        private string optionsCache = string.Empty;\r
+\r
         /// <summary>\r
         /// Backing field for displaying x264 options\r
         /// </summary>\r
@@ -164,13 +166,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>\r
         /// Initializes a new instance of the <see cref="AdvancedViewModel"/> class.\r
         /// </summary>\r
-        /// <param name="windowManager">\r
-        /// The window manager.\r
-        /// </param>\r
-        /// <param name="userSettingService">\r
-        /// The user Setting Service.\r
-        /// </param>\r
-        public AdvancedViewModel(IWindowManager windowManager, IUserSettingService userSettingService)\r
+        public AdvancedViewModel()\r
         {\r
             this.Task = new EncodeTask();\r
             this.UpdateUIFromAdvancedOptions();\r
@@ -913,11 +909,28 @@ namespace HandBrakeWPF.ViewModels
         /// </param>\r
         public void SetEncoder(VideoEncoder encoder)\r
         {\r
-            this.DisplayX264Options = encoder == VideoEncoder.X264;\r
-            if (encoder == VideoEncoder.Theora)\r
+            // If we are switching from x264, cache it's settings.\r
+            if (this.DisplayX264Options.HasValue && this.DisplayX264Options.Value )\r
             {\r
+                this.optionsCache = this.AdvancedOptionsString;\r
+            }\r
+\r
+            // UI Set for new encoder.\r
+            if (encoder == VideoEncoder.X264)\r
+            {\r
+                this.AdvancedOptionsString = optionsCache;\r
+                this.DisplayX264Options = true;\r
+            }\r
+            else if (encoder == VideoEncoder.Theora)\r
+            {\r
+                this.AdvancedOptionsString = string.Empty;\r
                 this.DisplayX264Options = null;\r
             }\r
+            else\r
+            {\r
+                this.AdvancedOptionsString = string.Empty;\r
+                this.DisplayX264Options = false;\r
+            }     \r
         }\r
 \r
         #endregion\r
index 674c86eca370cf4f557ca2fdc1edd6be8e8cca56..f1a48b91f2aa8710fa4a0f3767611431d2abe88f 100644 (file)
                         <TextBlock Grid.Row="0"\r
                                    Margin="10,5,0,0"\r
                                    FontWeight="Bold"\r
-                                   Text="Psychvisual: "\r
+                                   Text="Psychovisual: "\r
                                    />\r
                         <StackPanel Orientation="Horizontal">\r
                             <Label Width="110"\r