diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2010-10-14 06:40:13 -0400 |
|---|---|---|
| committer | Bazaar Package Importer <james.westby@ubuntu.com> | 2010-10-14 06:40:13 -0400 |
| commit | 6db5598e3ec6ddf626c7335105fde807ff964e72 (patch) | |
| tree | 529ffd73ebd0c0c50d857fa0f849218aeca1aa03 /src/mpris2-controller.vala | |
| parent | 1ccd374f4757568a1f676d4814e700330a7b3a04 (diff) | |
| parent | 7620afcd008217151fc02d6440df9741ed3d7e48 (diff) | |
| download | ayatana-indicator-sound-6db5598e3ec6ddf626c7335105fde807ff964e72.tar.gz ayatana-indicator-sound-6db5598e3ec6ddf626c7335105fde807ff964e72.tar.bz2 ayatana-indicator-sound-6db5598e3ec6ddf626c7335105fde807ff964e72.zip | |
Import upstream version 0.4.9
Diffstat (limited to 'src/mpris2-controller.vala')
| -rw-r--r-- | src/mpris2-controller.vala | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala index 54e1868..f355d28 100644 --- a/src/mpris2-controller.vala +++ b/src/mpris2-controller.vala @@ -75,10 +75,10 @@ public class Mpris2Controller : GLib.Object construct{ try { var connection = DBus.Bus.get (DBus.BusType.SESSION); - this.mpris2_root = (MprisRoot) connection.get_object (root_interface.concat(".").concat(this.owner.name.down()), + this.mpris2_root = (MprisRoot) connection.get_object (root_interface.concat(".").concat(this.owner.mpris_name), "/org/mpris/MediaPlayer2", root_interface); - this.player = (MprisPlayer) connection.get_object (root_interface.concat(".").concat(this.owner.name.down()), + this.player = (MprisPlayer) connection.get_object (root_interface.concat(".").concat(this.owner.mpris_name), "/org/mpris/MediaPlayer2", root_interface.concat(".Player")); this.properties_interface = (FreeDesktopProperties) connection.get_object("org.freedesktop.Properties.PropertiesChanged", @@ -92,7 +92,7 @@ public class Mpris2Controller : GLib.Object public void property_changed_cb(string interface_source, HashTable<string, Value?> changed_properties, string[] invalid ) { - debug("properties-changed for interface %s and owner %s", interface_source, this.owner.name.down()); + debug("properties-changed for interface %s and owner %s", interface_source, this.owner.mpris_name); if(changed_properties == null || interface_source.has_prefix(this.root_interface) == false ){ warning("Property-changed hash is null or this is an interface that doesn't concerns us"); @@ -135,10 +135,7 @@ public class Mpris2Controller : GLib.Object return changed_updates; } - private TransportMenuitem.state determine_play_state(string status){ - if(status == null) - return TransportMenuitem.state.PAUSED; - + private TransportMenuitem.state determine_play_state(string status){ if(status != null && status == "Playing"){ return TransportMenuitem.state.PLAYING; } |
