WinGui: When Changing the output format, limit to only valid choices in the video and audio encoder dropdowns.

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

3 files changed, 191 insertions, 12 deletions

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
new file mode 100644
index 000000000..5c82b33ed
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
@@ -0,0 +1,95 @@
+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="AudioEncoderConverter.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Audio Encoder Converter

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

+

+namespace HandBrakeWPF.Converters.Audio

+{

+    using System;

+    using System.Collections.Generic;

+    using System.Globalization;

+    using System.Linq;

+    using System.Windows.Data;

+

+    using HandBrake.ApplicationServices.Functions;

+    using HandBrake.ApplicationServices.Model;

+    using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.Interop.Model.Encoding;

+

+    /// <summary>

+    /// Audio Encoder Converter

+    /// </summary>

+    public class AudioEncoderConverter : IMultiValueConverter

+    {

+        /// <summary>

+        /// Gets a list of audio encoders OR returns the string name of an encoder depending on the input.

+        /// </summary>

+        /// <param name="values">

+        /// The values.

+        /// </param>

+        /// <param name="targetType">

+        /// The target type.

+        /// </param>

+        /// <param name="parameter">

+        /// The parameter.

+        /// </param>

+        /// <param name="culture">

+        /// The culture.

+        /// </param>

+        /// <returns>

+        /// IEnumberable AudioEncoder or String encoder name.

+        /// </returns>

+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)

+        {

+            // TODO -> Be smarter and only show the available Passthru options.

+            if (values.Count() == 2)

+            {

+                List<AudioEncoder> encoders = EnumHelper<AudioEncoder>.GetEnumList().ToList();

+                EncodeTask task = values[1] as EncodeTask;

+

+                if (task != null && task.OutputFormat != OutputFormat.Mkv)

+                {

+                    encoders.Remove(AudioEncoder.Vorbis);

+                    encoders.Remove(AudioEncoder.ffflac);

+                }

+

+                return EnumHelper<AudioEncoder>.GetEnumDisplayValuesSubset(encoders);

+            }

+

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

+        }

+

+        /// <summary>

+        /// Convert from a string name, to enum value.

+        /// </summary>

+        /// <param name="value">

+        /// The value.

+        /// </param>

+        /// <param name="targetTypes">

+        /// The target types.

+        /// </param>

+        /// <param name="parameter">

+        /// The parameter.

+        /// </param>

+        /// <param name="culture">

+        /// The culture.

+        /// </param>

+        /// <returns>

+        /// Returns the audio encoder enum item.

+        /// </returns>

+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)

+        {

+            string name = value as string;

+            if (!string.IsNullOrEmpty(name))

+            {

+                return new object[] { EnumHelper<AudioEncoder>.GetValue(name)};

+            }

+

+            return null;

+        }

+    }

+}

diff --git a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
index bb6a4be61..a4b8b6df0 100644
--- a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
@@ -65,10 +65,7 @@ namespace HandBrakeWPF.Converters
             {

                 return EnumHelper<Mixdown>.GetEnumDisplayValues(typeof(Mixdown));

             }

-            if (value is IEnumerable<AudioEncoder>)

-            {

-                return EnumHelper<AudioEncoder>.GetEnumDisplayValues(typeof(AudioEncoder));

-            }

+ 

             if (value is IEnumerable<PresetPictureSettingsMode>)

             {

                 return EnumHelper<PresetPictureSettingsMode>.GetEnumDisplayValues(typeof(PresetPictureSettingsMode));

@@ -113,10 +110,7 @@ namespace HandBrakeWPF.Converters
             {

                 return EnumHelper<Mixdown>.GetDisplay((Mixdown)value);

             }

-            if (targetType == typeof(AudioEncoder) || value.GetType() == typeof(AudioEncoder))

-            {

-                return EnumHelper<AudioEncoder>.GetDisplay((AudioEncoder)value);

-            }

+  

             if (targetType == typeof(PresetPictureSettingsMode) || value.GetType() == typeof(PresetPictureSettingsMode))

             {

                 return EnumHelper<PresetPictureSettingsMode>.GetDisplay((PresetPictureSettingsMode)value);

@@ -188,10 +182,7 @@ namespace HandBrakeWPF.Converters
             {

                 return EnumHelper<Mixdown>.GetValue(value.ToString());

             }

-            if (targetType == typeof(AudioEncoder) || value.GetType() == typeof(AudioEncoder))

-            {

-                return EnumHelper<AudioEncoder>.GetValue(value.ToString());

-            }

+

             if (targetType == typeof(PresetPictureSettingsMode) || value.GetType() == typeof(PresetPictureSettingsMode))

             {

                 return EnumHelper<PresetPictureSettingsMode>.GetValue(value.ToString());

diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
new file mode 100644
index 000000000..a6f29357f
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -0,0 +1,93 @@
+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="VideoEncoderConverter.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Video Encoder Converter

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

+

+namespace HandBrakeWPF.Converters.Video

+{

+    using System;

+    using System.Collections.Generic;

+    using System.Globalization;

+    using System.Linq;

+    using System.Windows.Data;

+

+    using HandBrake.ApplicationServices.Functions;

+    using HandBrake.ApplicationServices.Model;

+    using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.Interop.Model.Encoding;

+

+    /// <summary>

+    /// Video Encoder Converter

+    /// </summary>

+    public class VideoEncoderConverter : IMultiValueConverter

+    {

+        /// <summary>

+        /// Gets a list of Video encoders OR returns the string name of an encoder depending on the input.

+        /// </summary>

+        /// <param name="values">

+        /// The values.

+        /// </param>

+        /// <param name="targetType">

+        /// The target type.

+        /// </param>

+        /// <param name="parameter">

+        /// The parameter.

+        /// </param>

+        /// <param name="culture">

+        /// The culture.

+        /// </param>

+        /// <returns>

+        /// IEnumberable VideoEncoder or String encoder name.

+        /// </returns>

+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)

+        {

+            if (values.Count() == 2)

+            {

+                List<VideoEncoder> encoders = EnumHelper<VideoEncoder>.GetEnumList().ToList();

+                EncodeTask task = values[1] as EncodeTask;

+

+                if (task != null && task.OutputFormat != OutputFormat.Mkv)

+                {

+                    encoders.Remove(VideoEncoder.Theora);

+                }

+

+                return EnumHelper<VideoEncoder>.GetEnumDisplayValuesSubset(encoders);

+            }

+

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

+        }

+

+        /// <summary>

+        /// Convert from a string name, to enum value.

+        /// </summary>

+        /// <param name="value">

+        /// The value.

+        /// </param>

+        /// <param name="targetTypes">

+        /// The target types.

+        /// </param>

+        /// <param name="parameter">

+        /// The parameter.

+        /// </param>

+        /// <param name="culture">

+        /// The culture.

+        /// </param>

+        /// <returns>

+        /// Returns the video encoder enum item.

+        /// </returns>

+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)

+        {

+            string name = value as string;

+            if (!string.IsNullOrEmpty(name))

+            {

+                return new object[] { EnumHelper<VideoEncoder>.GetValue(name)};

+            }

+

+            return null;

+        }

+    }

+}