rygel r573 - trunk/src/plugins/tracker

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Sat Feb 14 15:24:37 2009
New Revision: 573
URL: http://svn.gnome.org/viewvc/rygel?rev=573&view=rev

Log:
fetch_metadata doesn't need to be implemented by every item class.

Modified:
   trunk/src/plugins/tracker/rygel-tracker-image-item.vala
   trunk/src/plugins/tracker/rygel-tracker-item.vala
   trunk/src/plugins/tracker/rygel-tracker-music-item.vala
   trunk/src/plugins/tracker/rygel-tracker-video-item.vala

Modified: trunk/src/plugins/tracker/rygel-tracker-image-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-image-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-image-item.vala	Sat Feb 14 15:24:37 2009
@@ -66,13 +66,6 @@
         return keys;
     }
 
-    public override string[] fetch_metadata () throws GLib.Error {
-        string[] keys = this.get_metadata_keys ();
-
-        /* TODO: make this async */
-        return this.parent.metadata.Get (parent.category, path, keys);
-    }
-
     protected override void init_from_metadata (string[] values) {
         if (values[Metadata.TITLE] != "")
             this.title = values[Metadata.TITLE];

Modified: trunk/src/plugins/tracker/rygel-tracker-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-item.vala	Sat Feb 14 15:24:37 2009
@@ -68,8 +68,14 @@
         return date;
     }
 
+    private string[] fetch_metadata () throws GLib.Error {
+        string[] keys = this.get_metadata_keys ();
+
+        /* TODO: make this async */
+        return this.parent.metadata.Get (parent.category, path, keys);
+    }
+
     public abstract string[] get_metadata_keys ();
-    protected abstract string[] fetch_metadata () throws GLib.Error;
     protected abstract void init_from_metadata (string[] values);
 }
 

Modified: trunk/src/plugins/tracker/rygel-tracker-music-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-music-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-music-item.vala	Sat Feb 14 15:24:37 2009
@@ -66,13 +66,6 @@
         return keys;
     }
 
-    public override string[] fetch_metadata () throws GLib.Error {
-        string[] keys = this.get_metadata_keys ();
-
-        /* TODO: make this async */
-        return this.parent.metadata.Get (parent.category, path, keys);
-    }
-
     protected override void init_from_metadata (string[] values) {
         if (values[Metadata.TITLE] != "")
             this.title = values[Metadata.TITLE];

Modified: trunk/src/plugins/tracker/rygel-tracker-video-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-video-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-video-item.vala	Sat Feb 14 15:24:37 2009
@@ -62,14 +62,6 @@
         return keys;
     }
 
-    public override string[] fetch_metadata () throws GLib.Error {
-        string[] keys = this.get_metadata_keys ();
-
-        /* TODO: make this async */
-        return this.parent.metadata.Get (parent.category, path, keys);
-
-    }
-
     protected override void init_from_metadata (string[] values) {
         if (values[Metadata.TITLE] != "")
             this.title = values[Metadata.TITLE];