From d1d0487feee578822e76ca48e88dc61b94080570 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 18 May 2016 01:34:10 -0400 Subject: update artist queries --- .../ContentDirectory/ControlHandler.cs | 33 ++++------------------ 1 file changed, 6 insertions(+), 27 deletions(-) (limited to 'MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs') diff --git a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs index bc9fa1d7e7..233ec9546f 100644 --- a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs +++ b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs @@ -401,10 +401,10 @@ namespace MediaBrowser.Dlna.ContentDirectory SortOrder = sort.SortOrder, User = user, Recursive = true, - Filter = FilterUnsupportedContent, + IsMissing = false, + ExcludeItemTypes = new[] { typeof(Game).Name, typeof(Book).Name }, IsFolder = isFolder, MediaTypes = mediaTypes.ToArray() - }); } @@ -461,8 +461,10 @@ namespace MediaBrowser.Dlna.ContentDirectory SortBy = sortOrders.ToArray(), SortOrder = sort.SortOrder, User = user, - Filter = FilterUnsupportedContent, - PresetViews = new[] { CollectionType.Movies, CollectionType.TvShows, CollectionType.Music } + IsMissing = false, + PresetViews = new[] { CollectionType.Movies, CollectionType.TvShows, CollectionType.Music }, + ExcludeItemTypes = new[] { typeof(Game).Name, typeof(Book).Name }, + IsPlaceHolder = false }).ConfigureAwait(false); @@ -579,29 +581,6 @@ namespace MediaBrowser.Dlna.ContentDirectory }); } - private bool FilterUnsupportedContent(BaseItem i) - { - // Unplayable - if (i.LocationType == LocationType.Virtual && !i.IsFolder) - { - return false; - } - - // Unplayable - var supportsPlaceHolder = i as ISupportsPlaceHolders; - if (supportsPlaceHolder != null && supportsPlaceHolder.IsPlaceHolder) - { - return false; - } - - if (i is Game || i is Book) - { - //return false; - } - - return true; - } - private ServerItem GetItemFromObjectId(string id, User user) { return DidlBuilder.IsIdRoot(id) -- cgit v1.2.3