michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 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

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

@ -96,7 +96,7 @@ namespace MediaBrowser.Controller.Entities
public int? MinIndexNumber { get; set; } public int? MinIndexNumber { get; set; }
public double? MinCriticRating { get; set; } public double? MinCriticRating { get; set; }
public double? MinCommunityRating { get; set; } public double? MinCommunityRating { get; set; }
public string[] ChannelIds { get; set; } public string[] ChannelIds { get; set; }
internal List<Guid> ItemIdsFromPersonFilters { get; set; } internal List<Guid> ItemIdsFromPersonFilters { get; set; }
@ -112,7 +112,8 @@ namespace MediaBrowser.Controller.Entities
public string[] TopParentIds { get; set; } public string[] TopParentIds { get; set; }
public LocationType[] ExcludeLocationTypes { get; set; } public LocationType[] ExcludeLocationTypes { get; set; }
public string[] PresetViews { get; set; }
public InternalItemsQuery() public InternalItemsQuery()
{ {
BlockUnratedItems = new UnratedItem[] { }; BlockUnratedItems = new UnratedItem[] { };
@ -137,6 +138,7 @@ namespace MediaBrowser.Controller.Entities
TopParentIds = new string[] { }; TopParentIds = new string[] { };
ExcludeTags = new string[] { }; ExcludeTags = new string[] { };
ExcludeLocationTypes = new LocationType[] { }; ExcludeLocationTypes = new LocationType[] { };
PresetViews = new string[] { };
} }
public InternalItemsQuery(User user) public InternalItemsQuery(User user)
@ -153,7 +155,7 @@ namespace MediaBrowser.Controller.Entities
} }
ExcludeTags = policy.BlockedTags; ExcludeTags = policy.BlockedTags;
User = user; 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 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); }, CancellationToken.None).ConfigureAwait(false);

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

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