rygel r338 - in trunk/src: plugins/test rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Sun Dec 14 20:21:48 2008
New Revision: 338
URL: http://svn.gnome.org/viewvc/rygel?rev=338&view=rev

Log:
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.

Modified:
   trunk/src/plugins/test/rygel-test-content-dir.vala
   trunk/src/rygel/rygel-streamer.vala

Modified: trunk/src/plugins/test/rygel-test-content-dir.vala
==============================================================================
--- trunk/src/plugins/test/rygel-test-content-dir.vala	(original)
+++ trunk/src/plugins/test/rygel-test-content-dir.vala	Sun Dec 14 20:21:48 2008
@@ -39,7 +39,7 @@
         // Chain-up to base first
         base.constructed ();
 
-        Streamer streamer = new Streamer (context);
+        Streamer streamer = new Streamer (context, "RygelTest");
 
         this.items = new List<MediaItem> ();
         this.items.append (new TestAudioItem ("testaudio",

Modified: trunk/src/rygel/rygel-streamer.vala
==============================================================================
--- trunk/src/rygel/rygel-streamer.vala	(original)
+++ trunk/src/rygel/rygel-streamer.vala	Sun Dec 14 20:21:48 2008
@@ -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 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<string,string> (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 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 @@
                                  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;