lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1511 from MediaBrowser/dev

Browse Source 
dlna fix
This commit is contained in:
Luke 2016-03-01 13:45:07 -05:00
commit 68c511581a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/InternalItemsQuery.cs
View File

@ -112,6 +112,7 @@ namespace MediaBrowser.Controller.Entities
public string[] TopParentIds { get; set; }
public LocationType[] ExcludeLocationTypes { get; set; }
public string[] PresetViews { get; set; }
public InternalItemsQuery()
{
@ -137,6 +138,7 @@ namespace MediaBrowser.Controller.Entities
TopParentIds = new string[] { };
ExcludeTags = new string[] { };
ExcludeLocationTypes = new LocationType[] { };
PresetViews = new string[] { };
}
public InternalItemsQuery(User user)

3
MediaBrowser.Controller/Entities/UserRootFolder.cs
View File

@ -30,7 +30,8 @@ namespace MediaBrowser.Controller.Entities
var result = await UserViewManager.GetUserViews(new UserViewQuery
{
UserId = query.User.Id.ToString("N")
UserId = query.User.Id.ToString("N"),
PresetViews = query.PresetViews
}, CancellationToken.None).ConfigureAwait(false);

3
MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
View File

@ -460,7 +460,8 @@ namespace MediaBrowser.Dlna.ContentDirectory
SortBy = sortOrders.ToArray(),
SortOrder = sort.SortOrder,
User = user,
Filter = FilterUnsupportedContent
Filter = FilterUnsupportedContent,
PresetViews = new[] { CollectionType.Movies, CollectionType.TvShows, CollectionType.Music }
}).ConfigureAwait(false);