From c3577838762f390d930b4043118ead2c64bad1b6 Mon Sep 17 00:00:00 2001 From: 7illusions Date: Fri, 28 Mar 2014 17:53:45 +0100 Subject: [PATCH] DLNA Albumart exclusion --- MediaBrowser.Dlna/PlayTo/DidlBuilder.cs | 8 ++++---- MediaBrowser.Dlna/PlayTo/DlnaController.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MediaBrowser.Dlna/PlayTo/DidlBuilder.cs b/MediaBrowser.Dlna/PlayTo/DidlBuilder.cs index 1327da1480..80235740fb 100644 --- a/MediaBrowser.Dlna/PlayTo/DidlBuilder.cs +++ b/MediaBrowser.Dlna/PlayTo/DidlBuilder.cs @@ -40,7 +40,7 @@ namespace MediaBrowser.Dlna.PlayTo /// The stream URL. /// The streams. /// System.String. - public static string Build(BaseItem dto, string userId, string serverAddress, string streamUrl, IEnumerable streams) + public static string Build(BaseItem dto, string userId, string serverAddress, string streamUrl, IEnumerable streams, bool includeImageRes) { string response = string.Format(DIDL_START, dto.Id, userId); response += string.Format(DIDL_TITLE, dto.Name.Replace("&", "and")); @@ -51,7 +51,7 @@ namespace MediaBrowser.Dlna.PlayTo var imageUrl = GetImageUrl(dto, serverAddress); - if (!string.IsNullOrEmpty(imageUrl)) + if (!string.IsNullOrWhiteSpace(imageUrl)) { response += string.Format(DIDL_IMAGE, imageUrl); } @@ -65,7 +65,7 @@ namespace MediaBrowser.Dlna.PlayTo response += string.Format(DESCRIPTION, UNKNOWN); response += GetVideoDIDL(dto, streamUrl, streams); - if (!string.IsNullOrEmpty(imageUrl)) + if (includeImageRes && !string.IsNullOrWhiteSpace(imageUrl)) { response += string.Format(DIDL_IMAGE_RES, imageUrl); } @@ -84,7 +84,7 @@ namespace MediaBrowser.Dlna.PlayTo response += GetAudioDIDL(dto, streamUrl, streams); - if (!string.IsNullOrEmpty(imageUrl)) + if (includeImageRes && !string.IsNullOrWhiteSpace(imageUrl)) { response += string.Format(DIDL_ALBUMIMAGE_RES, imageUrl); } diff --git a/MediaBrowser.Dlna/PlayTo/DlnaController.cs b/MediaBrowser.Dlna/PlayTo/DlnaController.cs index e4bd8819da..e99c7b50ed 100644 --- a/MediaBrowser.Dlna/PlayTo/DlnaController.cs +++ b/MediaBrowser.Dlna/PlayTo/DlnaController.cs @@ -435,7 +435,7 @@ namespace MediaBrowser.Dlna.PlayTo 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; }