rework checkboxes for block unrated items

1 files changed, 16 insertions, 14 deletions

diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index fa2554e05..2145860c7 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -13,12 +13,6 @@ namespace MediaBrowser.Model.Configuration
         public int? MaxParentalRating { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether items with no rating information should be blocked.
-        /// </summary>
-        /// <value><c>true</c> if items with no rating info should be blocked; otherwise, <c>false</c>.</value>
-        public bool BlockNotRated { get; set; }
-
-        /// <summary>
         /// Gets or sets a value indicating whether this instance is administrator.
         /// </summary>
         /// <value><c>true</c> if this instance is administrator; otherwise, <c>false</c>.</value>
@@ -54,13 +48,6 @@ namespace MediaBrowser.Model.Configuration
         public bool DisplayUnairedEpisodes { get; set; }
         public bool EnableRemoteControlOfOtherUsers { get; set; }
 
-        public bool BlockUnratedMovies { get; set; }
-        public bool BlockUnratedTrailers { get; set; }
-        public bool BlockUnratedSeries { get; set; }
-        public bool BlockUnratedMusic { get; set; }
-        public bool BlockUnratedGames { get; set; }
-        public bool BlockUnratedBooks { get; set; }
-
         public bool EnableLiveTvManagement { get; set; }
         public bool EnableLiveTvAccess { get; set; }
 
@@ -68,6 +55,8 @@ namespace MediaBrowser.Model.Configuration
 
         public string[] BlockedMediaFolders { get; set; }
 
+        public UnratedItem[] BlockUnratedItems { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
@@ -75,13 +64,26 @@ namespace MediaBrowser.Model.Configuration
         {
             IsAdministrator = true;
             EnableRemoteControlOfOtherUsers = true;
-            BlockNotRated = false;
 
             EnableLiveTvManagement = true;
             EnableMediaPlayback = true;
             EnableLiveTvAccess = true;
 
             BlockedMediaFolders = new string[] { };
+            BlockUnratedItems = new UnratedItem[] { };
         }
     }
+
+    public enum UnratedItem
+    {
+        Movie,
+        Trailer,
+        Series,
+        Music,
+        Game,
+        Book,
+        LiveTvChannel,
+        LiveTvProgram,
+        Other
+    }
 }