update channels

3 files changed, 27 insertions, 4 deletions

diff --git a/MediaBrowser.Controller/Channels/ChannelItemInfo.cs b/MediaBrowser.Controller/Channels/ChannelItemInfo.cs
index a0fbd9245e..587023ab48 100644
--- a/MediaBrowser.Controller/Channels/ChannelItemInfo.cs
+++ b/MediaBrowser.Controller/Channels/ChannelItemInfo.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Controller.Channels
         public List<string> Tags { get; set; }
 
         public List<PersonInfo> People { get; set; }
-        
+
         public float? CommunityRating { get; set; }
 
         public long? RunTimeTicks { get; set; }
@@ -37,7 +37,7 @@ namespace MediaBrowser.Controller.Channels
 
         public ChannelMediaContentType ContentType { get; set; }
         public ExtraType ExtraType { get; set; }
-        public TrailerType TrailerType { get; set; }
+        public List<TrailerType> TrailerTypes { get; set; }
 
         public Dictionary<string, string> ProviderIds { get; set; }
 
@@ -56,6 +56,7 @@ namespace MediaBrowser.Controller.Channels
         public ChannelItemInfo()
         {
             MediaSources = new List<ChannelMediaInfo>();
+            TrailerTypes = new List<TrailerType>();
             Genres = new List<string>();
             Studios = new List<string>();
             People = new List<PersonInfo>();
diff --git a/MediaBrowser.Controller/Channels/ChannelVideoItem.cs b/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
index 1ee0bbe4a3..e6fa459723 100644
--- a/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
+++ b/MediaBrowser.Controller/Channels/ChannelVideoItem.cs
@@ -31,7 +31,7 @@ namespace MediaBrowser.Controller.Channels
         {
             if (ContentType == ChannelMediaContentType.MovieExtra)
             {
-                var key = this.GetProviderId(MetadataProviders.Tmdb) ?? this.GetProviderId(MetadataProviders.Tvdb) ?? this.GetProviderId(MetadataProviders.Imdb) ?? this.GetProviderId(MetadataProviders.Tvcom);
+                var key = this.GetProviderId(MetadataProviders.Imdb) ?? this.GetProviderId(MetadataProviders.Tmdb);
 
                 if (!string.IsNullOrWhiteSpace(key))
                 {
diff --git a/MediaBrowser.Controller/Channels/InternalAllChannelMediaQuery.cs b/MediaBrowser.Controller/Channels/InternalAllChannelMediaQuery.cs
index de99c16c48..ce091da7ec 100644
--- a/MediaBrowser.Controller/Channels/InternalAllChannelMediaQuery.cs
+++ b/MediaBrowser.Controller/Channels/InternalAllChannelMediaQuery.cs
@@ -1,8 +1,30 @@
-
+using MediaBrowser.Model.Channels;
+using MediaBrowser.Model.Entities;
+
 namespace MediaBrowser.Controller.Channels
 {
     public class InternalAllChannelMediaQuery
     {
         public string UserId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the content types.
+        /// </summary>
+        /// <value>The content types.</value>
+        public ChannelMediaContentType[] ContentTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the extra types.
+        /// </summary>
+        /// <value>The extra types.</value>
+        public ExtraType[] ExtraTypes { get; set; }
+        public TrailerType[] TrailerTypes { get; set; }
+
+        public InternalAllChannelMediaQuery()
+        {
+            ContentTypes = new ChannelMediaContentType[] { };
+            ExtraTypes = new ExtraType[] { };
+            TrailerTypes = new TrailerType[] { };
+        }
     }
 }
\ No newline at end of file