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

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Mon Feb  9 22:28:14 2009
New Revision: 545
URL: http://svn.gnome.org/viewvc/rygel?rev=545&view=rev

Log:
Rename find_object_by_id to find_object.

Modified:
   trunk/src/plugins/dvb/rygel-dvb-channel-group.vala
   trunk/src/plugins/dvb/rygel-dvb-root-container.vala
   trunk/src/plugins/test/rygel-test-root-container.vala
   trunk/src/plugins/tracker/rygel-tracker-container.vala
   trunk/src/plugins/tracker/rygel-tracker-root-container.vala
   trunk/src/rygel/rygel-browse.vala
   trunk/src/rygel/rygel-http-request.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	Mon Feb  9 22:28:14 2009
@@ -67,8 +67,7 @@
         return this.channels.slice ((int) offset, (int) stop);
     }
 
-    public override MediaObject? find_object_by_id (string id)
-                                                    throws GLib.Error {
+    public override MediaObject? find_object (string id) throws GLib.Error {
         MediaObject channel = null;
         foreach (var tmp in this.channels) {
             if (tmp.id == id) {

Modified: trunk/src/plugins/dvb/rygel-dvb-root-container.vala
==============================================================================
--- trunk/src/plugins/dvb/rygel-dvb-root-container.vala	(original)
+++ trunk/src/plugins/dvb/rygel-dvb-root-container.vala	Mon Feb  9 22:28:14 2009
@@ -107,8 +107,7 @@
         return this.groups.slice ((int) offset, (int) stop);
     }
 
-    public override MediaObject? find_object_by_id (string id)
-                                                    throws GLib.Error {
+    public override MediaObject? find_object (string id) throws GLib.Error {
         // First try groups
         MediaObject media_object = find_group_by_id (id);
 
@@ -138,7 +137,7 @@
         MediaObject channel = null;
 
         foreach (DVBChannelGroup group in this.groups) {
-            channel = group.find_object_by_id (id);
+            channel = group.find_object (id);
             if (channel != null) {
                 break;
             }

Modified: trunk/src/plugins/test/rygel-test-root-container.vala
==============================================================================
--- trunk/src/plugins/test/rygel-test-root-container.vala	(original)
+++ trunk/src/plugins/test/rygel-test-root-container.vala	Mon Feb  9 22:28:14 2009
@@ -57,8 +57,7 @@
         return this.items.slice ((int) offset, (int) stop);
     }
 
-    public override MediaObject? find_object_by_id (string id)
-                                                    throws GLib.Error {
+    public override MediaObject? find_object (string id) throws GLib.Error {
         MediaItem item = null;
 
         foreach (MediaItem tmp in this.items) {

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	Mon Feb  9 22:28:14 2009
@@ -121,7 +121,7 @@
 
         /* Iterate through all items */
         for (uint i = 0; i < child_paths.length; i++) {
-            MediaObject item = this.find_object_by_id (child_paths[i]);
+            MediaObject item = this.find_object (child_paths[i]);
             children.add (item);
         }
 
@@ -136,8 +136,7 @@
         return category;
     }
 
-    public override MediaObject? find_object_by_id (string id)
-                                                    throws GLib.Error {
+    public override MediaObject? find_object (string id) throws GLib.Error {
         MediaObject item;
         string path = id;
 

Modified: trunk/src/plugins/tracker/rygel-tracker-root-container.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-root-container.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-root-container.vala	Mon Feb  9 22:28:14 2009
@@ -70,8 +70,7 @@
         return this.containers.slice ((int) offset, (int) stop);
     }
 
-    public override MediaObject? find_object_by_id (string id)
-                                                    throws GLib.Error {
+    public override MediaObject? find_object (string id) throws GLib.Error {
         /* First try containers */
         MediaObject media_object = find_container_by_id (id);
 
@@ -80,7 +79,7 @@
             var container = get_item_parent (id);
 
             if (container != null)
-                media_object = container.find_object_by_id (id);
+                media_object = container.find_object (id);
         }
 
         return media_object;

Modified: trunk/src/rygel/rygel-browse.vala
==============================================================================
--- trunk/src/rygel/rygel-browse.vala	(original)
+++ trunk/src/rygel/rygel-browse.vala	Mon Feb  9 22:28:14 2009
@@ -95,7 +95,7 @@
 
         try {
             this.media_object =
-                        this.root_container.find_object_by_id (this.object_id);
+                        this.root_container.find_object (this.object_id);
         } catch (Error err) {
             this.handle_error (err);
             return false;

Modified: trunk/src/rygel/rygel-http-request.vala
==============================================================================
--- trunk/src/rygel/rygel-http-request.vala	(original)
+++ trunk/src/rygel/rygel-http-request.vala	Mon Feb  9 22:28:14 2009
@@ -286,7 +286,7 @@
         MediaObject media_object;
 
         try {
-            media_object = this.root_container.find_object_by_id (this.item_id);
+            media_object = this.root_container.find_object (this.item_id);
         } catch (Error error) {
             this.handle_error (error);
             return;

Modified: trunk/src/rygel/rygel-media-container.vala
==============================================================================
--- trunk/src/rygel/rygel-media-container.vala	(original)
+++ trunk/src/rygel/rygel-media-container.vala	Mon Feb  9 22:28:14 2009
@@ -26,7 +26,7 @@
  * Represents a container (folder) for media items and containers. Provides
  * basic serialization (to DIDLLiteWriter) implementation. Deriving classes
  * are supposed to provide working implementations of get_children and
- * find_object_by_id.
+ * find_object.
  */
 public abstract class Rygel.MediaContainer : MediaObject {
     public uint child_count;
@@ -69,5 +69,5 @@
      *
      * return the found media object.
      */
-    public abstract MediaObject? find_object_by_id (string id) throws Error;
+    public abstract MediaObject? find_object (string id) throws Error;
 }