Merge lp:~cjcurran/indicator-sound/title-changing into lp:~indicator-applet-developers/indicator-sound/trunk_3

[Conor Curran]

Allows players to dynamically change the title on the player item.
This is a requirement for ubuntu one streaming client

[Mikkel Kamstrup Erlandsen (kamstrup)]

65 + public void alter_label (string new_title)
66 + {
67 + if (new_title != null) return;
68 + this.property_set(MENUITEM_NAME, new_title);
69 + }

This method is a no-op unless new_title == NULL, in which case it sets the MENUITEM_NAME property to null... That doesn't look right?

review: Needs Fixing

[Mikkel Kamstrup Erlandsen (kamstrup)]

I'm a happy camper now :-)

review: Approve

=== modified file 'src/mpris2-controller.vala'
--- src/mpris2-controller.vala	2011-01-27 23:08:08 +0000
+++ src/mpris2-controller.vala	2011-02-01 14:47:02 +0000
@@ -103,6 +103,11 @@
       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 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 ){

=== modified file 'src/sound-service-dbus.c'
--- src/sound-service-dbus.c	2011-02-01 15:50:29 +0000
+++ src/sound-service-dbus.c	2011-02-01 14:47:02 +0000
@@ -452,7 +452,7 @@
         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 @@
       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 @@
                                  value);
 
   g_object_unref (our_settings);
-  g_object_unref (the_black_list);
+  g_variant_unref (the_black_list);
   
   return result;
 }

=== modified file 'src/title-menu-item.vala'
--- src/title-menu-item.vala	2011-01-10 12:57:35 +0000
+++ src/title-menu-item.vala	2011-02-01 14:47:02 +0000
@@ -26,8 +26,12 @@
   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 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);