[rygel] server: Fix album art handling

[Jens Georg <jensgeorg src gnome org>]

commit 7fa36abd1a2a63845a73ca155cab114a37bfba78
Author: Jens Georg <mail jensge org>
Date:   Sun Feb 8 18:20:03 2015 +0100

    server: Fix album art handling
    
    Code based on Cablelabs's CVP-2 implementation
    
    Signed-off-by: Jens Georg <mail jensge org>

 src/librygel-server/rygel-music-item.vala |   41 +++++++++++++++--------------
 1 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/src/librygel-server/rygel-music-item.vala b/src/librygel-server/rygel-music-item.vala
index 2f9bcf3..d996e52 100644
--- a/src/librygel-server/rygel-music-item.vala
+++ b/src/librygel-server/rygel-music-item.vala
@@ -2,10 +2,13 @@
  * Copyright (C) 2008 Zeeshan Ali <zeenix gmail com>.
  * Copyright (C) 2010 Nokia Corporation.
  * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2013 Cable Television Laboratories, Inc.
  *
  * Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
  *                               <zeeshan ali nokia com>
  *         Jens Georg <jensg openismus com>
+ *         Doug Galligan <doug sentosatech com>
+ *         Craig Pratt <craig ecaspia com>
  *
  * This file is part of Rygel.
  *
@@ -63,20 +66,6 @@ public class Rygel.MusicItem : AudioItem {
         };
     }
 
-    internal override void add_resources (DIDLLiteItem didl_item,
-                                          bool         allow_internal)
-                                          throws Error {
-        base.add_resources (didl_item, allow_internal);
-
-        if (this.album_art != null) {
-            var protocol = this.get_protocol_for_uri (this.album_art.uri);
-
-            if (allow_internal || protocol != "internal") {
-                didl_item.album_art = this.album_art.uri;
-            }
-        }
-    }
-
     internal override int compare_by_property (MediaObject media_object,
                                                string      property) {
         if (!(media_object is MusicItem)) {
@@ -111,12 +100,24 @@ public class Rygel.MusicItem : AudioItem {
             didl_item.track_number = this.track_number;
         }
 
-        if (didl_item.album_art != null) {
-            didl_item.album_art = MediaFileItem.address_regex.replace_literal
-                                        (didl_item.album_art,
-                                         -1,
-                                         0,
-                                         http_server.context.host_ip);
+        if (!this.place_holder && this.album_art != null) {
+            var protocol = this.get_protocol_for_uri (this.album_art.uri);
+
+            // Use the existing URI if the server is local or a non-internal/file uri is set
+            if (http_server.is_local () || protocol != "internal") {
+                didl_item.album_art = this.album_art.uri;
+            } else {
+                // Create a http uri for the album art that our server can process
+                string http_uri = http_server.create_uri_for_object (this,
+                                                                   0,
+                                                                   -1,
+                                                                   null);
+                didl_item.album_art = MediaFileItem.address_regex.replace_literal
+                                            (http_uri,
+                                             -1,
+                                             0,
+                                             http_server.context.host_ip);
+            }
         }
 
         return didl_item;