[rygel] core,plugins: Drop MediaItem.add_uri().thumbnail



commit 1ae16e7e0ea79df367ee49b9170d858faaa1be2e
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Sun Aug 22 18:34:29 2010 +0300

    core,plugins: Drop MediaItem.add_uri().thumbnail
    
    MediaItem.add_uri() doesn't take optional thumbnail argument anymore. None
    of the plugins were using this and it doesn't really matter if rygel can
    find the thumbnail before plugins add their own thumbnail(s).

 .../external/rygel-external-item-factory.vala      |    2 +-
 .../media-export/rygel-media-export-item.vala      |    4 ++--
 .../rygel-media-export-media-cache.vala            |    2 +-
 .../mediathek/rygel-mediathek-video-item.vala      |    2 +-
 .../tracker/rygel-tracker-item-factory.vala        |    2 +-
 src/rygel/rygel-media-item.vala                    |   10 +++-------
 6 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/src/plugins/external/rygel-external-item-factory.vala b/src/plugins/external/rygel-external-item-factory.vala
index 5ba9edc..ce67df7 100644
--- a/src/plugins/external/rygel-external-item-factory.vala
+++ b/src/plugins/external/rygel-external-item-factory.vala
@@ -63,7 +63,7 @@ public class Rygel.External.ItemFactory {
         for (var i = 0; uris[i] != null; i++) {
             var tmp = uris[i].replace ("@ADDRESS@", host_ip);
 
-            item.add_uri (tmp, null);
+            item.add_uri (tmp);
         }
 
         // Optional properties
diff --git a/src/plugins/media-export/rygel-media-export-item.vala b/src/plugins/media-export/rygel-media-export-item.vala
index c3d6ea1..5e1945f 100644
--- a/src/plugins/media-export/rygel-media-export-item.vala
+++ b/src/plugins/media-export/rygel-media-export-item.vala
@@ -48,7 +48,7 @@ public class Rygel.MediaExport.Item : Rygel.MediaItem {
         this.mime_type = mime;
         this.size = (int64) size;
         this.modified = mtime;
-        this.add_uri (file.get_uri (), null);
+        this.add_uri (file.get_uri ());
     }
 
     public static Item? create_from_info (MediaContainer        parent,
@@ -272,7 +272,7 @@ public class Rygel.MediaExport.Item : Rygel.MediaItem {
             this.mime_type = mime;
         }
 
-        this.add_uri (file.get_uri (), null);
+        this.add_uri (file.get_uri ());
     }
 }
 
diff --git a/src/plugins/media-export/rygel-media-export-media-cache.vala b/src/plugins/media-export/rygel-media-export-media-cache.vala
index 347ffb1..701eced 100644
--- a/src/plugins/media-export/rygel-media-export-media-cache.vala
+++ b/src/plugins/media-export/rygel-media-export-media-cache.vala
@@ -525,7 +525,7 @@ public class Rygel.MediaExport.MediaCache : Object {
 
                 var uri = statement.column_text (DetailColumn.URI);
                 if (uri != null) {
-                    (object as MediaItem).add_uri (uri, null);
+                    (object as MediaItem).add_uri (uri);
                 }
                 break;
             default:
diff --git a/src/plugins/mediathek/rygel-mediathek-video-item.vala b/src/plugins/mediathek/rygel-mediathek-video-item.vala
index d04b9b8..473d480 100644
--- a/src/plugins/mediathek/rygel-mediathek-video-item.vala
+++ b/src/plugins/mediathek/rygel-mediathek-video-item.vala
@@ -120,7 +120,7 @@ public class Rygel.Mediathek.VideoItem : Rygel.MediaItem {
 
         video_item = new VideoItem (parent, title);
         foreach (string uri in asx.uris) {
-            video_item.add_uri (uri, null);
+            video_item.add_uri (uri);
         }
 
         return video_item;
diff --git a/src/plugins/tracker/rygel-tracker-item-factory.vala b/src/plugins/tracker/rygel-tracker-item-factory.vala
index ea772e7..cc01ae2 100644
--- a/src/plugins/tracker/rygel-tracker-item-factory.vala
+++ b/src/plugins/tracker/rygel-tracker-item-factory.vala
@@ -92,7 +92,7 @@ public abstract class Rygel.Tracker.ItemFactory {
 
         item.mime_type = metadata[Metadata.MIME];
 
-        item.add_uri (uri, null);
+        item.add_uri (uri);
 
         return item;
     }
diff --git a/src/rygel/rygel-media-item.vala b/src/rygel/rygel-media-item.vala
index 8fd777e..53a842f 100644
--- a/src/rygel/rygel-media-item.vala
+++ b/src/rygel/rygel-media-item.vala
@@ -120,15 +120,11 @@ public class Rygel.MediaItem : MediaObject {
         return !this.upnp_class.has_prefix (IMAGE_CLASS);
     }
 
-    // Adds URI to MediaItem. You can either provide the associated thumbnail or
-    // ask Rygel to try to fetch it for you by passing null as @thumbnail.
-    public void add_uri (string uri, Thumbnail? thumbnail) {
+    public void add_uri (string uri) {
         this.uris.add (uri);
 
-        if (thumbnail != null) {
-            this.thumbnails.add (thumbnail);
-        } else if (this.upnp_class.has_prefix (MediaItem.IMAGE_CLASS) ||
-                   this.upnp_class.has_prefix (MediaItem.VIDEO_CLASS)) {
+        if (this.upnp_class.has_prefix (MediaItem.IMAGE_CLASS) ||
+            this.upnp_class.has_prefix (MediaItem.VIDEO_CLASS)) {
             // Lets see if we can provide the thumbnails
             var thumbnailer = Thumbnailer.get_default ();
 



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