From 66c8424fa167c32453dd8bca3ba142bd6301613f Mon Sep 17 00:00:00 2001 From: RandomEngy Date: Sat, 30 Jul 2016 11:14:23 -0700 Subject: Fixed double-spaced lines when logging multi-line messages from the core. Added some keep_aspect constants and updated the audio codec mask. --- win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs | 9 ++------- .../Interop/HbLib/NativeConstants.cs | 9 +++++++-- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'win') 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 /// 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; + } } -- cgit v1.2.3 From e1fd81b631045af761e46a208ea1d54b3fec0fbe Mon Sep 17 00:00:00 2001 From: RandomEngy Date: Sat, 30 Jul 2016 11:17:02 -0700 Subject: Removed tabs --- win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'win') diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs index e5fa11709..1acb411b0 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeUtils.cs @@ -145,10 +145,10 @@ namespace HandBrake.ApplicationServices.Interop /// public static void LoggingHandler(string message) { - message = message.TrimEnd(); + message = message.TrimEnd(); if (!string.IsNullOrEmpty(message)) { - SendMessageEvent(message); + SendMessageEvent(message); } } -- cgit v1.2.3