diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-06-16 14:10:58 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-06-16 14:10:58 -0400 |
| commit | 4f791d6ee1712439c8485260221a8c0aa64760f2 (patch) | |
| tree | 88bd1f7e13bfda15644a054cd205f64753d25275 /MediaBrowser.Model/Entities | |
| parent | d9406d48ca0231bc096aeadc595c30f0596c8dda (diff) | |
| parent | 7498b7b5b7e2f7ddf380df1f47421d26c8171418 (diff) | |
Merge branch 'dev'
Diffstat (limited to 'MediaBrowser.Model/Entities')
| -rw-r--r-- | MediaBrowser.Model/Entities/ImageType.cs | 24 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaStream.cs | 5 |
2 files changed, 16 insertions, 13 deletions
diff --git a/MediaBrowser.Model/Entities/ImageType.cs b/MediaBrowser.Model/Entities/ImageType.cs index 18097abb44..6e0ba717f0 100644 --- a/MediaBrowser.Model/Entities/ImageType.cs +++ b/MediaBrowser.Model/Entities/ImageType.cs @@ -9,50 +9,50 @@ namespace MediaBrowser.Model.Entities /// <summary> /// The primary /// </summary> - Primary, + Primary = 0, /// <summary> /// The art /// </summary> - Art, + Art = 1, /// <summary> /// The backdrop /// </summary> - Backdrop, + Backdrop = 2, /// <summary> /// The banner /// </summary> - Banner, + Banner = 3, /// <summary> /// The logo /// </summary> - Logo, + Logo = 4, /// <summary> /// The thumb /// </summary> - Thumb, + Thumb = 5, /// <summary> /// The disc /// </summary> - Disc, + Disc = 6, /// <summary> /// The box /// </summary> - Box, + Box = 7, /// <summary> /// The screenshot /// </summary> - Screenshot, + Screenshot = 8, /// <summary> /// The menu /// </summary> - Menu, + Menu = 9, /// <summary> /// The chapter image /// </summary> - Chapter, + Chapter = 10, /// <summary> /// The box rear /// </summary> - BoxRear + BoxRear = 11 } } diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index 64c7d9aa6c..868f6b64f5 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 @@ -89,7 +92,7 @@ namespace MediaBrowser.Model.Entities if (!string.IsNullOrEmpty(Language)) { - attributes.Add(Language); + attributes.Add(StringHelper.FirstToUpper(Language)); } if (!string.IsNullOrEmpty(Codec)) { |