diff options
| author | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-20 13:45:33 -0700 |
|---|---|---|
| committer | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-20 13:45:33 -0700 |
| commit | afa9f14cdb383302862b403fd038b95b5709a6aa (patch) | |
| tree | bdf19f7e5f43d43a0db84c5712e3e2e4e7252ba0 /MediaBrowser.Model | |
| parent | d5e49f590d8e027a8755ea607bf3caba3ddcc9f1 (diff) | |
| parent | 0d518ebf170eefc29fd164eabcbd8d4152177fee (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Dto/BaseItemDto.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/MediaVersionInfo.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/ItemFields.cs | 5 |
3 files changed, 11 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index 451afee6ba..aba7e217e2 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -89,6 +89,12 @@ namespace MediaBrowser.Model.Dto public ExternalUrl[] ExternalUrls { get; set; } /// <summary> + /// Gets or sets the media versions. + /// </summary> + /// <value>The media versions.</value> + public List<MediaVersionInfo> MediaVersions { get; set; } + + /// <summary> /// Gets or sets the critic rating. /// </summary> /// <value>The critic rating.</value> diff --git a/MediaBrowser.Model/Dto/MediaVersionInfo.cs b/MediaBrowser.Model/Dto/MediaVersionInfo.cs index 809a1e3d9b..dfbf81416f 100644 --- a/MediaBrowser.Model/Dto/MediaVersionInfo.cs +++ b/MediaBrowser.Model/Dto/MediaVersionInfo.cs @@ -24,7 +24,5 @@ namespace MediaBrowser.Model.Dto public List<MediaStream> MediaStreams { get; set; } public List<ChapterInfoDto> Chapters { get; set; } - - public bool? IsHD { get; set; } } } diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index 85f49ce3eb..405ba3d777 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -77,6 +77,11 @@ namespace MediaBrowser.Model.Querying Keywords, /// <summary> + /// The media versions + /// </summary> + MediaVersions, + + /// <summary> /// The metadata settings /// </summary> Settings, |