WinGui: Use OutputFormat display name, rather than the enum name.

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

2 files changed, 4 insertions, 4 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index be719701b..201ffc1e1 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -518,7 +518,7 @@ namespace HandBrake.ApplicationServices.Model
         {

             get

             {

-                if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4)

+                if (this.OutputFormat == OutputFormat.Mp4)

                 {

                     bool audio = this.AudioTracks.Any(item => item.Encoder == AudioEncoder.Ac3Passthrough ||

                         item.Encoder == AudioEncoder.Ac3 || item.Encoder == AudioEncoder.DtsPassthrough || item.Encoder == AudioEncoder.Passthrough);

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
index d083e853c..828746f17 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
@@ -10,6 +10,7 @@
 namespace HandBrake.ApplicationServices.Model.Encoding

 {

     using System.ComponentModel;

+    using System.ComponentModel.DataAnnotations;

 

     /// <summary>

     /// The Output format.

@@ -17,12 +18,11 @@ namespace HandBrake.ApplicationServices.Model.Encoding
     public enum OutputFormat

     {

         [Description("MP4")]

+        [Display(Name = "MP4")]

         Mp4 = 0,

 

-        [Description("M4V")]

-        M4V,

-

         [Description("MKV")]

+        [Display(Name = "MKV")]

         Mkv,

     }

 }