rygel r498 - in trunk/src: plugins/dvb plugins/test plugins/tracker rygel

[zeeshanak svn gnome org]

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

Log:
ContentDirectory.get_*_children() returns a Gee.List.

Modified:
   trunk/src/plugins/dvb/rygel-dvb-content-dir.vala
   trunk/src/plugins/test/rygel-test-content-dir.vala
   trunk/src/plugins/tracker/rygel-media-tracker.vala
   trunk/src/rygel/rygel-content-directory.vala

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:28 2009
@@ -115,7 +115,7 @@
         return media_object;
     }
 
-    public override ArrayList<MediaObject> get_children (
+    public override Gee.List<MediaObject> get_children (
                                                  string   container_id,
                                                  uint     offset,
                                                  uint     max_count,
@@ -144,10 +144,10 @@
             throw new ContentDirectoryError.NO_SUCH_OBJECT ("No such object");
         }
 
-        return (ArrayList<MediaObject>) children;
+        return children;
     }
 
-    public override ArrayList<MediaObject> get_root_children (
+    public override Gee.List<MediaObject> get_root_children (
                                                  uint     offset,
                                                  uint     max_count,
                                                  out uint child_count)
@@ -169,7 +169,7 @@
             throw new ContentDirectoryError.NO_SUCH_OBJECT ("No such object");
         }
 
-        return (ArrayList<MediaObject>) children;
+        return children;
     }
 
     // Private methods

Modified: trunk/src/plugins/test/rygel-test-content-dir.vala
==============================================================================
--- trunk/src/plugins/test/rygel-test-content-dir.vala	(original)
+++ trunk/src/plugins/test/rygel-test-content-dir.vala	Wed Jan 28 12:33:28 2009
@@ -54,7 +54,7 @@
         this.root_container.child_count = this.items.size;
     }
 
-    public override ArrayList<MediaObject> get_root_children (
+    public override Gee.List<MediaObject> get_root_children (
                                                  uint     offset,
                                                  uint     max_count,
                                                  out uint child_count)
@@ -76,7 +76,7 @@
             throw new ContentDirectoryError.NO_SUCH_OBJECT ("No such object");
         }
 
-        return (ArrayList<MediaObject>) children;
+        return children;
     }
 
     public override MediaObject find_object_by_id (string object_id)

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:28 2009
@@ -69,7 +69,7 @@
         this.search_parser = new SearchCriteriaParser ();
     }
 
-    public override ArrayList<MediaObject> get_children (
+    public override Gee.List<MediaObject> get_children (
                                                  string   container_id,
                                                  uint     offset,
                                                  uint     max_count,
@@ -105,7 +105,7 @@
         return media_object;
     }
 
-    public override ArrayList<MediaObject> get_root_children (
+    public override Gee.List<MediaObject> get_root_children (
                                                  uint     offset,
                                                  uint     max_count,
                                                  out uint child_count)
@@ -127,7 +127,7 @@
             throw new ContentDirectoryError.NO_SUCH_OBJECT ("No such object");
         }
 
-        return (ArrayList<MediaObject>) children;
+        return children;
     }
 
     /* Private methods */

Modified: trunk/src/rygel/rygel-content-directory.vala
==============================================================================
--- trunk/src/rygel/rygel-content-directory.vala	(original)
+++ trunk/src/rygel/rygel-content-directory.vala	Wed Jan 28 12:33:28 2009
@@ -73,11 +73,11 @@
     DIDLLiteWriter didl_writer;
 
     // Public abstract methods derived classes need to implement
-    public virtual ArrayList<MediaObject> get_children (string   container_id,
-                                                        uint     offset,
-                                                        uint     max_count,
-                                                        out uint child_count)
-                                                        throws GLib.Error {
+    public virtual Gee.List<MediaObject> get_children (string   container_id,
+                                                       uint     offset,
+                                                       uint     max_count,
+                                                       out uint child_count)
+                                                       throws GLib.Error {
         throw new ServerError.NOT_IMPLEMENTED ("Not Implemented\n");
     }
 
@@ -86,7 +86,7 @@
         throw new ServerError.NOT_IMPLEMENTED ("Not Implemented\n");
     }
 
-    public virtual ArrayList<MediaObject> get_root_children (
+    public virtual Gee.List<MediaObject> get_root_children (
                                                     uint     offset,
                                                     uint     max_count,
                                                     out uint child_count)
@@ -332,7 +332,7 @@
         if (args.requested_count == 0)
             args.requested_count = MAX_REQUESTED_COUNT;
 
-        ArrayList<MediaItem> children;
+        Gee.List<MediaItem> children;
 
         children = this.get_children (args.object_id,
                                       args.index,