rygel r93 - in trunk: . data/xml src

[zeeshanak svn gnome org]

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

Log:
Enable the ConnectionManager service.

Modified:
   trunk/ChangeLog
   trunk/data/xml/Makefile.am
   trunk/data/xml/description.xml
   trunk/src/gupnp-media-server.vala

Modified: trunk/data/xml/Makefile.am
==============================================================================
--- trunk/data/xml/Makefile.am	(original)
+++ trunk/data/xml/Makefile.am	Tue Oct 28 21:00:08 2008
@@ -1,5 +1,6 @@
 xml_DATA = description.xml \
 	   ContentDirectory.xml \
+	   ConnectionManager.xml \
 	   X_MS_MediaReceiverRegistrar1.xml \
 	   description-xbox360.xml
 

Modified: trunk/data/xml/description.xml
==============================================================================
--- trunk/data/xml/description.xml	(original)
+++ trunk/data/xml/description.xml	Tue Oct 28 21:00:08 2008
@@ -23,8 +23,6 @@
 <eventSubURL>/ContentDirectory/Event</eventSubURL>
 <controlURL>/ContentDirectory/Control</controlURL>
 </service>
-<!-- FIXME: Implement the service, uncomment these lines and enable the
-            distribution of the SCPD in the build.
 <service>
 <serviceType>urn:schemas-upnp-org:service:ConnectionManager:2</serviceType>
 <serviceId>urn:upnp-org:serviceId:ConnectionManager</serviceId>
@@ -32,7 +30,6 @@
 <eventSubURL>/ConnectionManager/Event</eventSubURL>
 <controlURL>/ConnectionManager/Control</controlURL>
 </service>
--->
 <service>
 <serviceType>urn:microsoft.com:service:X_MS_MediaReceiverRegistrar:1</serviceType>
 <serviceId>urn:microsoft.com:serviceId:X_MS_MediaReceiverRegistrar</serviceId>

Modified: trunk/src/gupnp-media-server.vala
==============================================================================
--- trunk/src/gupnp-media-server.vala	(original)
+++ trunk/src/gupnp-media-server.vala	Tue Oct 28 21:00:08 2008
@@ -31,6 +31,8 @@
 public class GUPnP.MediaServer: RootDevice {
     public static const string CONTENT_DIR =
                         "urn:schemas-upnp-org:service:ContentDirectory";
+    public static const string CONNECTION_MANAGER =
+                        "urn:schemas-upnp-org:service:ConnectionManager";
     public static const string MEDIA_RECEIVER_REGISTRAR =
                         "urn:microsoft.com:service:X_MS_MediaReceiverRegistrar";
 
@@ -40,7 +42,8 @@
     public static const string GCONF_PATH = "/apps/gupnp-media-server/";
 
     private ContentDirectory content_dir; /* ContentDirectory */
-    private MediaReceiverRegistrar msr;  /* MS MediaReceiverRegistrar */
+    private ConnectionManager cm;         /* ConnectionManager */
+    private MediaReceiverRegistrar msr;   /* MS MediaReceiverRegistrar */
 
     construct {
         ResourceFactory factory = this.resource_factory;
@@ -51,6 +54,12 @@
         factory.register_resource_type (CONTENT_DIR + ":2",
                                         typeof (ContentDirectory));
 
+        /* Register GUPnP.ConnectionManager */
+        factory.register_resource_type (CONNECTION_MANAGER + ":1",
+                                        typeof (ConnectionManager));
+        factory.register_resource_type (CONNECTION_MANAGER + ":2",
+                                        typeof (ConnectionManager));
+
         /* Register GUPnP.MediaReceiverRegistrar */
         factory.register_resource_type (MEDIA_RECEIVER_REGISTRAR + ":1",
                                         typeof (MediaReceiverRegistrar));
@@ -59,6 +68,7 @@
 
         /* Now create the sevice objects */
         this.content_dir = (ContentDirectory) this.get_service (CONTENT_DIR);
+        this.cm = (ConnectionManager) this.get_service (CONNECTION_MANAGER);
         this.msr = (MediaReceiverRegistrar) this.get_service
                                                 (MEDIA_RECEIVER_REGISTRAR);
     }