rygel r650 - trunk/src/rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Sun Mar 15 19:00:30 2009
New Revision: 650
URL: http://svn.gnome.org/viewvc/rygel?rev=650&view=rev

Log:
Create and report transcode URIs as well.

Modified:
   trunk/src/rygel/rygel-didl-lite-writer.vala
   trunk/src/rygel/rygel-http-server.vala

Modified: trunk/src/rygel/rygel-didl-lite-writer.vala
==============================================================================
--- trunk/src/rygel/rygel-didl-lite-writer.vala	(original)
+++ trunk/src/rygel/rygel-didl-lite-writer.vala	Sun Mar 15 19:00:30 2009
@@ -168,7 +168,6 @@
         }
     }
 
-    // FIXME: We only proxy URIs through our HTTP server for now
     private ArrayList<DIDLLiteResource?>? get_transcoded_resources
                                 (MediaItem                    item,
                                  ArrayList<DIDLLiteResource?> orig_res_list)
@@ -179,11 +178,16 @@
             return resources;
         }
 
-        // Create the HTTP URI
-        var uri = this.http_server.create_http_uri_for_item (item);
+        // Create the HTTP proxy URI
+        var uri = this.http_server.create_http_uri_for_item (item, false);
         DIDLLiteResource res = create_res (item, uri);
         res.protocol = "http-get";
+        resources.add (res);
 
+        // Create the HTTP transcode URI
+        uri = this.http_server.create_http_uri_for_item (item, true);
+        res = create_res (item, uri);
+        res.protocol = "http-get";
         resources.add (res);
 
         return resources;

Modified: trunk/src/rygel/rygel-http-server.vala
==============================================================================
--- trunk/src/rygel/rygel-http-server.vala	(original)
+++ trunk/src/rygel/rygel-http-server.vala	Sun Mar 15 19:00:30 2009
@@ -71,9 +71,10 @@
                                           path);
     }
 
-    internal string create_http_uri_for_item (MediaItem item) {
+    internal string create_http_uri_for_item (MediaItem item, bool transcode) {
         string escaped = Uri.escape_string (item.id, "", true);
-        string query = "?itemid=%s".printf (escaped);
+        string query = "?itemid=%s?transcode=%s".printf (escaped,
+                                                         transcode.to_string ());
 
         return create_uri_for_path (query);
     }