rygel r142 - in trunk: . src/media-providers/tracker src/media-server

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Tue Oct 28 21:01:23 2008
New Revision: 142
URL: http://svn.gnome.org/viewvc/rygel?rev=142&view=rev

Log:
Rename MediaProvider's browse() to add_children_metadata().

Modified:
   trunk/ChangeLog
   trunk/src/media-providers/tracker/gupnp-media-tracker.vala
   trunk/src/media-server/gupnp-content-directory.vala
   trunk/src/media-server/gupnp-media-manager.vala
   trunk/src/media-server/gupnp-media-provider.vala

Modified: trunk/src/media-providers/tracker/gupnp-media-tracker.vala
==============================================================================
--- trunk/src/media-providers/tracker/gupnp-media-tracker.vala	(original)
+++ trunk/src/media-providers/tracker/gupnp-media-tracker.vala	Tue Oct 28 21:01:23 2008
@@ -116,15 +116,16 @@
         this.context = context;
     }
 
-    public override void browse (DIDLLiteWriter didl_writer,
-                                 string         container_id,
-                                 string         filter,
-                                 uint           starting_index,
-                                 uint           requested_count,
-                                 string         sort_criteria,
-                                 out uint       number_returned,
-                                 out uint       total_matches,
-                                 out uint       update_id) throws GLib.Error {
+    public override void add_children_metadata
+                            (DIDLLiteWriter didl_writer,
+                             string         container_id,
+                             string         filter,
+                             uint           starting_index,
+                             uint           requested_count,
+                             string         sort_criteria,
+                             out uint       number_returned,
+                             out uint       total_matches,
+                             out uint       update_id) throws GLib.Error {
         string id = this.remove_root_id_prefix (container_id);
 
         if (id == this.root_id) {

Modified: trunk/src/media-server/gupnp-content-directory.vala
==============================================================================
--- trunk/src/media-server/gupnp-content-directory.vala	(original)
+++ trunk/src/media-server/gupnp-content-directory.vala	Tue Oct 28 21:01:23 2008
@@ -123,15 +123,15 @@
                 num_returned = 1;
                 total_matches = 1;
             } else {
-                this.media_manager.browse (this.didl_writer,
-                                           object_id,
-                                           filter,
-                                           starting_index,
-                                           requested_count,
-                                           sort_criteria,
-                                           out num_returned,
-                                           out total_matches,
-                                           out update_id);
+                this.media_manager.add_children_metadata (this.didl_writer,
+                                                          object_id,
+                                                          filter,
+                                                          starting_index,
+                                                          requested_count,
+                                                          sort_criteria,
+                                                          out num_returned,
+                                                          out total_matches,
+                                                          out update_id);
             }
 
             /* End DIDL-Lite fragment */

Modified: trunk/src/media-server/gupnp-media-manager.vala
==============================================================================
--- trunk/src/media-server/gupnp-media-manager.vala	(original)
+++ trunk/src/media-server/gupnp-media-manager.vala	Tue Oct 28 21:01:23 2008
@@ -61,15 +61,16 @@
         this.context = context;
     }
 
-    public override void browse (DIDLLiteWriter didl_writer,
-                                 string         container_id,
-                                 string         filter,
-                                 uint           starting_index,
-                                 uint           requested_count,
-                                 string         sort_criteria,
-                                 out uint       number_returned,
-                                 out uint       total_matches,
-                                 out uint       update_id) throws Error {
+    public override void add_children_metadata
+                            (DIDLLiteWriter didl_writer,
+                             string         container_id,
+                             string         filter,
+                             uint           starting_index,
+                             uint           requested_count,
+                             string         sort_criteria,
+                             out uint       number_returned,
+                             out uint       total_matches,
+                             out uint       update_id) throws Error {
         string root_id = this.get_root_id_from_id (container_id);
 
         if (root_id == this.root_id) {
@@ -80,15 +81,15 @@
         } else {
             weak MediaProvider provider = this.providers.lookup (root_id);
             if (provider != null) {
-                provider.browse (didl_writer,
-                                 container_id,
-                                 filter,
-                                 starting_index,
-                                 requested_count,
-                                 sort_criteria,
-                                 out number_returned,
-                                 out total_matches,
-                                 out update_id);
+                provider.add_children_metadata (didl_writer,
+                                                container_id,
+                                                filter,
+                                                starting_index,
+                                                requested_count,
+                                                sort_criteria,
+                                                out number_returned,
+                                                out total_matches,
+                                                out update_id);
 
                 if (update_id == uint32.MAX) {
                     update_id = this.system_update_id;

Modified: trunk/src/media-server/gupnp-media-provider.vala
==============================================================================
--- trunk/src/media-server/gupnp-media-provider.vala	(original)
+++ trunk/src/media-server/gupnp-media-provider.vala	Tue Oct 28 21:01:23 2008
@@ -35,15 +35,16 @@
     public string# title { get; private construct; }
     public GUPnP.Context context { get; construct; }
 
-    public abstract void browse (DIDLLiteWriter didl_writer,
-                                 string         container_id,
-                                 string         filter,
-                                 uint           starting_index,
-                                 uint           requested_count,
-                                 string         sort_criteria,
-                                 out uint       number_returned,
-                                 out uint       total_matches,
-                                 out uint       update_id) throws Error;
+    public abstract void add_children_metadata
+                            (DIDLLiteWriter didl_writer,
+                             string         container_id,
+                             string         filter,
+                             uint           starting_index,
+                             uint           requested_count,
+                             string         sort_criteria,
+                             out uint       number_returned,
+                             out uint       total_matches,
+                             out uint       update_id) throws Error;
 
     public abstract void add_metadata (DIDLLiteWriter didl_writer,
                                        string         object_id,