From: RandomEngy <david.rickard@gmail.com>
Date: Sat, 30 Jul 2016 18:14:23 +0000 (-0700)
Subject: Fixed double-spaced lines when logging multi-line messages from the core.
X-Git-Tag: 1.0.0~287^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66c8424fa167c32453dd8bca3ba142bd6301613f;p=handbrake

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 ef98f3f86..e5fa11709 100644
--- 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>
         public static void LoggingHandler(string message)
         {
+	        message = message.TrimEnd();
             if (!string.IsNullOrEmpty(message))
             {
-                string[] messageParts = message.Split(new[] { "\n" }, StringSplitOptions.RemoveEmptyEntries);
-
-                if (messageParts.Length > 0)
-                {
-                    message = messageParts[0];
-                    SendMessageEvent(message);
-                }
+	            SendMessageEvent(message);
             }
         }
 
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs
index 0bcbc18cf..787bb7c72 100644
--- 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
     {
         // Audio encoders
-        public const uint HB_ACODEC_MASK = 0x00FFFF00;
+        public const uint HB_ACODEC_MASK = 0x03FFFF00;
         public const uint HB_ACODEC_LAME = 0x00000200;
         public const uint HB_ACODEC_VORBIS = 0x00000400;
         public const uint HB_ACODEC_AC3 = 0x00000800;
@@ -58,5 +58,10 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
         public const int HB_STATE_PAUSED = 16;
         public const int HB_STATE_WORKDONE = 32;
         public const int HB_STATE_MUXING = 64;
-    }
+
+        // Keep aspect ratio values
+        public const int HB_KEEP_WIDTH = 0x01;
+        public const int HB_KEEP_HEIGHT = 0x02;
+        public const int HB_KEEP_DISPLAY_ASPECT = 0x04;
+	}
 }