From 2d319209484117e089658ee2265eaa4a81b4e8fa Mon Sep 17 00:00:00 2001 From: "Zeeshan Ali (Khattak)" Date: Sun, 14 Dec 2008 20:21:48 +0000 Subject: [PATCH] Hosted path should be derived from given name. Streamer takes a name as constructor argument and uses that to create the server path it hosts. svn path=/trunk/; revision=338 --- src/plugins/test/rygel-test-content-dir.vala | 2 +- src/rygel/rygel-streamer.vala | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/plugins/test/rygel-test-content-dir.vala b/src/plugins/test/rygel-test-content-dir.vala index 319b525..09a2fff 100644 --- a/src/plugins/test/rygel-test-content-dir.vala +++ b/src/plugins/test/rygel-test-content-dir.vala @@ -39,7 +39,7 @@ public class Rygel.TestContentDir : ContentDirectory { // Chain-up to base first base.constructed (); - Streamer streamer = new Streamer (context); + Streamer streamer = new Streamer (context, "RygelTest"); this.items = new List (); this.items.append (new TestAudioItem ("testaudio", diff --git a/src/rygel/rygel-streamer.vala b/src/rygel/rygel-streamer.vala index 8b40c29..19b1468 100644 --- a/src/rygel/rygel-streamer.vala +++ b/src/rygel/rygel-streamer.vala @@ -26,7 +26,7 @@ using Gee; public class Rygel.Streamer : GLib.Object { - public const string SERVER_PATH_ROOT = "/RygelStreamer"; + private string server_path_root; private GUPnP.Context context; @@ -36,12 +36,14 @@ public class Rygel.Streamer : GLib.Object { public signal void stream_available (Rygel.Stream stream, string path); - public Streamer (GUPnP.Context context) { + public Streamer (GUPnP.Context context, string name) { this.context = context; this.path_hash = new HashMap (str_hash, str_equal); - context.server.add_handler (SERVER_PATH_ROOT, server_handler); + this.server_path_root = "/" + name; + + context.server.add_handler (this.server_path_root, server_handler); } public void add_stream_candidate (string path, @@ -52,7 +54,7 @@ public class Rygel.Streamer : GLib.Object { public string create_uri_for_path (string path) { return "http://%s:%u%s%s".printf (this.context.host_ip, this.context.port, - SERVER_PATH_ROOT, + this.server_path_root, path); } @@ -61,7 +63,7 @@ public class Rygel.Streamer : GLib.Object { string server_path, HashTable? query, Soup.ClientContext soup_client) { - string[] path_tokens = server_path.split (SERVER_PATH_ROOT, 2); + string[] path_tokens = server_path.split (this.server_path_root, 2); if (path_tokens[0] == null || path_tokens[1] == null) { msg.set_status (Soup.KnownStatusCode.NOT_FOUND); return; -- 2.7.4