rygel r686 - trunk/src/rygel

[zeeshanak svn gnome org]

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

Log:
TranscodeManager.create_uri_for_item() tells the protocol.

Modified:
   trunk/src/rygel/rygel-http-server.vala
   trunk/src/rygel/rygel-transcode-manager.vala

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:03:27 2009
@@ -65,9 +65,10 @@
                                 MediaItem                    item)
                                 throws Error {
         // Create the HTTP proxy URI
-        var uri = this.create_uri_for_item (item, null);
+        string protocol;
+        var uri = this.create_uri_for_item (item, null, out protocol);
         DIDLLiteResource res = item.create_res (uri);
-        res.protocol = "http-get";
+        res.protocol = protocol;
 
         if (!http_res_present (resources)) {
             resources.insert (0, res);
@@ -106,14 +107,17 @@
                                           path);
     }
 
-    internal override string create_uri_for_item (MediaItem item,
-                                                  string?   transcode_target) {
+    internal override string create_uri_for_item (MediaItem  item,
+                                                  string?    transcode_target,
+                                                  out string protocol) {
         string escaped = Uri.escape_string (item.id, "", true);
         string query = "?itemid=" + escaped;
         if (transcode_target != null) {
             query += "&transcode=" + transcode_target;
         }
 
+        protocol = "http-get";
+
         return create_uri_for_path (query);
     }
 

Modified: trunk/src/rygel/rygel-transcode-manager.vala
==============================================================================
--- trunk/src/rygel/rygel-transcode-manager.vala	(original)
+++ trunk/src/rygel/rygel-transcode-manager.vala	Sun Mar 15 19:03:27 2009
@@ -27,8 +27,9 @@
 
 public abstract class Rygel.TranscodeManager : GLib.Object {
     internal abstract string create_uri_for_item
-                                            (MediaItem item,
-                                             string?   transcode_target);
+                                            (MediaItem  item,
+                                             string?    transcode_target,
+                                             out string protocol);
 
     internal virtual void add_resources (ArrayList<DIDLLiteResource?> resources,
                                          MediaItem                    item)
@@ -38,10 +39,11 @@
             return;
         } else {
             var mime_type = "video/mpeg";
-            var uri = this.create_uri_for_item (item, mime_type);
+            string protocol;
+            var uri = this.create_uri_for_item (item, mime_type, out protocol);
             DIDLLiteResource res = item.create_res (uri);
             res.mime_type = mime_type;
-            res.protocol = "http-get";
+            res.protocol = protocol;
             res.dlna_conversion = DLNAConversion.TRANSCODED;
             res.dlna_flags = DLNAFlags.STREAMING_TRANSFER_MODE;
             res.dlna_operation = DLNAOperation.NONE;