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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Luke Pulverenti 2014-03-28 14:17:26 -04:00
commit 1dafb46b71
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Dlna/PlayTo/DidlBuilder.cs
View File

@ -40,7 +40,7 @@ namespace MediaBrowser.Dlna.PlayTo
/// <param name="streamUrl">The stream URL.</param> /// <param name="streamUrl">The stream URL.</param>
/// <param name="streams">The streams.</param> /// <param name="streams">The streams.</param>
/// <returns>System.String.</returns> /// <returns>System.String.</returns>
public static string Build(BaseItem dto, string userId, string serverAddress, string streamUrl, IEnumerable<MediaStream> streams) public static string Build(BaseItem dto, string userId, string serverAddress, string streamUrl, IEnumerable<MediaStream> streams, bool includeImageRes)
{ {
string response = string.Format(DIDL_START, dto.Id, userId); string response = string.Format(DIDL_START, dto.Id, userId);
response += string.Format(DIDL_TITLE, dto.Name.Replace("&", "and")); response += string.Format(DIDL_TITLE, dto.Name.Replace("&", "and"));
@ -51,7 +51,7 @@ namespace MediaBrowser.Dlna.PlayTo
var imageUrl = GetImageUrl(dto, serverAddress); var imageUrl = GetImageUrl(dto, serverAddress);
if (!string.IsNullOrEmpty(imageUrl)) if (!string.IsNullOrWhiteSpace(imageUrl))
{ {
response += string.Format(DIDL_IMAGE, imageUrl); response += string.Format(DIDL_IMAGE, imageUrl);
} }
@ -65,7 +65,7 @@ namespace MediaBrowser.Dlna.PlayTo
response += string.Format(DESCRIPTION, UNKNOWN); response += string.Format(DESCRIPTION, UNKNOWN);
response += GetVideoDIDL(dto, streamUrl, streams); response += GetVideoDIDL(dto, streamUrl, streams);
if (!string.IsNullOrEmpty(imageUrl)) if (includeImageRes && !string.IsNullOrWhiteSpace(imageUrl))
{ {
response += string.Format(DIDL_IMAGE_RES, imageUrl); response += string.Format(DIDL_IMAGE_RES, imageUrl);
} }
@ -84,7 +84,7 @@ namespace MediaBrowser.Dlna.PlayTo
response += GetAudioDIDL(dto, streamUrl, streams); response += GetAudioDIDL(dto, streamUrl, streams);
if (!string.IsNullOrEmpty(imageUrl)) if (includeImageRes && !string.IsNullOrWhiteSpace(imageUrl))
{ {
response += string.Format(DIDL_ALBUMIMAGE_RES, imageUrl); response += string.Format(DIDL_ALBUMIMAGE_RES, imageUrl);
} }

2
MediaBrowser.Dlna/PlayTo/DlnaController.cs
View File

@ -435,7 +435,7 @@ namespace MediaBrowser.Dlna.PlayTo
playlistItem.StreamUrl = StreamHelper.GetVideoUrl(_device.Properties, playlistItem, streams, serverAddress); playlistItem.StreamUrl = StreamHelper.GetVideoUrl(_device.Properties, playlistItem, streams, serverAddress);
} }
playlistItem.Didl = DidlBuilder.Build(item, _session.UserId.ToString(), serverAddress, playlistItem.StreamUrl, streams); playlistItem.Didl = DidlBuilder.Build(item, _session.UserId.ToString(), serverAddress, playlistItem.StreamUrl, streams, profile.EnableAlbumArtInDidl);
return playlistItem; return playlistItem;
} }