Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DLNA on older Samsung TVs #6795

Merged
merged 1 commit into from
Nov 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 21 additions & 6 deletions Emby.Dlna/ContentDirectory/ControlHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,9 @@ private static string WriteFeatureListXml()
return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<Features xmlns=\"urn:schemas-upnp-org:av:avs\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"urn:schemas-upnp-org:av:avs http://www.upnp.org/schemas/av/avs.xsd\">"
+ "<Feature name=\"samsung.com_BASICVIEW\" version=\"1\">"
+ "<container id=\"I\" type=\"object.item.imageItem\"/>"
+ "<container id=\"A\" type=\"object.item.audioItem\"/>"
+ "<container id=\"V\" type=\"object.item.videoItem\"/>"
+ "<container id=\"0\" type=\"object.item.imageItem\"/>"
+ "<container id=\"0\" type=\"object.item.audioItem\"/>"
+ "<container id=\"0\" type=\"object.item.videoItem\"/>"
+ "</Feature>"
+ "</Features>";
}
Expand Down Expand Up @@ -800,6 +800,11 @@ private QueryResult<ServerItem> GetMusicFolders(BaseItem item, User user, StubTy
}
};

if (limit.HasValue)
{
list = list.Take(limit.Value).ToList();
}

return new QueryResult<ServerItem>
{
Items = list,
Expand Down Expand Up @@ -884,6 +889,11 @@ private QueryResult<ServerItem> GetMovieFolders(BaseItem item, User user, StubTy
}
};

if (limit.HasValue)
{
array = array.Take(limit.Value).ToArray();
}

return new QueryResult<ServerItem>
{
Items = array,
Expand Down Expand Up @@ -1010,6 +1020,11 @@ private QueryResult<ServerItem> GetTvFolders(BaseItem item, User user, StubType?
}
};

if (limit.HasValue)
{
list = list.Take(limit.Value).ToList();
}

return new QueryResult<ServerItem>
{
Items = list,
Expand Down Expand Up @@ -1037,7 +1052,7 @@ private QueryResult<ServerItem> GetMovieContinueWatching(BaseItem parent, User u
};

query.IsResumable = true;
query.Limit = 10;
query.Limit = query.Limit ?? 10;

var result = _libraryManager.GetItemsResult(query);

Expand Down Expand Up @@ -1451,7 +1466,7 @@ private QueryResult<ServerItem> GetTvLatest(BaseItem parent, User user, Internal
new LatestItemsQuery
{
UserId = user.Id,
Limit = 50,
Limit = query.Limit ?? 50,
IncludeItemTypes = new[] { nameof(Episode) },
ParentId = parent == null ? Guid.Empty : parent.Id,
GroupItems = false
Expand All @@ -1476,7 +1491,7 @@ private QueryResult<ServerItem> GetMovieLatest(BaseItem parent, User user, Inter
new LatestItemsQuery
{
UserId = user.Id,
Limit = 50,
Limit = query.Limit ?? 50,
IncludeItemTypes = new[] { nameof(Movie) },
ParentId = parent?.Id ?? Guid.Empty,
GroupItems = true
Expand Down
2 changes: 1 addition & 1 deletion Emby.Dlna/Didl/DidlBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ private void AddCommonFields(BaseItem item, StubType? itemStubType, BaseItem con
{
if (item.PremiereDate.HasValue)
{
AddValue(writer, "dc", "date", item.PremiereDate.Value.ToString("o", CultureInfo.InvariantCulture), NsDc);
AddValue(writer, "dc", "date", item.PremiereDate.Value.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture), NsDc);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Emby.Dlna/Service/BaseControlHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private async Task<ControlResponse> ProcessControlRequestInternalAsync(ControlRe
requestInfo = await ParseRequestAsync(reader).ConfigureAwait(false);
}

Logger.LogDebug("Received control request {0}", requestInfo.LocalName);
Logger.LogDebug("Received control request {LocalName}, params: {@Headers}", requestInfo.LocalName, requestInfo.Headers);

var settings = new XmlWriterSettings
{
Expand Down