diff options
| author | sr55 <[email protected]> | 2017-03-17 22:33:48 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2017-03-17 22:33:48 +0000 |
| commit | efabefce58e323bc453aa7f7e65004d8880f9efa (patch) | |
| tree | 79505319e9a1b46f6ef77dfc4290364525668a6c /win/CS/HandBrake.ApplicationServices/Interop | |
| parent | 6c6570a326e12edb04498b3272b916eb8d431319 (diff) | |
WinGui: Remove Usage of System.ComponentModel.DataAnnotations - DisplayName as it's not currently compatible with .NET standard.
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Interop')
3 files changed, 21 insertions, 24 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs index b73829fc8..26ac4883c 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Anamorphic.cs @@ -9,8 +9,6 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
{
- using System.ComponentModel.DataAnnotations;
-
using HandBrake.ApplicationServices.Attributes;
/// <summary>
@@ -18,16 +16,16 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding /// </summary>
public enum Anamorphic
{
- [Display(Name = "None")]
+ [DisplayName("None")]
[ShortName("none")]
None = 0,
- [Display(Name = "Automatic")]
+ [DisplayName("Automatic")]
[ShortName("auto")]
Automatic = 4,
- [Display(Name = "Loose")]
+ [DisplayName("Loose")]
[ShortName("loose")]
Loose = 2,
- [Display(Name = "Custom")]
+ [DisplayName("Custom")]
[ShortName("custom")]
Custom = 3
}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Container.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Container.cs index 0140c5678..b8eab8dad 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Container.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Container.cs @@ -10,7 +10,8 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
{
using System;
- using System.ComponentModel.DataAnnotations;
+
+ using HandBrake.ApplicationServices.Attributes;
/// <summary>
/// The container.
@@ -20,9 +21,9 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding {
None = 0x0,
- [Display(Name = "MP4")]
+ [DisplayName("MP4")]
MP4,
- [Display(Name = "MKV")]
+ [DisplayName("MKV")]
MKV
}
}
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/VideoEncoder.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/VideoEncoder.cs index 077b9a642..e2b82db1d 100644 --- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/VideoEncoder.cs +++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/VideoEncoder.cs @@ -9,8 +9,6 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
{
- using System.ComponentModel.DataAnnotations;
-
using HandBrake.ApplicationServices.Attributes;
/// <summary>
@@ -18,55 +16,55 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding /// </summary>
public enum VideoEncoder
{
- [Display(Name = "H.264 (x264)")]
+ [DisplayName("H.264 (x264)")]
[ShortName("x264")]
X264 = 0,
- [Display(Name = "H.264 10-bit (x264)")]
+ [DisplayName("H.264 10-bit (x264)")]
[ShortName("x264_10bit")]
X264_10,
- [Display(Name = "H.264 (Intel QSV)")]
+ [DisplayName("H.264 (Intel QSV)")]
[ShortName("qsv_h264")]
QuickSync,
- [Display(Name = "MPEG-4")]
+ [DisplayName("MPEG-4")]
[ShortName("mpeg4")]
FFMpeg,
- [Display(Name = "MPEG-2")]
+ [DisplayName("MPEG-2")]
[ShortName("mpeg2")]
FFMpeg2,
- [Display(Name = "Theora")]
+ [DisplayName("Theora")]
[ShortName("theora")]
Theora,
- [Display(Name = "H.265 (x265)")]
+ [DisplayName("H.265 (x265)")]
[ShortName("x265")]
X265,
- [Display(Name = "H.265 12-bit (x265)")]
+ [DisplayName("H.265 12-bit (x265)")]
[ShortName("x265_12bit")]
X265_12,
- [Display(Name = "H.265 10-bit (x265)")]
+ [DisplayName("H.265 10-bit (x265)")]
[ShortName("x265_10bit")]
X265_10,
- [Display(Name = "H.265 (Intel QSV)")]
+ [DisplayName("H.265 (Intel QSV)")]
[ShortName("qsv_h265")]
QuickSyncH265,
- [Display(Name = "H.265 10-bit (Intel QSV)")]
+ [DisplayName("H.265 10-bit (Intel QSV)")]
[ShortName("qsv_h265_10bit")]
QuickSyncH26510b,
- [Display(Name = "VP8")]
+ [DisplayName("VP8")]
[ShortName("VP8")]
VP8,
- [Display(Name = "VP9")]
+ [DisplayName("VP9")]
[ShortName("VP9")]
VP9
}
|