Add cover art to metadata

1 files changed, 10 insertions, 1 deletions

diff --git a/src/github/daneren2005/dsub/service/DLNAController.java b/src/github/daneren2005/dsub/service/DLNAController.java
index fc19b6a1..7e4f9ce7 100644
--- a/src/github/daneren2005/dsub/service/DLNAController.java
+++ b/src/github/daneren2005/dsub/service/DLNAController.java
@@ -43,6 +43,7 @@ import org.fourthline.cling.support.connectionmanager.callback.PrepareForConnect
 import org.fourthline.cling.support.contentdirectory.DIDLParser;

 import org.fourthline.cling.support.lastchange.LastChange;

 import org.fourthline.cling.support.model.DIDLContent;

+import org.fourthline.cling.support.model.DIDLObject;

 import org.fourthline.cling.support.model.PersonWithRole;

 import org.fourthline.cling.support.model.PositionInfo;

 import org.fourthline.cling.support.model.Res;

@@ -53,6 +54,7 @@ import org.fourthline.cling.support.model.item.VideoItem;
 import org.fourthline.cling.support.renderingcontrol.callback.SetVolume;

 import org.seamless.util.MimeType;

 

+import java.net.URI;

 import java.text.SimpleDateFormat;

 import java.util.Date;

 import java.util.Map;

@@ -360,6 +362,14 @@ public class DLNAController extends RemoteController {
 

 				MusicTrack musicTrack = new MusicTrack(song.getId(), song.getParent(), song.getTitle(), song.getArtist(), song.getAlbum(), song.getArtist(), res);

 				musicTrack.setOriginalTrackNumber(song.getTrack());

+

+				if(song.getCoverArt() != null) {

+					String coverArt = musicService.getCoverArtUrl(downloadService, song);

+					coverArt = Util.replaceInternalUrl(downloadService, coverArt);

+					DIDLObject.Property.UPNP.ALBUM_ART_URI albumArtUri = new DIDLObject.Property.UPNP.ALBUM_ART_URI(URI.create(coverArt));

+					musicTrack.addProperty(albumArtUri);

+				}

+

 				track = musicTrack;

 			}

 

@@ -369,7 +379,6 @@ public class DLNAController extends RemoteController {
 

 			String metadata = "";

 			try {

-				// <s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/"><s:Body><u:SetAVTransportURI xmlns:u="urn:schemas-upnp-org:service:AVTransport:1"><InstanceID>0</InstanceID><CurrentURI>http://192.168.1.3:57645/external/audio/media/39883.mp3</CurrentURI><CurrentURIMetaData>&lt;DIDL-Lite xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dlna="urn:schemas-dlna-org:metadata-1-0/" xmlns:sec="http://www.sec.co.kr/"&gt;&lt;item id="/external/audio/albums/484/39883" parentID="/external/audio/albums/484" restricted="1"&gt;&lt;upnp:class&gt;object.item.audioItem.musicTrack&lt;/upnp:class&gt;&lt;dc:title&gt;03-Miss Murder.complete&lt;/dc:title&gt;&lt;dc:creator&gt;AFI&lt;/dc:creator&gt;&lt;upnp:artist&gt;AFI&lt;/upnp:artist&gt;&lt;upnp:albumArtURI&gt;http://192.168.1.3:57645/external/audio/albums/484.jpg&lt;/upnp:albumArtURI&gt;&lt;upnp:genre&gt;Rock&lt;/upnp:genre&gt;&lt;dc:date&gt;2006-01-01&lt;/dc:date&gt;&lt;upnp:album&gt;&amp;lt;unknown&amp;gt;&lt;/upnp:album&gt;&lt;upnp:originalTrackNumber&gt;3&lt;/upnp:originalTrackNumber&gt;&lt;res protocolInfo="http-get:*:audio/mpeg:*" bitrate="24000" size="4961736" duration="0:03:26.000"&gt;http://192.168.1.3:57645/external/audio/media/39883.mp3&lt;/res&gt;&lt;/item&gt;&lt;/DIDL-Lite&gt;</CurrentURIMetaData></u:SetAVTransportURI></s:Body></s:Envelope>

 				metadata = parser.generate(didl);

 			} catch(Exception e) {

 				Log.w(TAG, "Metadata generation failed", e);