[rygel] core,external: No need for special album art class



commit 66a447fd8c141c36460941193fd6d9ce93de6b88
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu Dec 23 16:57:42 2010 +0200

    core,external: No need for special album art class
    
    Thumbnail class is enough, no need for a special subclass for album art.

 .../external/rygel-external-album-art-factory.vala |    2 +-
 src/rygel/Makefile.am                              |    1 -
 src/rygel/rygel-album-art.vala                     |   39 --------------------
 src/rygel/rygel-media-art-store.vala               |    2 +-
 src/rygel/rygel-music-item.vala                    |    2 +-
 5 files changed, 3 insertions(+), 43 deletions(-)
---
diff --git a/src/plugins/external/rygel-external-album-art-factory.vala b/src/plugins/external/rygel-external-album-art-factory.vala
index b9665f4..60917cd 100644
--- a/src/plugins/external/rygel-external-album-art-factory.vala
+++ b/src/plugins/external/rygel-external-album-art-factory.vala
@@ -44,7 +44,7 @@ public class Rygel.External.AlbumArtFactory {
 
     private Thumbnail create_from_props (HashTable<string,Variant> props,
                                          string                    host_ip) {
-        var thumbnail = new AlbumArt ();
+        var thumbnail = new Thumbnail ();
 
         var value = props.lookup ("MIMEType");
         thumbnail.mime_type = (string) value;
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 182673e..c779988 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -92,7 +92,6 @@ VAPI_SOURCE_FILES = rygel-configuration.vala \
 		    rygel-photo-item.vala \
 		    rygel-thumbnail.vala \
 		    rygel-thumbnailer.vala \
-		    rygel-album-art.vala \
 		    rygel-media-art-store.vala \
 		    rygel-subtitle.vala \
 		    rygel-subtitle-manager.vala \
diff --git a/src/rygel/rygel-media-art-store.vala b/src/rygel/rygel-media-art-store.vala
index 4c8a024..295f758 100644
--- a/src/rygel/rygel-media-art-store.vala
+++ b/src/rygel/rygel-media-art-store.vala
@@ -80,7 +80,7 @@ public class Rygel.MediaArtStore : GLib.Object {
             return null;
         }
 
-        var thumb = new AlbumArt ();
+        var thumb = new Thumbnail ();
         thumb.uri = file.get_uri ();
         thumb.size = (int64) info.get_size ();
 
diff --git a/src/rygel/rygel-music-item.vala b/src/rygel/rygel-music-item.vala
index 84bbd65..6742f60 100644
--- a/src/rygel/rygel-music-item.vala
+++ b/src/rygel/rygel-music-item.vala
@@ -67,7 +67,7 @@ public class Rygel.MusicItem : AudioItem {
             var protocol = this.get_protocol_for_uri (this.album_art.uri);
 
             if (allow_internal || protocol != "internal") {
-                album_art.add_resource (didl_item, protocol);
+                didl_item.album_art = this.album_art.uri;
             }
         }
     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]