rygel r504 - in trunk/src/plugins: dvb tracker

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Wed Jan 28 12:33:53 2009
New Revision: 504
URL: http://svn.gnome.org/viewvc/rygel?rev=504&view=rev

Log:
MediaContainer derivates must implement get_children method.

Modified:
   trunk/src/plugins/dvb/rygel-dvb-channel-group.vala
   trunk/src/plugins/dvb/rygel-dvb-content-dir.vala
   trunk/src/plugins/tracker/rygel-media-tracker.vala
   trunk/src/plugins/tracker/rygel-tracker-container.vala

Modified: trunk/src/plugins/dvb/rygel-dvb-channel-group.vala
==============================================================================
--- trunk/src/plugins/dvb/rygel-dvb-channel-group.vala	(original)
+++ trunk/src/plugins/dvb/rygel-dvb-channel-group.vala	Wed Jan 28 12:33:53 2009
@@ -62,10 +62,10 @@
         this.fetch_channels ();
     }
 
-    public Gee.List<DVBChannel> get_channels (uint     offset,
-                                              uint     max_count,
-                                              out uint child_count)
-                                              throws GLib.Error {
+    public Gee.List<MediaObject> get_children (uint     offset,
+                                               uint     max_count,
+                                               out uint child_count)
+                                               throws GLib.Error {
         child_count = this.channels.size;
 
         if (max_count == 0) {

Modified: trunk/src/plugins/dvb/rygel-dvb-content-dir.vala
==============================================================================
--- trunk/src/plugins/dvb/rygel-dvb-content-dir.vala	(original)
+++ trunk/src/plugins/dvb/rygel-dvb-content-dir.vala	Wed Jan 28 12:33:53 2009
@@ -126,7 +126,7 @@
             throw new ContentDirectoryError.NO_SUCH_OBJECT ("No such object");
         }
 
-        var channels = group.get_channels (offset,
+        var channels = group.get_children (offset,
                                            max_count,
                                            out child_count);
         if (channels == null) {

Modified: trunk/src/plugins/tracker/rygel-media-tracker.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-media-tracker.vala	(original)
+++ trunk/src/plugins/tracker/rygel-media-tracker.vala	Wed Jan 28 12:33:53 2009
@@ -80,9 +80,9 @@
             throw new ContentDirectoryError.NO_SUCH_OBJECT ("No such object");
         }
 
-        return container.get_children_from_db (offset,
-                                               max_count,
-                                               out child_count);
+        return container.get_children (offset,
+                                       max_count,
+                                       out child_count);
     }
 
     public override MediaObject find_object_by_id (string object_id)

Modified: trunk/src/plugins/tracker/rygel-tracker-container.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-container.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-container.vala	Wed Jan 28 12:33:53 2009
@@ -114,12 +114,11 @@
         return count;
     }
 
-    public ArrayList<MediaItem> get_children_from_db (
-                                            uint     offset,
-                                            uint     max_count,
-                                            out uint child_count)
-                                            throws GLib.Error {
-        ArrayList<MediaItem> children = new ArrayList<MediaItem> ();
+    public ArrayList<MediaObject> get_children (uint     offset,
+                                                uint     max_count,
+                                                out uint child_count)
+                                                throws GLib.Error {
+        ArrayList<MediaObject> children = new ArrayList<MediaObject> ();
         child_count = this.get_children_count ();
 
         string[] child_paths =