From a7022e0f7d2e46b70b15d000fc4dc673fef2cf4d Mon Sep 17 00:00:00 2001
From: "Zeeshan Ali (Khattak)" <zeeshanak@src.gnome.org>
Date: Wed, 28 Jan 2009 12:33:53 +0000
Subject: [PATCH] MediaContainer derivates must implement get_children method.

svn path=/trunk/; revision=504
---
 src/plugins/dvb/rygel-dvb-channel-group.vala     |  8 ++++----
 src/plugins/dvb/rygel-dvb-content-dir.vala       |  2 +-
 src/plugins/tracker/rygel-media-tracker.vala     |  6 +++---
 src/plugins/tracker/rygel-tracker-container.vala | 11 +++++------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/plugins/dvb/rygel-dvb-channel-group.vala b/src/plugins/dvb/rygel-dvb-channel-group.vala
index 37c0678..ac14efb 100644
--- a/src/plugins/dvb/rygel-dvb-channel-group.vala
+++ b/src/plugins/dvb/rygel-dvb-channel-group.vala
@@ -62,10 +62,10 @@ public class Rygel.DVBChannelGroup : MediaContainer {
         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) {
diff --git a/src/plugins/dvb/rygel-dvb-content-dir.vala b/src/plugins/dvb/rygel-dvb-content-dir.vala
index 268a4d4..2789521 100644
--- a/src/plugins/dvb/rygel-dvb-content-dir.vala
+++ b/src/plugins/dvb/rygel-dvb-content-dir.vala
@@ -126,7 +126,7 @@ public class Rygel.DVBContentDir : ContentDirectory {
             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) {
diff --git a/src/plugins/tracker/rygel-media-tracker.vala b/src/plugins/tracker/rygel-media-tracker.vala
index 962060e..ed5f925 100644
--- a/src/plugins/tracker/rygel-media-tracker.vala
+++ b/src/plugins/tracker/rygel-media-tracker.vala
@@ -80,9 +80,9 @@ public class Rygel.MediaTracker : ContentDirectory {
             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)
diff --git a/src/plugins/tracker/rygel-tracker-container.vala b/src/plugins/tracker/rygel-tracker-container.vala
index 462fa6e..5bf6d63 100644
--- a/src/plugins/tracker/rygel-tracker-container.vala
+++ b/src/plugins/tracker/rygel-tracker-container.vala
@@ -114,12 +114,11 @@ public class Rygel.TrackerContainer : MediaContainer {
         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 =
-- 
2.7.4