[rygel] core: TranscodeManager shouldn't know about protocol



commit 42bb855facbb890de2667f02fbc91025146349cd
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Wed Jul 29 01:05:59 2009 +0300

    core: TranscodeManager shouldn't know about protocol
    
    TranscodeManager doesn't need to know about transport protocol being
    used by it's implementation class(es).

 src/rygel/rygel-http-server.vala       |    6 +++++-
 src/rygel/rygel-transcode-manager.vala |    5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/rygel/rygel-http-server.vala b/src/rygel/rygel-http-server.vala
index 829ba94..2c32958 100644
--- a/src/rygel/rygel-http-server.vala
+++ b/src/rygel/rygel-http-server.vala
@@ -124,8 +124,12 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
         return create_uri_for_path (query);
     }
 
+    internal override string get_protocol () {
+        return "http-get";
+    }
+
     internal override string get_protocol_info () {
-        var protocol_info = "http-get:*:*:*";
+        var protocol_info = this.get_protocol () + ":*:*:*";
         var base_info = base.get_protocol_info ();
 
         if (base_info != "")
diff --git a/src/rygel/rygel-transcode-manager.vala b/src/rygel/rygel-transcode-manager.vala
index fa37105..f5804c2 100644
--- a/src/rygel/rygel-transcode-manager.vala
+++ b/src/rygel/rygel-transcode-manager.vala
@@ -99,6 +99,8 @@ internal abstract class Rygel.TranscodeManager : GLib.Object {
         return transcoder;
     }
 
+    internal abstract string get_protocol ();
+
     internal virtual string get_protocol_info () {
         string protocol_info = "";
 
@@ -106,7 +108,8 @@ internal abstract class Rygel.TranscodeManager : GLib.Object {
             if (protocol_info != "")   // No comma before the first one
                 protocol_info += ",";
 
-            protocol_info += "http-get:*:" + transcoder.mime_type +
+            protocol_info += this.get_protocol () +
+                             ":*:" + transcoder.mime_type +
                              ":DLNA.ORG_PN=" + transcoder.dlna_profile;
         }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]