From 037c5de036bcfa2cdd1ab2b151346e48ffda5445 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 29 Mar 2011 11:05:52 +0100 Subject: changed another error to a warning, tidied a few things --- src/mpris2-controller.vala | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala index 94c52c0..07ac9a2 100644 --- a/src/mpris2-controller.vala +++ b/src/mpris2-controller.vala @@ -45,19 +45,19 @@ public class Mpris2Controller : GLib.Object this.player = Bus.get_proxy_sync ( BusType.SESSION, this.owner.dbus_name, "/org/mpris/MediaPlayer2" ); + this.properties_interface = Bus.get_proxy_sync ( BusType.SESSION, + "org.freedesktop.Properties.PropertiesChanged", + "/org/mpris/MediaPlayer2" ); + this.properties_interface.PropertiesChanged.connect ( property_changed_cb ); if ( this.owner.use_playlists == true ){ this.playlists = Bus.get_proxy_sync ( BusType.SESSION, this.owner.dbus_name, "/org/mpris/MediaPlayer2" ); this.playlists.PlaylistChanged.connect (on_playlistdetails_changed); } - this.properties_interface = Bus.get_proxy_sync ( BusType.SESSION, - "org.freedesktop.Properties.PropertiesChanged", - "/org/mpris/MediaPlayer2" ); - this.properties_interface.PropertiesChanged.connect ( property_changed_cb ); } catch (IOError e) { - error("Problems connecting to the session bus - %s", e.message); + warning("Problems connecting to the session bus - %s", e.message); } } @@ -68,7 +68,7 @@ public class Mpris2Controller : GLib.Object //debug("properties-changed for interface %s and owner %s", interface_source, this.owner.dbus_name); if ( changed_properties == null || interface_source.has_prefix ( MPRIS_PREFIX ) == false ){ - warning("Property-changed hash is null or this is an interface that doesn't concerns us"); + warning("Property-changed hash is null or this is an interface that doesn't concern us"); return; } Variant? play_v = changed_properties.lookup("PlaybackStatus"); @@ -124,6 +124,7 @@ public class Mpris2Controller : GLib.Object private GLib.HashTable? clean_metadata() { GLib.HashTable changed_updates = this.player.Metadata; + Variant? artist_v = this.player.Metadata.lookup("xesam:artist"); if(artist_v != null){ Variant? v_artists = this.player.Metadata.lookup("xesam:artist"); -- cgit v1.2.3