rygel r305 - trunk/src/rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Wed Nov 26 14:28:06 2008
New Revision: 305
URL: http://svn.gnome.org/viewvc/rygel?rev=305&view=rev

Log:
Allow service subclasses to override most of the funtionality.

Make some fields protected and some methods virtual.

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

Modified: trunk/src/rygel/rygel-connection-manager.vala
==============================================================================
--- trunk/src/rygel/rygel-connection-manager.vala	(original)
+++ trunk/src/rygel/rygel-connection-manager.vala	Wed Nov 26 14:28:06 2008
@@ -36,9 +36,9 @@
                     "urn:schemas-upnp-org:service:ConnectionManager:2";
     public const string DESCRIPTION_PATH = "xml/ConnectionManager.xml";
 
-    private string source_protocol_info;
-    private string sink_protocol_info;
-    private string connection_ids;
+    protected string source_protocol_info;
+    protected string sink_protocol_info;
+    protected string connection_ids;
 
     public override void constructed () {
         this.sink_protocol_info   = "";

Modified: trunk/src/rygel/rygel-content-directory.vala
==============================================================================
--- trunk/src/rygel/rygel-content-directory.vala	(original)
+++ trunk/src/rygel/rygel-content-directory.vala	Wed Nov 26 14:28:06 2008
@@ -45,8 +45,7 @@
     public const string DESCRIPTION_PATH = "xml/ContentDirectory.xml";
 
     protected uint32 system_update_id;
-
-    string feature_list;
+    protected string feature_list;
 
     DIDLLiteWriter didl_writer;
 
@@ -110,8 +109,8 @@
     }
 
     /* Browse action implementation */
-    private void browse_cb (ContentDirectory content_dir,
-                            ServiceAction    action) {
+    protected virtual void browse_cb (ContentDirectory content_dir,
+                                      ServiceAction    action) {
         string object_id, browse_flag;
         bool browse_metadata;
         string sort_criteria, filter;