[rygel] core: Correct GetCurrentConnectionInfo params



commit 13a15716f220fc0bfa5039b95baf5e2ccdf88267
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Sat Aug 7 03:19:01 2010 +0300

    core: Correct GetCurrentConnectionInfo params
    
    Provide correct values for out parameters of GetCurrentConnectionInfo
    action.

 src/rygel/rygel-connection-manager.vala        |   32 ++++++++++++++++++-----
 src/rygel/rygel-sink-connection-manager.vala   |    4 +++
 src/rygel/rygel-source-connection-manager.vala |    4 +++
 3 files changed, 33 insertions(+), 7 deletions(-)
---
diff --git a/src/rygel/rygel-connection-manager.vala b/src/rygel/rygel-connection-manager.vala
index b2ef5f3..2277b39 100644
--- a/src/rygel/rygel-connection-manager.vala
+++ b/src/rygel/rygel-connection-manager.vala
@@ -38,6 +38,10 @@ internal class Rygel.ConnectionManager : Service {
     protected string connection_ids;
     protected string source_protocol_info;
 
+    protected int rcs_id;
+    protected int av_transport_id;
+    protected string direction;
+
     public override void constructed () {
         this.sink_protocol_info   = "";
         this.source_protocol_info = "";
@@ -105,13 +109,27 @@ internal class Rygel.ConnectionManager : Service {
             return;
         }
 
-        action.set ("RcsID",                 typeof (int),    -1,
-                    "AVTransportID",         typeof (int),    -1,
-                    "ProtocolInfo",          typeof (string), "",
-                    "PeerConnectionManager", typeof (string), "",
-                    "PeerConnectionID",      typeof (int),    -1,
-                    "Direction",             typeof (string), "Input",
-                    "Status",                typeof (string), "Unknown");
+        action.set ("RcsID",
+                        typeof (int),
+                        this.rcs_id,
+                    "AVTransportID",
+                        typeof (int),
+                        this.av_transport_id,
+                    "ProtocolInfo",
+                        typeof (string),
+                        "",
+                    "PeerConnectionManager",
+                        typeof (string),
+                        "",
+                    "PeerConnectionID",
+                        typeof (int),
+                        -1,
+                    "Direction",
+                        typeof (string),
+                        this.direction,
+                    "Status",
+                        typeof (string),
+                        "OK");
 
         action.return ();
     }
diff --git a/src/rygel/rygel-sink-connection-manager.vala b/src/rygel/rygel-sink-connection-manager.vala
index 59d29db..950021f 100644
--- a/src/rygel/rygel-sink-connection-manager.vala
+++ b/src/rygel/rygel-sink-connection-manager.vala
@@ -29,6 +29,10 @@ internal class Rygel.SinkConnectionManager : Rygel.ConnectionManager {
     public override void constructed () {
         base.constructed ();
 
+        this.rcs_id = 0;
+        this.av_transport_id = 0;
+        this.direction = "Input";
+
         var plugin = this.root_device.resource_factory as MediaRendererPlugin;
         this.player = plugin.get_player ();
 
diff --git a/src/rygel/rygel-source-connection-manager.vala b/src/rygel/rygel-source-connection-manager.vala
index a27f9e6..df640c8 100644
--- a/src/rygel/rygel-source-connection-manager.vala
+++ b/src/rygel/rygel-source-connection-manager.vala
@@ -30,6 +30,10 @@ internal class Rygel.SourceConnectionManager : Rygel.ConnectionManager {
     public override void constructed () {
         base.constructed ();
 
+        this.rcs_id = -1;
+        this.av_transport_id = -1;
+        this.direction = "Output";
+
         var server = this.get_http_server ();
         this.source_protocol_info = server.get_protocol_info ();
     }



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