diff options
| author | sr55 <[email protected]> | 2014-08-21 15:47:07 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-08-21 15:47:07 +0000 |
| commit | 2839ca4c710c080467da7f9d485446400b1e4588 (patch) | |
| tree | 7e92e723d206a758e66353090654f4dae136dbef /win/CS/HandBrake.ApplicationServices | |
| parent | 084f08caa5811d92c8865e9ec46a7849f00a9294 (diff) | |
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
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices')
4 files changed, 5 insertions, 6 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,
}
}
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs index 9e8bc3c32..970fb5c97 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs @@ -129,7 +129,6 @@ namespace HandBrake.ApplicationServices.Utilities switch (work.OutputFormat)
{
case OutputFormat.Mp4:
- case OutputFormat.M4V:
profile.ContainerName = "av_mp4"; // TODO make part of enum.
break;
case OutputFormat.Mkv:
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs index 70a7b9403..08c746ba0 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs @@ -136,7 +136,7 @@ namespace HandBrake.ApplicationServices.Utilities AddEncodeElement(xmlWriter, "ChapterMarkers", "integer", parsed.IncludeChapterMarkers ? "1" : "0");
AddEncodeElement(xmlWriter, "Default", "integer", "0");
- AddEncodeElement(xmlWriter, "FileFormat", "string", (parsed.OutputFormat == OutputFormat.Mp4 || parsed.OutputFormat == OutputFormat.M4V) ? "MP4 file" : "MKV file");
+ AddEncodeElement(xmlWriter, "FileFormat", "string", (parsed.OutputFormat == OutputFormat.Mp4) ? "MP4 file" : "MKV file");
AddBooleanElement(xmlWriter, "Folder", false);
AddEncodeElement(xmlWriter, "Mp4HttpOptimize", "integer", parsed.OptimizeMP4 ? "1" : "0");
AddEncodeElement(xmlWriter, "Mp4iPodCompatible", "integer", parsed.IPod5GSupport ? "1" : "0");
|