[rygel] gst-renderer: Correct namespace on LastChange events



commit 4914a467db38887b2dfac99414af4578c2ac0602
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Tue Oct 13 18:43:02 2009 +0300

    gst-renderer: Correct namespace on LastChange events

 .../gst-renderer/rygel-gst-av-transport.vala       |    6 ++++--
 src/plugins/gst-renderer/rygel-gst-changelog.vala  |    9 ++++++---
 .../gst-renderer/rygel-gst-rendering-control.vala  |    6 ++++--
 3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/src/plugins/gst-renderer/rygel-gst-av-transport.vala b/src/plugins/gst-renderer/rygel-gst-av-transport.vala
index 8f570de..ba0e3bd 100644
--- a/src/plugins/gst-renderer/rygel-gst-av-transport.vala
+++ b/src/plugins/gst-renderer/rygel-gst-av-transport.vala
@@ -29,6 +29,8 @@ public class Rygel.GstAVTransport : Service {
     public const string UPNP_TYPE =
                     "urn:schemas-upnp-org:service:AVTransport:2";
     public const string DESCRIPTION_PATH = "xml/AVTransport2.xml";
+    public const string LAST_CHANGE_NS =
+                    "urn:schemas-upnp-org:metadata-1-0/AVT/";
 
     // The setters below update the LastChange message
     private uint _n_tracks = 0;
@@ -134,7 +136,7 @@ public class Rygel.GstAVTransport : Service {
     private GstVideoWindow video_window;
 
     public override void constructed () {
-        this.changelog = new GstChangeLog (this);
+        this.changelog = new GstChangeLog (this, LAST_CHANGE_NS);
         this.video_window = GstVideoWindow.get_default ();
 
         query_variable["LastChange"] += query_last_change_cb;
@@ -160,7 +162,7 @@ public class Rygel.GstAVTransport : Service {
                                        string         variable,
                                        ref Value      value) {
         // Send current state
-        GstChangeLog log = new GstChangeLog (null);
+        GstChangeLog log = new GstChangeLog (null, LAST_CHANGE_NS);
 
         log.log ("TransportState",
                  this.video_window.playback_state);
diff --git a/src/plugins/gst-renderer/rygel-gst-changelog.vala b/src/plugins/gst-renderer/rygel-gst-changelog.vala
index 480e18b..baf8fc9 100644
--- a/src/plugins/gst-renderer/rygel-gst-changelog.vala
+++ b/src/plugins/gst-renderer/rygel-gst-changelog.vala
@@ -28,14 +28,17 @@ using GUPnP;
 public class Rygel.GstChangeLog : Object {
     public unowned Service service { get; set; }
 
+    private string service_ns;
+
     private StringBuilder str;
 
     private Gee.HashMap<string, string> hash;
 
     private uint timeout_id = 0;
 
-    public GstChangeLog (Service? service) {
+    public GstChangeLog (Service? service, string service_ns) {
         service = service;
+        this.service_ns = service_ns;
         str = new StringBuilder ();
         hash = new Gee.HashMap<string, string> ();
     }
@@ -84,8 +87,8 @@ public class Rygel.GstChangeLog : Object {
 
     public string finish () {
         str.append ("<Event xmlns=\"" +
-                    "urn:schemas-upnp-org:metadata-1-0/AVT_RCS\">" +
-                    "<InstanceID val=\"0\">");
+                    this.service_ns +
+                    "\"><InstanceID val=\"0\">");
         foreach (string line in hash.values) {
             str.append (line);
         }
diff --git a/src/plugins/gst-renderer/rygel-gst-rendering-control.vala b/src/plugins/gst-renderer/rygel-gst-rendering-control.vala
index cde6a34..b3e5e27 100644
--- a/src/plugins/gst-renderer/rygel-gst-rendering-control.vala
+++ b/src/plugins/gst-renderer/rygel-gst-rendering-control.vala
@@ -30,6 +30,8 @@ public class Rygel.GstRenderingControl : Service {
     public const string UPNP_TYPE =
                     "urn:schemas-upnp-org:service:RenderingControl:2";
     public const string DESCRIPTION_PATH = "xml/RenderingControl2.xml";
+    public const string LAST_CHANGE_NS =
+                    "urn:schemas-upnp-org:metadata-1-0/RCS/";
 
     private bool _mute = false;
     public bool mute {
@@ -77,7 +79,7 @@ public class Rygel.GstRenderingControl : Service {
     private GstVideoWindow video_window;
 
     public override void constructed () {
-        this.changelog = new GstChangeLog (this);
+        this.changelog = new GstChangeLog (this, LAST_CHANGE_NS);
         this.video_window = GstVideoWindow.get_default ();
 
         query_variable["LastChange"] += query_last_change_cb;
@@ -96,7 +98,7 @@ public class Rygel.GstRenderingControl : Service {
                                        string              variable,
                                        ref GLib.Value      value) {
         // Send current state
-        var log = new GstChangeLog (null);
+        var log = new GstChangeLog (null, LAST_CHANGE_NS);
 
         log.log_with_channel ("Mute", mute ? "1" : "0", "Master");
         log.log_with_channel ("Volume", this.volume.to_string (), "Master");



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