WinGui: Add support for new Mixdowns (6.1, 7.1, 7.1 (5F/2R/LFE), Mono left only, Mono Right only). Please note this will break any presets that currently have 6ch (aka 5.1 or 6 Channels Discrete) Presets must be re-created.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4934 b64f7644-9d1e-0410-96f1-a4d463321fa5

4 files changed, 52 insertions, 11 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
index e2b11d4b8..0638a8e28 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
@@ -62,14 +62,24 @@ namespace HandBrake.ApplicationServices.Utilities
             {

                 case "mono":

                     return "Mono";

+                case "left_only":

+                    return "Mono (Left Only)";

+                case "right_only":

+                    return "Mono (Right Only)";

                 case "stereo":

                     return "Stereo";

                 case "dpl1":

                     return "Dolby Surround";

                 case "dpl2":

                     return "Dolby Pro Logic II";

-                case "6ch":

-                    return "6-channel discrete";

+                case "5point1":

+                    return "5.1 Channels";

+                case "6point1":

+                    return "6.1 Channels";

+                case "7point1":

+                    return "7.1 Channels";

+                case "5_2_lfe":

+                    return "7.1 (5F/2R/LFE)";

                 default:

                     return "Automatic";

             }

@@ -92,8 +102,14 @@ namespace HandBrake.ApplicationServices.Utilities
                     return Mixdown.DolbySurround;

                 case "Dolby Pro Logic II":

                     return Mixdown.DolbyProLogicII;

-                case "6-channel discrete":

-                    return Mixdown.SixChannelDiscrete;

+                case "5.1 Channels":

+                    return Mixdown.FivePoint1Channels;

+                case "6.1 Channels":

+                    return Mixdown.SixPoint1Channels;

+                case "7.1 Channels":

+                    return Mixdown.SevenPoint1Channels;

+                case "7.1 (5F/2R/LFE)":

+                    return Mixdown.Five_2_LFE;

                 case "None":

                 case "Passthru":

                     return Mixdown.None;

@@ -116,14 +132,24 @@ namespace HandBrake.ApplicationServices.Utilities
                     return "auto";

                 case Mixdown.Mono:

                     return "mono";

+                case Mixdown.LeftOnly:

+                    return "left_only";

+                case Mixdown.RightOnly:

+                    return "right_only";

                 case Mixdown.Stereo:

                     return "stereo";

                 case Mixdown.DolbySurround:

                     return "dpl1";

                 case Mixdown.DolbyProLogicII:

                     return "dpl2";

-                case Mixdown.SixChannelDiscrete:

-                    return "6ch";

+                case Mixdown.FivePoint1Channels:

+                    return "5point1";

+                case Mixdown.SixPoint1Channels:

+                    return "6point1";

+                case Mixdown.SevenPoint1Channels:

+                    return "7point1";

+                case Mixdown.Five_2_LFE:

+                    return "5_2_lfe";

                 default:

                     return "auto";

             }

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs
index cc12aa514..bc34ac380 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs
@@ -89,7 +89,7 @@ namespace HandBrake.Interop
 					return NativeConstants.HB_AMIXDOWN_DOLBY;

 				case Mixdown.Mono:

 					return NativeConstants.HB_AMIXDOWN_MONO;

-				case Mixdown.SixChannelDiscrete:

+				case Mixdown.FivePoint1Channels:

 					return NativeConstants.HB_AMIXDOWN_6CH;

 				case Mixdown.Stereo:

 					return NativeConstants.HB_AMIXDOWN_STEREO;

@@ -125,7 +125,7 @@ namespace HandBrake.Interop
 				case NativeConstants.HB_AMIXDOWN_DOLBYPLII:

 					return Mixdown.DolbyProLogicII;

 				case NativeConstants.HB_AMIXDOWN_6CH:

-					return Mixdown.SixChannelDiscrete;

+					return Mixdown.FivePoint1Channels;

 			}

 

 			throw new ArgumentException("Unrecognized mixdown: " + mixdown, "mixdown");

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs
index 280a5cd2d..ff5d5828e 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs
@@ -25,14 +25,29 @@ namespace HandBrake.Interop.Model.Encoding
 		[Display(Name = "Mono")]

 		Mono,

 

+        [Display(Name = "Mono (Left Only)")]

+        LeftOnly,

+

+        [Display(Name = "Mono (Right Only)")]

+        RightOnly,

+

 		[Display(Name = "Stereo")]

 		Stereo,

 

 		[Display(Name = "Dolby Surround")]

 		DolbySurround,

 

-		[Display(Name = "6-channel discrete")]

-		SixChannelDiscrete,

+		[Display(Name = "5.1 Channels")]

+		FivePoint1Channels,

+

+        [Display(Name = "6.1 Channels")]

+        SixPoint1Channels,

+

+        [Display(Name = "7.1 Channels")]

+        SevenPoint1Channels,

+

+        [Display(Name = "7.1 (5F/2R/LFE)")]

+        Five_2_LFE,

 

         [Display(Name = "None")]

         None,

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
index cc1915e4b..9eb4253ad 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
@@ -53,7 +53,7 @@ namespace HandBrakeWPF.Converters.Audio
                 {

                     case AudioEncoder.Faac:

                     case AudioEncoder.ffaac:

-                        max = track.MixDown == Mixdown.SixChannelDiscrete ? 768 : 320;

+                        max = track.MixDown == Mixdown.FivePoint1Channels ? 768 : 320;

                         break;

                     case AudioEncoder.Lame:

                         max = 320;