aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-01 13:30:46 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-01 13:30:46 -0500
commit8454aaf053ac49bf889f9a13f5b09a9906ae066a (patch)
tree8551ccb38b03839247a5ee0870069dba90dbd234
parentaa66c1defe4b4255e119e167f2ed928d8ff21ee3 (diff)
dlna fix
-rw-r--r--MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs32
1 files changed, 8 insertions, 24 deletions
diff --git a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
index 9071eecb2..80b071d11 100644
--- a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
+++ b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
@@ -453,32 +453,16 @@ namespace MediaBrowser.Dlna.ContentDirectory
sortOrders.Add(ItemSortBy.SortName);
}
- QueryResult<BaseItem> queryResult;
-
- if (folder is UserRootFolder)
- {
- var views = await _userViewManager.GetUserViews(new UserViewQuery { UserId = user.Id.ToString("N"), PresetViews = new[] { CollectionType.Movies, CollectionType.TvShows, CollectionType.Music } }, CancellationToken.None)
- .ConfigureAwait(false);
-
- queryResult = new QueryResult<BaseItem>
- {
- Items = views.Cast<BaseItem>().ToArray()
- };
- queryResult.TotalRecordCount = queryResult.Items.Length;
- }
- else
+ var queryResult = await folder.GetItems(new InternalItemsQuery
{
- queryResult = await folder.GetItems(new InternalItemsQuery
- {
- Limit = limit,
- StartIndex = startIndex,
- SortBy = sortOrders.ToArray(),
- SortOrder = sort.SortOrder,
- User = user,
- Filter = FilterUnsupportedContent
+ Limit = limit,
+ StartIndex = startIndex,
+ SortBy = sortOrders.ToArray(),
+ SortOrder = sort.SortOrder,
+ User = user,
+ Filter = FilterUnsupportedContent
- }).ConfigureAwait(false);
- }
+ }).ConfigureAwait(false);
var options = _config.GetDlnaConfiguration();