From 30ec3addd7d522444506ec5ac851613d6431a5bf Mon Sep 17 00:00:00 2001 From: "Zeeshan Ali (Khattak)" Date: Wed, 26 Nov 2008 14:28:06 +0000 Subject: [PATCH] Allow service subclasses to override most of the funtionality. Make some fields protected and some methods virtual. svn path=/trunk/; revision=305 --- src/rygel/rygel-connection-manager.vala | 6 +++--- src/rygel/rygel-content-directory.vala | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/rygel/rygel-connection-manager.vala b/src/rygel/rygel-connection-manager.vala index cff6c6b..4bedf0f 100644 --- a/src/rygel/rygel-connection-manager.vala +++ b/src/rygel/rygel-connection-manager.vala @@ -36,9 +36,9 @@ public class Rygel.ConnectionManager : Service { "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 = ""; diff --git a/src/rygel/rygel-content-directory.vala b/src/rygel/rygel-content-directory.vala index f1256be..193b060 100644 --- a/src/rygel/rygel-content-directory.vala +++ b/src/rygel/rygel-content-directory.vala @@ -45,8 +45,7 @@ public class Rygel.ContentDirectory: Service { 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 @@ public class Rygel.ContentDirectory: Service { } /* 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; -- 2.7.4