aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-02-02 16:00:20 -0600
committerConor Curran <conor.curran@canonical.com>2011-02-02 16:00:20 -0600
commitaa063e3e1c57346a6af86cc0a6cee81a846b1154 (patch)
tree6236a6b6fa1096879b8a2ad420752432813eb8f3
parent81ab9100b3d3e767e32ff4c960abf20c089e0457 (diff)
parent2b6453d1a988eb4a82df18401b3ba9b3867a2f40 (diff)
downloadayatana-indicator-sound-aa063e3e1c57346a6af86cc0a6cee81a846b1154.tar.gz
ayatana-indicator-sound-aa063e3e1c57346a6af86cc0a6cee81a846b1154.tar.bz2
ayatana-indicator-sound-aa063e3e1c57346a6af86cc0a6cee81a846b1154.zip
player title is now set via the identity property on the root mpris interface
-rw-r--r--src/mpris2-controller.vala20
-rw-r--r--src/sound-service-dbus.c6
-rw-r--r--src/title-menu-item.vala14
3 files changed, 30 insertions, 10 deletions
diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala
index 03571e6..d4cdc0c 100644
--- a/src/mpris2-controller.vala
+++ b/src/mpris2-controller.vala
@@ -103,6 +103,11 @@ public class Mpris2Controller : GLib.Object
this.fetch_playlists.begin();
this.fetch_active_playlist();
}
+ Variant? identity_v = changed_properties.lookup("Identity");
+ if (identity_v != null){
+ TitleMenuitem title = this.owner.custom_items[PlayerController.widget_order.TITLE] as TitleMenuitem;
+ title.alter_label (this.mpris2_root.Identity);
+ }
}
private bool ensure_correct_playback_status(){
@@ -144,15 +149,20 @@ public class Mpris2Controller : GLib.Object
public void initial_update()
{
TransportMenuitem.state update;
+
if(this.player.PlaybackStatus == null){
update = TransportMenuitem.state.PAUSED;
}
-
- update = determine_play_state(null);
-
- (this.owner.custom_items[PlayerController.widget_order.TRANSPORT] as TransportMenuitem).change_play_state(TransportMenuitem.state.PAUSED);
+ else{
+ update = determine_play_state (this.player.PlaybackStatus);
+ }
+ if (this.mpris2_root.Identity != null){
+ TitleMenuitem title = this.owner.custom_items[PlayerController.widget_order.TITLE] as TitleMenuitem;
+ title.alter_label (this.mpris2_root.Identity);
+ }
+ (this.owner.custom_items[PlayerController.widget_order.TRANSPORT] as TransportMenuitem).change_play_state (update);
GLib.HashTable<string, Value?>? cleaned_metadata = this.clean_metadata();
- this.owner.custom_items[PlayerController.widget_order.METADATA].update(cleaned_metadata,
+ this.owner.custom_items[PlayerController.widget_order.METADATA].update (cleaned_metadata,
MetadataMenuitem.attributes_format());
if ( this.owner.use_playlists == true ){
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index 7f5afdc..637bee4 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -452,7 +452,7 @@ static gboolean sound_service_dbus_blacklist_player (SoundServiceDbus* self,
g_debug ("we have this already blacklisted, no need to do anything");
g_variant_builder_clear (&builder);
g_object_unref (our_settings);
- g_object_unref (the_black_list);
+ g_variant_unref (the_black_list);
return result;
}
}
@@ -475,7 +475,7 @@ static gboolean sound_service_dbus_blacklist_player (SoundServiceDbus* self,
g_debug ("it was not blacklisted ?, no need to do anything");
g_variant_builder_clear (&builder);
g_object_unref (our_settings);
- g_object_unref (the_black_list);
+ g_variant_unref (the_black_list);
return result;
}
@@ -497,7 +497,7 @@ static gboolean sound_service_dbus_blacklist_player (SoundServiceDbus* self,
value);
g_object_unref (our_settings);
- g_object_unref (the_black_list);
+ g_variant_unref (the_black_list);
return result;
}
diff --git a/src/title-menu-item.vala b/src/title-menu-item.vala
index 6ed24d8..ac93b89 100644
--- a/src/title-menu-item.vala
+++ b/src/title-menu-item.vala
@@ -26,8 +26,12 @@ public class TitleMenuitem : PlayerItem
public TitleMenuitem(PlayerController parent)
{
Object(item_type: MENUITEM_TYPE, owner: parent);
- this.property_set(MENUITEM_NAME, parent.app_info.get_name());
- this.property_set(MENUITEM_ICON, parent.icon_name);
+ }
+
+ construct
+ {
+ this.property_set(MENUITEM_NAME, this.owner.app_info.get_name());
+ this.property_set(MENUITEM_ICON, this.owner.icon_name);
this.property_set_bool(MENUITEM_RUNNING, false);
}
@@ -42,6 +46,12 @@ public class TitleMenuitem : PlayerItem
}
}
+ public void alter_label (string new_title)
+ {
+ if (new_title == null) return;
+ this.property_set(MENUITEM_NAME, new_title);
+ }
+
public void toggle_active_triangle(bool update)
{
this.property_set_bool(MENUITEM_RUNNING, update);