6 files changed, 14 insertions, 204 deletions
diff --git a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
index e3abd5974..5fe77d41e 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
@@ -98,7 +98,7 @@ namespace MediaBrowser.Model.LiveTv
         public LiveTvChannelQuery()
         {
             EnableUserData = true;
-            SortBy = new string[] {};
+            SortBy = Array.Empty<string>();
         }
     }
 }
diff --git a/MediaBrowser.Model/LiveTv/LiveTvInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs
index 331b1101b..68281d79b 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvInfo.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs
@@ -25,8 +25,8 @@ namespace MediaBrowser.Model.LiveTv
 
         public LiveTvInfo()
         {
-            Services = new LiveTvServiceInfo[] { };
-            EnabledUsers = new string[] {};
+            Services = Array.Empty<LiveTvServiceInfo>();
+            EnabledUsers = Array.Empty<string>();
         }
     }
-}
-\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index eb4f20f9e..6a688c7b4 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -25,9 +25,9 @@ namespace MediaBrowser.Model.LiveTv
 
         public LiveTvOptions()
         {
-            TunerHosts = new TunerHostInfo[] { };
-            ListingProviders = new ListingsProviderInfo[] { };
-            MediaLocationsCreated = new string[] { };
+            TunerHosts = Array.Empty<TunerHostInfo>();
+            ListingProviders = Array.Empty<ListingsProviderInfo>();
+            MediaLocationsCreated = Array.Empty<string>();
             RecordingPostProcessorArguments = "\"{path}\"";
         }
     }
@@ -76,13 +76,13 @@ namespace MediaBrowser.Model.LiveTv
 
         public ListingsProviderInfo()
         {
-            NewsCategories = new string[] { "news", "journalism", "documentary", "current affairs" };
-            SportsCategories = new string[] { "sports", "basketball", "baseball", "football" };
-            KidsCategories = new string[] { "kids", "family", "children", "childrens", "disney" };
-            MovieCategories = new string[] { "movie" };
-            EnabledTuners = new string[] { };
+            NewsCategories = new [] { "news", "journalism", "documentary", "current affairs" };
+            SportsCategories = new [] { "sports", "basketball", "baseball", "football" };
+            KidsCategories = new [] { "kids", "family", "children", "childrens", "disney" };
+            MovieCategories = new [] { "movie" };
+            EnabledTuners = Array.Empty<string>();
             EnableAllTuners = true;
-            ChannelMappings = new NameValuePair[] {};
+            ChannelMappings = Array.Empty<NameValuePair>();
         }
     }
 }
diff --git a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
index 23eedfc88..4b7ee971c 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
@@ -52,7 +52,7 @@ namespace MediaBrowser.Model.LiveTv
 
         public LiveTvServiceInfo()
         {
-            Tuners = new string[] { };
+            Tuners = Array.Empty<string>();
         }
     }
 }
diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
deleted file mode 100644
index 89160948c..000000000
--- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using MediaBrowser.Model.Entities;
-using System;
-using MediaBrowser.Model.Querying;
-
-namespace MediaBrowser.Model.LiveTv
-{
-    /// <summary>
-    /// Class ProgramQuery.
-    /// </summary>
-    public class ProgramQuery
-    {
-        public ProgramQuery()
-        {
-            ChannelIds = new Guid[] { };
-            OrderBy = new Tuple<string, SortOrder>[] { };
-            Genres = new string[] {};
-            GenreIds = new Guid[] { };
-            EnableTotalRecordCount = true;
-            EnableUserData = true;
-        }
-
-        public bool EnableTotalRecordCount { get; set; }
-        public bool EnableUserData { get; set; }
-
-        /// <summary>
-        /// Fields to return within the items, in addition to basic information
-        /// </summary>
-        /// <value>The fields.</value>
-        public ItemFields[] Fields { get; set; }
-        public bool? EnableImages { get; set; }
-        public int? ImageTypeLimit { get; set; }
-        public ImageType[] EnableImageTypes { get; set; }
-        
-        /// <summary>
-        /// Gets or sets the channel ids.
-        /// </summary>
-        /// <value>The channel ids.</value>
-        public Guid[] ChannelIds { get; set; }
-
-        /// <summary>
-        /// Gets or sets the user identifier.
-        /// </summary>
-        /// <value>The user identifier.</value>
-        public string UserId { get; set; }
-        public string SeriesTimerId { get; set; }
-        public string Name { get; set; }
-
-        /// <summary>
-        /// The earliest date for which a program starts to return
-        /// </summary>
-        public DateTime? MinStartDate { get; set; }
-
-        /// <summary>
-        /// The latest date for which a program starts to return
-        /// </summary>
-        public DateTime? MaxStartDate { get; set; }
-
-        /// <summary>
-        /// The earliest date for which a program ends to return
-        /// </summary>
-        public DateTime? MinEndDate { get; set; }
-
-        /// <summary>
-        /// The latest date for which a program ends to return
-        /// </summary>
-        public DateTime? MaxEndDate { get; set; }
-
-        /// <summary>
-        /// Used to specific whether to return news or not
-        /// </summary>
-        /// <remarks>If set to null, all programs will be returned</remarks>
-        public bool? IsNews { get; set; }
-
-        /// <summary>
-        /// Used to specific whether to return movies or not
-        /// </summary>
-        /// <remarks>If set to null, all programs will be returned</remarks>
-        public bool? IsMovie { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is kids.
-        /// </summary>
-        /// <value><c>null</c> if [is kids] contains no value, <c>true</c> if [is kids]; otherwise, <c>false</c>.</value>
-        public bool? IsKids { get; set; }
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is sports.
-        /// </summary>
-        /// <value><c>null</c> if [is sports] contains no value, <c>true</c> if [is sports]; otherwise, <c>false</c>.</value>
-        public bool? IsSports { get; set; }
-        
-        /// <summary>
-        /// Skips over a given number of items within the results. Use for paging.
-        /// </summary>
-        public int? StartIndex { get; set; }
-        public bool? IsSeries { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance has aired.
-        /// </summary>
-        /// <value><c>null</c> if [has aired] contains no value, <c>true</c> if [has aired]; otherwise, <c>false</c>.</value>
-        public bool? HasAired { get; set; }
-
-        /// <summary>
-        /// The maximum number of items to return
-        /// </summary>
-        public int? Limit { get; set; }
-
-        public Tuple<string, SortOrder>[] OrderBy { get; set; }
-
-        /// <summary>
-        /// Limit results to items containing specific genres
-        /// </summary>
-        /// <value>The genres.</value>
-        public Guid[] GenreIds { get; set; }
-        public string[] Genres { get; set; }
-    }
-}
-\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
deleted file mode 100644
index 9972c4c3f..000000000
--- a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Querying;
-using System;
-
-namespace MediaBrowser.Model.LiveTv
-{
-    public class RecommendedProgramQuery
-    {
-        /// <summary>
-        /// Fields to return within the items, in addition to basic information
-        /// </summary>
-        /// <value>The fields.</value>
-        public ItemFields[] Fields { get; set; }
-        public bool? EnableImages { get; set; }
-        public int? ImageTypeLimit { get; set; }
-        public ImageType[] EnableImageTypes { get; set; }
-        public Guid[] GenreIds { get; set; }
-
-        public bool EnableTotalRecordCount { get; set; }
-
-        public RecommendedProgramQuery()
-        {
-            EnableTotalRecordCount = true;
-            GenreIds = new Guid[] { };
-        }
-
-        /// <summary>
-        /// Gets or sets the user identifier.
-        /// </summary>
-        /// <value>The user identifier.</value>
-        public string UserId { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is airing.
-        /// </summary>
-        /// <value><c>true</c> if this instance is airing; otherwise, <c>false</c>.</value>
-        public bool? IsAiring { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance has aired.
-        /// </summary>
-        /// <value><c>null</c> if [has aired] contains no value, <c>true</c> if [has aired]; otherwise, <c>false</c>.</value>
-        public bool? HasAired { get; set; }
-
-        /// <summary>
-        /// The maximum number of items to return
-        /// </summary>
-        /// <value>The limit.</value>
-        public int? Limit { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is movie.
-        /// </summary>
-        /// <value><c>null</c> if [is movie] contains no value, <c>true</c> if [is movie]; otherwise, <c>false</c>.</value>
-        public bool? IsNews { get; set; }
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is movie.
-        /// </summary>
-        /// <value><c>null</c> if [is movie] contains no value, <c>true</c> if [is movie]; otherwise, <c>false</c>.</value>
-        public bool? IsMovie { get; set; }
-        public bool? IsSeries { get; set; }
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is kids.
-        /// </summary>
-        /// <value><c>null</c> if [is kids] contains no value, <c>true</c> if [is kids]; otherwise, <c>false</c>.</value>
-        public bool? IsKids { get; set; }
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is sports.
-        /// </summary>
-        /// <value><c>null</c> if [is sports] contains no value, <c>true</c> if [is sports]; otherwise, <c>false</c>.</value>
-        public bool? IsSports { get; set; }
-    }
-}
-\ No newline at end of file