rygel r514 - trunk/src/rygel

[zeeshanak svn gnome org]

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

Log:
No need for all methods in ContentDir to be protected virtual.

Modified:
   trunk/src/rygel/rygel-content-directory.vala

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:34:32 2009
@@ -305,7 +305,7 @@
         action.return ();
     }
 
-    protected virtual void add_children_metadata (DIDLLiteWriter didl_writer,
+    private void add_children_metadata (DIDLLiteWriter didl_writer,
                                                   BrowseArgs     args)
                                                   throws GLib.Error {
         if (args.requested_count == 0)
@@ -327,7 +327,7 @@
         args.update_id = uint32.MAX;
     }
 
-    protected virtual void add_metadata (DIDLLiteWriter didl_writer,
+    private void add_metadata (DIDLLiteWriter didl_writer,
                                          BrowseArgs     args)
                                          throws GLib.Error {
         MediaObject media_object = find_object_by_id (args.object_id);
@@ -336,7 +336,7 @@
         args.update_id = uint32.MAX;
     }
 
-    protected virtual void add_root_children_metadata (
+    private void add_root_children_metadata (
                                         DIDLLiteWriter didl_writer,
                                         BrowseArgs     args)
                                         throws GLib.Error {
@@ -351,11 +351,11 @@
         args.update_id = uint32.MAX;
     }
 
-    protected virtual Gee.List<MediaObject> get_children (string   container_id,
-                                                          uint     offset,
-                                                          uint     max_count,
-                                                          out uint child_count)
-                                                          throws GLib.Error {
+    private Gee.List<MediaObject> get_children (string   container_id,
+                                                uint     offset,
+                                                uint     max_count,
+                                                out uint child_count)
+                                                throws GLib.Error {
         var media_object = this.find_object_by_id (container_id);
         if (media_object == null || !(media_object is MediaContainer)) {
             throw new ContentDirectoryError.NO_SUCH_OBJECT ("No such object");
@@ -372,8 +372,7 @@
         return children;
     }
 
-    protected virtual MediaObject find_object_by_id (string object_id)
-                                                     throws GLib.Error {
+    private MediaObject find_object_by_id (string object_id) throws GLib.Error {
         var media_object = this.root_container.find_object_by_id (object_id);
         if (media_object == null) {
             throw new ContentDirectoryError.NO_SUCH_OBJECT ("No such object");
@@ -382,11 +381,10 @@
         return media_object;
     }
 
-    protected virtual Gee.List<MediaObject> get_root_children (
-                                                    uint     offset,
-                                                    uint     max_count,
-                                                    out uint child_count)
-                                                    throws GLib.Error {
+    private Gee.List<MediaObject> get_root_children (uint     offset,
+                                                     uint     max_count,
+                                                     out uint child_count)
+                                                     throws GLib.Error {
         var children = this.root_container.get_children (offset,
                                                          max_count,
                                                          out child_count);