From d52e176daf8e3700fbca59c08d224679b5e61321 Mon Sep 17 00:00:00 2001 From: "Zeeshan Ali (Khattak)" Date: Wed, 2 Sep 2009 15:29:53 +0300 Subject: [PATCH] core: Early protocol detection --- src/rygel/rygel-media-item.vala | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/rygel/rygel-media-item.vala b/src/rygel/rygel-media-item.vala index 0090f68..1cfaa21 100644 --- a/src/rygel/rygel-media-item.vala +++ b/src/rygel/rygel-media-item.vala @@ -109,13 +109,15 @@ public class Rygel.MediaItem : MediaObject { internal void add_resources (DIDLLiteItem didl_item) throws Error { foreach (var uri in this.uris) { - this.add_resource (didl_item, uri, null); + this.add_resource (didl_item, + uri, + this.get_protocol_for_uri (uri)); } } internal DIDLLiteResource add_resource (DIDLLiteItem didl_item, string? uri, - string? protocol) + string protocol) throws Error { var res = didl_item.add_resource (); @@ -142,17 +144,12 @@ public class Rygel.MediaItem : MediaObject { } private ProtocolInfo get_protocol_info (string? uri, - string? protocol) { + string protocol) { var protocol_info = new ProtocolInfo (); protocol_info.mime_type = this.mime_type; protocol_info.dlna_profile = this.dlna_profile; - - if (protocol != null) { - protocol_info.protocol = protocol; - } else if (uri != null) { - protocol_info.protocol = this.get_protocol_for_uri (uri); - } + protocol_info.protocol = protocol; if (this.upnp_class.has_prefix (MediaItem.IMAGE_CLASS)) { protocol_info.dlna_flags |= DLNAFlags.INTERACTIVE_TRANSFER_MODE; -- 2.7.4