WinGui: Add TrueHD, Flac and EAC3 Passthru, and EAC3 encoder options. Fixed No Audio Behaviour. Misc other experimental UX/UI code.

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

2 files changed, 9 insertions, 2 deletions

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
index 89fcd58a9..4e7f6069a 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioBitrateConverter.cs
@@ -99,6 +99,9 @@ namespace HandBrakeWPF.Converters.Audio
                     case AudioEncoder.Passthrough:

                     case AudioEncoder.ffflac:

                     case AudioEncoder.ffflac24:

+                    case AudioEncoder.EAc3Passthrough:

+                    case AudioEncoder.TrueHDPassthrough:

+                    case AudioEncoder.FlacPassthru:

                         max = 1536; // Since we don't care, just set it to the max.

                         break;

                     case AudioEncoder.fdkaac:

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
index 3ced1e9c2..ff6eaec06 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
@@ -13,9 +13,9 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Collections.Generic;

     using System.Globalization;

     using System.Linq;

+    using System.Windows;

     using System.Windows.Data;

 

-    using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Utilities;

@@ -57,22 +57,26 @@ namespace HandBrakeWPF.Converters.Audio
                     encoders.Remove(AudioEncoder.Vorbis);

                     encoders.Remove(AudioEncoder.ffflac);

                     encoders.Remove(AudioEncoder.ffflac24);

+                    encoders.Remove(AudioEncoder.FlacPassthru);

                 }

 

                 if (parameter != null && parameter.ToString() == "True")

                 {

                     encoders.Remove(AudioEncoder.DtsHDPassthrough);

                     encoders.Remove(AudioEncoder.DtsPassthrough);

+                    encoders.Remove(AudioEncoder.EAc3Passthrough);

                     encoders.Remove(AudioEncoder.AacPassthru);

                     encoders.Remove(AudioEncoder.Ac3Passthrough);

                     encoders.Remove(AudioEncoder.Mp3Passthru);

                     encoders.Remove(AudioEncoder.Passthrough);

+                    encoders.Remove(AudioEncoder.TrueHDPassthrough);

+                    encoders.Remove(AudioEncoder.FlacPassthru);

                 }

 

                 return EnumHelper<AudioEncoder>.GetEnumDisplayValuesSubset(encoders);

             }

 

-            if (values.Any())

+            if (values.Any() && values.First() != DependencyProperty.UnsetValue)

             {

                 return EnumHelper<AudioEncoder>.GetDisplay((AudioEncoder)values[0]);

             }