Merge pull request #2591 from MediaBrowser/beta

Beta

2 files changed, 0 insertions, 49 deletions

diff --git a/MediaBrowser.Api/UserLibrary/PlaystateService.cs b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
index 504dd29a73..c4cc90955e 100644
--- a/MediaBrowser.Api/UserLibrary/PlaystateService.cs
+++ b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
@@ -109,13 +109,6 @@ namespace MediaBrowser.Api.UserLibrary
         [ApiMember(Name = "CanSeek", Description = "Indicates if the client can seek", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "POST")]
         public bool CanSeek { get; set; }
 
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "QueueableMediaTypes", Description = "A list of media types that can be queued from this item, comma delimited. Audio,Video,Book,Game", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
-        public string QueueableMediaTypes { get; set; }
-
         [ApiMember(Name = "AudioStreamIndex", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "POST")]
         public int? AudioStreamIndex { get; set; }
 
@@ -292,13 +285,10 @@ namespace MediaBrowser.Api.UserLibrary
         /// <param name="request">The request.</param>
         public void Post(OnPlaybackStart request)
         {
-            var queueableMediaTypes = request.QueueableMediaTypes ?? string.Empty;
-
             Post(new ReportPlaybackStart
             {
                 CanSeek = request.CanSeek,
                 ItemId = request.Id,
-                QueueableMediaTypes = queueableMediaTypes.Split(',').ToList(),
                 MediaSourceId = request.MediaSourceId,
                 AudioStreamIndex = request.AudioStreamIndex,
                 SubtitleStreamIndex = request.SubtitleStreamIndex,
diff --git a/MediaBrowser.Api/UserLibrary/UserViewsService.cs b/MediaBrowser.Api/UserLibrary/UserViewsService.cs
index 715745a7dc..89953c2bd8 100644
--- a/MediaBrowser.Api/UserLibrary/UserViewsService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserViewsService.cs
@@ -31,17 +31,6 @@ namespace MediaBrowser.Api.UserLibrary
         public string PresetViews { get; set; }
     }
 
-    [Route("/Users/{UserId}/SpecialViewOptions", "GET")]
-    public class GetSpecialViewOptions : IReturn<List<SpecialViewOption>>
-    {
-        /// <summary>
-        /// Gets or sets the user id.
-        /// </summary>
-        /// <value>The user id.</value>
-        [ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string UserId { get; set; }
-    }
-
     [Route("/Users/{UserId}/GroupingOptions", "GET")]
     public class GetGroupingOptions : IReturn<List<SpecialViewOption>>
     {
@@ -114,29 +103,6 @@ namespace MediaBrowser.Api.UserLibrary
             return ToOptimizedResult(result);
         }
 
-        public async Task<object> Get(GetSpecialViewOptions request)
-        {
-            var user = _userManager.GetUserById(request.UserId);
-
-            var views = user.RootFolder
-                .GetChildren(user, true)
-                .OfType<ICollectionFolder>()
-                .Where(IsEligibleForSpecialView)
-                .ToList();
-
-            var list = views
-                .Select(i => new SpecialViewOption
-                {
-                    Name = i.Name,
-                    Id = i.Id.ToString("N")
-
-                })
-            .OrderBy(i => i.Name)
-            .ToList();
-
-            return ToOptimizedResult(list);
-        }
-
         public async Task<object> Get(GetGroupingOptions request)
         {
             var user = _userManager.GetUserById(request.UserId);
@@ -159,11 +125,6 @@ namespace MediaBrowser.Api.UserLibrary
 
             return ToOptimizedResult(list);
         }
-
-        private bool IsEligibleForSpecialView(ICollectionFolder view)
-        {
-            return UserView.IsEligibleForEnhancedView(view.CollectionType);
-        }
     }
 
     class SpecialViewOption