Streamer doesn't derive from GUPnP.Context anymore.

Streamer doesn't derive from GUPnP.Context anymore but rather uses an
existing GUPnP.Conext object.

svn path=/trunk/; revision=331

diff --git a/src/rygel/rygel-streamer.vala b/src/rygel/rygel-streamer.vala
index 989163b..7ecb6b5 100644 (file)
--- a/src/rygel/rygel-streamer.vala
+++ b/src/rygel/rygel-streamer.vala
@@ -25,23 +25,23 @@
 
 using Gee;
 
-public class Rygel.Streamer : GUPnP.Context {
+public class Rygel.Streamer : GLib.Object {
     public const string SERVER_PATH_ROOT = "/RygelStreamer";
 
+    private GUPnP.Context context;
+
     /* Mapping of hosted_paths to mimetypes */
     private HashMap<string,string> path_hash;
 
     public signal void stream_available (Rygel.Stream stream,
                                          string       path);
 
-    public Streamer (string host_ip,
-                     uint   port) {
-        this.host_ip = host_ip;
-        this.port = port;
+    public Streamer (GUPnP.Context context) {
+        this.context = context;
 
         this.path_hash = new HashMap<string,string> (str_hash, str_equal);
 
-        this.server.add_handler (SERVER_PATH_ROOT, server_handler);
+        context.server.add_handler (SERVER_PATH_ROOT, server_handler);
     }
 
     public void add_stream_candidate (string path,