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

[zeeshanak svn gnome org]

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

Log:
Add get_children & find_object_by_id methods to MediaContainer.

Modified:
   trunk/src/plugins/dvb/rygel-dvb-channel-group.vala
   trunk/src/plugins/tracker/rygel-tracker-container.vala
   trunk/src/rygel/rygel-media-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:34:09 2009
@@ -62,10 +62,10 @@
         this.fetch_channels ();
     }
 
-    public Gee.List<MediaObject> get_children (uint     offset,
-                                               uint     max_count,
-                                               out uint child_count)
-                                               throws GLib.Error {
+    public override 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) {
@@ -78,7 +78,8 @@
         return this.channels.slice ((int) offset, (int) stop);
     }
 
-    public MediaObject find_object_by_id (string id) {
+    public override MediaObject find_object_by_id (string id)
+                                                   throws GLib.Error {
         MediaObject channel = null;
         foreach (var tmp in this.channels) {
             if (tmp.id == 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:34:09 2009
@@ -114,10 +114,10 @@
         return count;
     }
 
-    public ArrayList<MediaObject> get_children (uint     offset,
-                                                uint     max_count,
-                                                out uint child_count)
-                                                throws GLib.Error {
+    public override Gee.List<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 ();
 
@@ -129,7 +129,7 @@
 
         /* Iterate through all items */
         for (uint i = 0; i < child_paths.length; i++) {
-            MediaItem item = this.find_object_by_id (child_paths[i]);
+            MediaObject item = this.find_object_by_id (child_paths[i]);
             children.add (item);
         }
 
@@ -144,8 +144,9 @@
         return category;
     }
 
-    public MediaItem find_object_by_id (string id) throws GLib.Error {
-        MediaItem item;
+    public override MediaObject find_object_by_id (string id)
+                                                   throws GLib.Error {
+        MediaObject item;
         string path = id;
 
         if (this.child_class == MediaItem.VIDEO_CLASS) {

Modified: trunk/src/rygel/rygel-media-container.vala
==============================================================================
--- trunk/src/rygel/rygel-media-container.vala	(original)
+++ trunk/src/rygel/rygel-media-container.vala	Wed Jan 28 12:34:09 2009
@@ -64,4 +64,15 @@
         /* End of Container */
         didl_writer.end_container ();
     }
+
+    public virtual Gee.List<MediaObject> get_children (uint     offset,
+                                                       uint     max_count,
+                                                       out uint child_count)
+                                                       throws Error {
+        return null;
+    }
+
+    public virtual MediaObject find_object_by_id (string id) throws Error {
+        return null;
+    }
 }