From 5782d9084db2e3b4f2b5d4dfc8d5dfef02498906 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 27 Jun 2013 12:36:41 -0400 Subject: fixes #299 - Add trailer urls to MovieDbProvider --- MediaBrowser.Model/Dto/BaseItemDto.cs | 12 +----------- MediaBrowser.Model/Entities/MediaUrl.cs | 11 +++++++++++ MediaBrowser.Model/MediaBrowser.Model.csproj | 1 + MediaBrowser.Model/Querying/ItemFields.cs | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 MediaBrowser.Model/Entities/MediaUrl.cs (limited to 'MediaBrowser.Model') diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index f5398ddd5..149029b59 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -160,7 +160,7 @@ namespace MediaBrowser.Model.Dto /// Gets or sets the trailer urls. /// /// The trailer urls. - public List TrailerUrls { get; set; } + public List RemoteTrailers { get; set; } /// /// Gets or sets the provider ids. @@ -614,16 +614,6 @@ namespace MediaBrowser.Model.Dto get { return ImageTags != null && ImageTags.ContainsKey(ImageType.Menu); } } - /// - /// Gets a value indicating whether this instance is video. - /// - /// true if this instance is video; otherwise, false. - [IgnoreDataMember] - public bool HasTrailer - { - get { return LocalTrailerCount > 0 || (TrailerUrls != null && TrailerUrls.Count > 0); } - } - /// /// Gets a value indicating whether this instance is video. /// diff --git a/MediaBrowser.Model/Entities/MediaUrl.cs b/MediaBrowser.Model/Entities/MediaUrl.cs new file mode 100644 index 000000000..b99879650 --- /dev/null +++ b/MediaBrowser.Model/Entities/MediaUrl.cs @@ -0,0 +1,11 @@ + +namespace MediaBrowser.Model.Entities +{ + public class MediaUrl + { + public string Url { get; set; } + public string Name { get; set; } + public bool? IsHD { get; set; } + public bool IsDirectLink { get; set; } + } +} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 06dfa776d..6b1c728e2 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -52,6 +52,7 @@ + diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index a8a58d6a6..b6f452d7c 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -154,7 +154,7 @@ namespace MediaBrowser.Model.Querying /// /// The trailer url of the item /// - TrailerUrls, + RemoteTrailers, /// /// The user data of the item -- cgit v1.2.3