Merge pull request #8 from jellyfin/master

rebase to latest master

16 files changed, 18 insertions, 26 deletions

diff --git a/MediaBrowser.Model/Querying/AllThemeMediaResult.cs b/MediaBrowser.Model/Querying/AllThemeMediaResult.cs
index 89640eb65b..f843a33e68 100644
--- a/MediaBrowser.Model/Querying/AllThemeMediaResult.cs
+++ b/MediaBrowser.Model/Querying/AllThemeMediaResult.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Querying
+namespace MediaBrowser.Model.Querying
 {
     public class AllThemeMediaResult
     {
@@ -7,7 +7,7 @@
         public ThemeMediaResult ThemeSongsResult { get; set; }
 
         public ThemeMediaResult SoundtrackSongsResult { get; set; }
-        
+
         public AllThemeMediaResult()
         {
             ThemeVideosResult = new ThemeMediaResult();
@@ -17,4 +17,4 @@
             SoundtrackSongsResult = new ThemeMediaResult();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Querying/EpisodeQuery.cs b/MediaBrowser.Model/Querying/EpisodeQuery.cs
index 78fe943e33..0c8ea7ed4c 100644
--- a/MediaBrowser.Model/Querying/EpisodeQuery.cs
+++ b/MediaBrowser.Model/Querying/EpisodeQuery.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     public class EpisodeQuery
@@ -53,7 +52,7 @@ namespace MediaBrowser.Model.Querying
         /// </summary>
         /// <value>The start item identifier.</value>
         public string StartItemId { get; set; }
-   
+
         public EpisodeQuery()
         {
             Fields = new ItemFields[] { };
diff --git a/MediaBrowser.Model/Querying/ItemCountsQuery.cs b/MediaBrowser.Model/Querying/ItemCountsQuery.cs
index 0bf681537b..02b809fa88 100644
--- a/MediaBrowser.Model/Querying/ItemCountsQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemCountsQuery.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index 92fa3822b6..af1aaf486c 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Querying
+namespace MediaBrowser.Model.Querying
 {
     /// <summary>
     /// Used to control the data that gets attached to DtoBaseItems
@@ -41,7 +41,7 @@
         /// The custom rating
         /// </summary>
         CustomRating,
-        
+
         /// <summary>
         /// The date created of the item
         /// </summary>
diff --git a/MediaBrowser.Model/Querying/ItemFilter.cs b/MediaBrowser.Model/Querying/ItemFilter.cs
index ff28bd08c4..b8dcfbdad3 100644
--- a/MediaBrowser.Model/Querying/ItemFilter.cs
+++ b/MediaBrowser.Model/Querying/ItemFilter.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/ItemSortBy.cs b/MediaBrowser.Model/Querying/ItemSortBy.cs
index 66bdc8aa5b..1b20f43ac8 100644
--- a/MediaBrowser.Model/Querying/ItemSortBy.cs
+++ b/MediaBrowser.Model/Querying/ItemSortBy.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/LatestItemsQuery.cs b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
index 88b079595d..4a5818ac5f 100644
--- a/MediaBrowser.Model/Querying/LatestItemsQuery.cs
+++ b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Querying
@@ -70,7 +70,7 @@ namespace MediaBrowser.Model.Querying
 
         public LatestItemsQuery()
         {
-            EnableImageTypes = new ImageType[] {};
+            EnableImageTypes = new ImageType[] { };
         }
     }
 }
diff --git a/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs b/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
index 91417a4a77..52c1383558 100644
--- a/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
+++ b/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     public class MovieRecommendationQuery
diff --git a/MediaBrowser.Model/Querying/NextUpQuery.cs b/MediaBrowser.Model/Querying/NextUpQuery.cs
index d20ff99c2c..ff146cedee 100644
--- a/MediaBrowser.Model/Querying/NextUpQuery.cs
+++ b/MediaBrowser.Model/Querying/NextUpQuery.cs
@@ -1,5 +1,5 @@
-using MediaBrowser.Model.Entities;
 using System;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Querying
 {
@@ -16,13 +16,13 @@ namespace MediaBrowser.Model.Querying
         /// </summary>
         /// <value>The parent identifier.</value>
         public string ParentId { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the series id.
         /// </summary>
         /// <value>The series id.</value>
         public string SeriesId { get; set; }
-        
+
         /// <summary>
         /// Skips over a given number of items within the results. Use for paging.
         /// </summary>
@@ -60,7 +60,7 @@ namespace MediaBrowser.Model.Querying
 
         public NextUpQuery()
         {
-            EnableImageTypes = new ImageType[] {};
+            EnableImageTypes = new ImageType[] { };
             EnableTotalRecordCount = true;
         }
     }
diff --git a/MediaBrowser.Model/Querying/QueryFilters.cs b/MediaBrowser.Model/Querying/QueryFilters.cs
index f46650a035..2f38299db3 100644
--- a/MediaBrowser.Model/Querying/QueryFilters.cs
+++ b/MediaBrowser.Model/Querying/QueryFilters.cs
@@ -1,5 +1,5 @@
-using MediaBrowser.Model.Dto;
 using System;
+using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.Querying
 {
diff --git a/MediaBrowser.Model/Querying/QueryResult.cs b/MediaBrowser.Model/Querying/QueryResult.cs
index 6f9923d087..e81f2b8682 100644
--- a/MediaBrowser.Model/Querying/QueryResult.cs
+++ b/MediaBrowser.Model/Querying/QueryResult.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     public class QueryResult<T>
diff --git a/MediaBrowser.Model/Querying/SessionQuery.cs b/MediaBrowser.Model/Querying/SessionQuery.cs
index fa7df315ca..1fac9d639b 100644
--- a/MediaBrowser.Model/Querying/SessionQuery.cs
+++ b/MediaBrowser.Model/Querying/SessionQuery.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/SimilarItemsQuery.cs b/MediaBrowser.Model/Querying/SimilarItemsQuery.cs
index 0dd4915508..68f761bd4d 100644
--- a/MediaBrowser.Model/Querying/SimilarItemsQuery.cs
+++ b/MediaBrowser.Model/Querying/SimilarItemsQuery.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Querying
+namespace MediaBrowser.Model.Querying
 {
     public class SimilarItemsQuery
     {
diff --git a/MediaBrowser.Model/Querying/ThemeMediaResult.cs b/MediaBrowser.Model/Querying/ThemeMediaResult.cs
index eae102baea..bae954d78e 100644
--- a/MediaBrowser.Model/Querying/ThemeMediaResult.cs
+++ b/MediaBrowser.Model/Querying/ThemeMediaResult.cs
@@ -1,5 +1,5 @@
-using MediaBrowser.Model.Dto;
 using System;
+using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.Querying
 {
diff --git a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
index 665b980eb8..5eac2860da 100644
--- a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
+++ b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Querying
 {
@@ -51,7 +51,7 @@ namespace MediaBrowser.Model.Querying
 
         public UpcomingEpisodesQuery()
         {
-            EnableImageTypes = new ImageType[] {};
+            EnableImageTypes = new ImageType[] { };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Querying/UserQuery.cs b/MediaBrowser.Model/Querying/UserQuery.cs
index 48dbd30aa9..55cef664e7 100644
--- a/MediaBrowser.Model/Querying/UserQuery.cs
+++ b/MediaBrowser.Model/Querying/UserQuery.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     public class UserQuery