extract classes

6 files changed, 86 insertions, 81 deletions

diff --git a/MediaBrowser.Model/Channels/AllChannelMediaQuery.cs b/MediaBrowser.Model/Channels/AllChannelMediaQuery.cs
new file mode 100644
index 000000000..c5631899e
--- /dev/null
+++ b/MediaBrowser.Model/Channels/AllChannelMediaQuery.cs
@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Model.Channels
+{
+    public class AllChannelMediaQuery
+    {
+        /// <summary>
+        /// Gets or sets the channel ids.
+        /// </summary>
+        /// <value>The channel ids.</value>
+        public string[] ChannelIds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>The user identifier.</value>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        /// <value>The start index.</value>
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        /// <value>The limit.</value>
+        public int? Limit { 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 AllChannelMediaQuery()
+        {
+            ChannelIds = new string[] { };
+
+            ContentTypes = new ChannelMediaContentType[] { };
+            ExtraTypes = new ExtraType[] { };
+            TrailerTypes = new TrailerType[] { };
+
+            Filters = new ItemFilter[] { };
+            Fields = new List<ItemFields>();
+        }
+
+        public ItemFilter[] Filters { get; set; }
+        public List<ItemFields> Fields { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Channels/ChannelFeatures.cs b/MediaBrowser.Model/Channels/ChannelFeatures.cs
index ef9ef67f2..8dfdbcd7a 100644
--- a/MediaBrowser.Model/Channels/ChannelFeatures.cs
+++ b/MediaBrowser.Model/Channels/ChannelFeatures.cs
@@ -82,15 +82,4 @@ namespace MediaBrowser.Model.Channels
             DefaultSortFields = new List<ChannelItemSortField>();
         }
     }
-
-    public enum ChannelItemSortField
-    {
-        Name = 0,
-        CommunityRating = 1,
-        PremiereDate = 2,
-        DateCreated = 3,
-        Runtime = 4,
-        PlayCount = 5,
-        CommunityPlayCount = 6
-    }
 }
diff --git a/MediaBrowser.Model/Channels/ChannelFolderType.cs b/MediaBrowser.Model/Channels/ChannelFolderType.cs
new file mode 100644
index 000000000..9261cb5cd
--- /dev/null
+++ b/MediaBrowser.Model/Channels/ChannelFolderType.cs
@@ -0,0 +1,11 @@
+namespace MediaBrowser.Model.Channels
+{
+    public enum ChannelFolderType
+    {
+        Container = 0,
+
+        MusicAlbum = 1,
+
+        PhotoAlbum = 2
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Channels/ChannelItemSortField.cs b/MediaBrowser.Model/Channels/ChannelItemSortField.cs
new file mode 100644
index 000000000..6b5015b77
--- /dev/null
+++ b/MediaBrowser.Model/Channels/ChannelItemSortField.cs
@@ -0,0 +1,13 @@
+namespace MediaBrowser.Model.Channels
+{
+    public enum ChannelItemSortField
+    {
+        Name = 0,
+        CommunityRating = 1,
+        PremiereDate = 2,
+        DateCreated = 3,
+        Runtime = 4,
+        PlayCount = 5,
+        CommunityPlayCount = 6
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Channels/ChannelMediaType.cs b/MediaBrowser.Model/Channels/ChannelMediaType.cs
index cf3239c9b..102cb6644 100644
--- a/MediaBrowser.Model/Channels/ChannelMediaType.cs
+++ b/MediaBrowser.Model/Channels/ChannelMediaType.cs
@@ -8,13 +8,4 @@
 
         Photo = 2
     }
-
-    public enum ChannelFolderType
-    {
-        Container = 0,
-
-        MusicAlbum = 1,
-
-        PhotoAlbum = 2
-    }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Channels/ChannelQuery.cs b/MediaBrowser.Model/Channels/ChannelQuery.cs
index cb61f358c..3c6e43fde 100644
--- a/MediaBrowser.Model/Channels/ChannelQuery.cs
+++ b/MediaBrowser.Model/Channels/ChannelQuery.cs
@@ -1,8 +1,4 @@
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Model.Channels
+namespace MediaBrowser.Model.Channels
 {
     public class ChannelQuery
     {
@@ -36,60 +32,4 @@ namespace MediaBrowser.Model.Channels
         /// <value><c>null</c> if [is favorite] contains no value, <c>true</c> if [is favorite]; otherwise, <c>false</c>.</value>
         public bool? IsFavorite { get; set; }
     }
-
-    public class AllChannelMediaQuery
-    {
-        /// <summary>
-        /// Gets or sets the channel ids.
-        /// </summary>
-        /// <value>The channel ids.</value>
-        public string[] ChannelIds { get; set; }
-
-        /// <summary>
-        /// Gets or sets the user identifier.
-        /// </summary>
-        /// <value>The user identifier.</value>
-        public string UserId { get; set; }
-
-        /// <summary>
-        /// Skips over a given number of items within the results. Use for paging.
-        /// </summary>
-        /// <value>The start index.</value>
-        public int? StartIndex { get; set; }
-
-        /// <summary>
-        /// The maximum number of items to return
-        /// </summary>
-        /// <value>The limit.</value>
-        public int? Limit { 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 AllChannelMediaQuery()
-        {
-            ChannelIds = new string[] { };
-
-            ContentTypes = new ChannelMediaContentType[] { };
-            ExtraTypes = new ExtraType[] { };
-            TrailerTypes = new TrailerType[] { };
-
-            Filters = new ItemFilter[] { };
-            Fields = new List<ItemFields>();
-        }
-
-        public ItemFilter[] Filters { get; set; }
-        public List<ItemFields> Fields { get; set; }
-    }
-
 }