Fixed double-spaced lines when logging multi-line messages from the core.

Added some keep_aspect constants and updated the audio codec mask.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs
index ef98f3f8678b1b5eee2c99fe99ba31db42a6f672..e5fa11709e7cd83f7ef1de205a9364f22fee635e 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs
@@ -145,15 +145,10 @@ namespace HandBrake.ApplicationServices.Interop
         /// </param>\r
         public static void LoggingHandler(string message)\r
         {\r
+               message = message.TrimEnd();\r
             if (!string.IsNullOrEmpty(message))\r
             {\r
-                string[] messageParts = message.Split(new[] { "\n" }, StringSplitOptions.RemoveEmptyEntries);\r
-\r
-                if (messageParts.Length > 0)\r
-                {\r
-                    message = messageParts[0];\r
-                    SendMessageEvent(message);\r
-                }\r
+                   SendMessageEvent(message);\r
             }\r
         }\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs
index 0bcbc18cf3c9b8515425b40fc464c7c355b88bdf..787bb7c72e0992faf4b552636ba97d9f9777e976 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs
@@ -13,7 +13,7 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
     public class NativeConstants\r
     {\r
         // Audio encoders\r
-        public const uint HB_ACODEC_MASK = 0x00FFFF00;\r
+        public const uint HB_ACODEC_MASK = 0x03FFFF00;\r
         public const uint HB_ACODEC_LAME = 0x00000200;\r
         public const uint HB_ACODEC_VORBIS = 0x00000400;\r
         public const uint HB_ACODEC_AC3 = 0x00000800;\r
@@ -58,5 +58,10 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
         public const int HB_STATE_PAUSED = 16;\r
         public const int HB_STATE_WORKDONE = 32;\r
         public const int HB_STATE_MUXING = 64;\r
-    }\r
+\r
+        // Keep aspect ratio values\r
+        public const int HB_KEEP_WIDTH = 0x01;\r
+        public const int HB_KEEP_HEIGHT = 0x02;\r
+        public const int HB_KEEP_DISPLAY_ASPECT = 0x04;\r
+       }\r
 }\r