diff options
Diffstat (limited to 'MediaBrowser.Model/Entities')
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaStream.cs | 26 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaUrl.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/VideoSize.cs | 8 |
3 files changed, 8 insertions, 27 deletions
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index 6a3c08425..af7a034fe 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -36,6 +36,9 @@ namespace MediaBrowser.Model.Entities /// <value>The comment.</value> public string Comment { get; set; } + public string TimeBase { get; set; } + public string CodecTimeBase { get; set; } + public string Title { get; set; } public string DisplayTitle @@ -72,15 +75,12 @@ namespace MediaBrowser.Model.Entities { attributes.Add(StringHelper.ToStringCultureInvariant(Channels.Value) + " ch"); } - - string name = string.Join(" ", attributes.ToArray()); - if (IsDefault) { - name += " (D)"; + attributes.Add("Default"); } - return name; + return string.Join(" ", attributes.ToArray()); } if (Type == MediaStreamType.Subtitle) @@ -91,27 +91,17 @@ namespace MediaBrowser.Model.Entities { attributes.Add(StringHelper.FirstToUpper(Language)); } - if (!string.IsNullOrEmpty(Codec)) - { - attributes.Add(Codec); - } - - string name = string.Join(" ", attributes.ToArray()); - if (IsDefault) { - name += " (D)"; + attributes.Add("Default"); } if (IsForced) { - name += " (F)"; + attributes.Add("Forced"); } - if (IsExternal) - { - name += " (EXT)"; - } + string name = string.Join(" ", attributes.ToArray()); return name; } diff --git a/MediaBrowser.Model/Entities/MediaUrl.cs b/MediaBrowser.Model/Entities/MediaUrl.cs index 24e3b1492..2e17bba8a 100644 --- a/MediaBrowser.Model/Entities/MediaUrl.cs +++ b/MediaBrowser.Model/Entities/MediaUrl.cs @@ -5,6 +5,5 @@ namespace MediaBrowser.Model.Entities { public string Url { get; set; } public string Name { get; set; } - public VideoSize? VideoSize { get; set; } } } diff --git a/MediaBrowser.Model/Entities/VideoSize.cs b/MediaBrowser.Model/Entities/VideoSize.cs deleted file mode 100644 index 0100f3b90..000000000 --- a/MediaBrowser.Model/Entities/VideoSize.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MediaBrowser.Model.Entities -{ - public enum VideoSize - { - StandardDefinition, - HighDefinition - } -}
\ No newline at end of file |