[rygel] external, gst-renderer, media-export: Namespaces in 'Bus' references



commit f85fcb2580f61bbf7b1e544417cb6d028875d858
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Mon Jun 21 03:39:23 2010 +0300

    external,gst-renderer,media-export: Namespaces in 'Bus' references
    
    Now that we have GLib.Bus, references to DBus.Bus and Gst.Bus as Bus are
    ambiguous.

 src/plugins/external/rygel-external-container.vala |    2 +-
 .../external/rygel-external-content-dir.vala       |    2 +-
 src/plugins/gst-renderer/rygel-gst-player.vala     |    2 +-
 .../rygel-media-export-metadata-extractor.vala     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/plugins/external/rygel-external-container.vala b/src/plugins/external/rygel-external-container.vala
index 4a27fd4..d4c5158 100644
--- a/src/plugins/external/rygel-external-container.vala
+++ b/src/plugins/external/rygel-external-container.vala
@@ -61,7 +61,7 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
         this.containers = new ArrayList<ExternalContainer> ();
 
         try {
-            this.connection = Bus.get (DBus.BusType.SESSION);
+            this.connection = DBus.Bus.get (DBus.BusType.SESSION);
 
             this.update_container ();
 
diff --git a/src/plugins/external/rygel-external-content-dir.vala b/src/plugins/external/rygel-external-content-dir.vala
index c58f328..00fdaa6 100644
--- a/src/plugins/external/rygel-external-content-dir.vala
+++ b/src/plugins/external/rygel-external-content-dir.vala
@@ -37,7 +37,7 @@ public class Rygel.ExternalContentDir : Rygel.ContentDirectory {
         Connection connection;
 
         try {
-            connection = Bus.get (DBus.BusType.SESSION);
+            connection = DBus.Bus.get (DBus.BusType.SESSION);
         } catch (DBus.Error err) {
             // By this time plugin should have successfully accessed the
             // the session bus, so this in theory can not fail.
diff --git a/src/plugins/gst-renderer/rygel-gst-player.vala b/src/plugins/gst-renderer/rygel-gst-player.vala
index 4b47cc3..9dc17f9 100644
--- a/src/plugins/gst-renderer/rygel-gst-player.vala
+++ b/src/plugins/gst-renderer/rygel-gst-player.vala
@@ -134,7 +134,7 @@ public class Rygel.GstPlayer : GLib.Object {
                                   -1);
     }
 
-    private bool bus_handler (Bus     bus,
+    private bool bus_handler (Gst.Bus bus,
                               Message message) {
         if (message.type == MessageType.EOS) {
             debug ("EOS");
diff --git a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
index 87c670a..6966fe6 100644
--- a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
+++ b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
@@ -232,7 +232,7 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
                                             TagMergeMode.REPLACE);
     }
 
-    private void element_message_cb (Bus     bus,
+    private void element_message_cb (Gst.Bus bus,
                                      Message message) {
         if (message.src != this.playbin) {
             return;



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