Merge lp:~cjcurran/indicator-sound/playlist-fixes into lp:indicator-sound/fourth

[Conor Curran]

=== modified file 'src/mpris2-controller.vala'
--- src/mpris2-controller.vala	2011-07-06 11:50:58 +0000
+++ src/mpris2-controller.vala	2011-09-09 17:55:59 +0000
@@ -21,11 +21,12 @@
 
 public class Mpris2Controller : GLib.Object
 {
+  public const int MAX_PLAYLIST_COUNT = 20;
+
   public MprisRoot mpris2_root {get; construct;}    
   public MprisPlayer player {get; construct;}
   public MprisPlaylists playlists {get; construct;}
   public FreeDesktopProperties properties_interface {get; construct;}
-
   public PlayerController owner {get; construct;}
 
   public Mpris2Controller(PlayerController ctrl)
@@ -226,7 +227,7 @@
     
     try{   
       current_playlists =  yield this.playlists.GetPlaylists (0,
-                                                              10,
+                                                              MAX_PLAYLIST_COUNT,
                                                               "Alphabetical",
                                                               false);
     }

=== modified file 'src/music-player-bridge.vala'
--- src/music-player-bridge.vala	2011-08-10 15:18:51 +0000
+++ src/music-player-bridge.vala	2011-09-09 17:55:59 +0000
@@ -131,7 +131,7 @@
       this.registered_clients[mpris_key].use_playlists = use_playlists;
       this.registered_clients[mpris_key].update_state ( PlayerController.state.READY );
       this.registered_clients[mpris_key].activate ( dbus_name );
-      debug("Application has already registered - awaken the hibernation: %s \n", dbus_name );
+      debug("Application has already registered - awaken the hibernation: %s with playlists %s \n", dbus_name, use_playlists.to_string() );
     }
   }
   

=== modified file 'src/player-controller.vala'
--- src/player-controller.vala	2011-09-08 18:27:52 +0000
+++ src/player-controller.vala	2011-09-09 17:55:59 +0000
@@ -30,6 +30,8 @@
     TRANSPORT,
     PLAYLISTS
   }
+  
+  
 
   public enum state{
     OFFLINE,
@@ -169,11 +171,9 @@
 
   public void update_layout()
   {    
-    debug ("a call to update layout"); 
     PlaylistsMenuitem playlists_menuitem = this.custom_items[widget_order.PLAYLISTS] as PlaylistsMenuitem;
     MetadataMenuitem metadata_menuitem = this.custom_items[widget_order.METADATA] as MetadataMenuitem;
     if(this.current_state != state.CONNECTED){
-      // TODO 
       metadata_menuitem.should_collapse (true);
       playlists_menuitem.root_item.property_set_bool (MENUITEM_PROP_VISIBLE,
                                                       false );
@@ -212,7 +212,7 @@
     this.custom_items.add(playlist_menuitem);
     
     foreach(PlayerItem item in this.custom_items){
-      if (this.custom_items.index_of(item) == 4) {
+      if (this.custom_items.index_of(item) == WIDGET_QUANTITY-1) {
         PlaylistsMenuitem playlists_menuitem = item as PlaylistsMenuitem;
         root_menu.child_add_position(playlists_menuitem.root_item, this.menu_offset + this.custom_items.index_of(item));
       }

=== modified file 'src/playlists-menu-item.vala'
--- src/playlists-menu-item.vala	2011-06-21 09:04:29 +0000
+++ src/playlists-menu-item.vala	2011-09-09 17:55:59 +0000
@@ -62,6 +62,7 @@
       );
       this.current_playlists.set( menuitem.id, menuitem ); 
       this.root_item.child_append( menuitem );
+      debug ("populating valid playlists %s", detail.name);
     }
     // Finally remove any that might have been deleted
     foreach (Dbusmenu.Menuitem item in this.current_playlists.values) {

=== modified file 'src/specific-items-manager.vala'
--- src/specific-items-manager.vala	2011-09-08 18:27:52 +0000
+++ src/specific-items-manager.vala	2011-09-09 17:55:59 +0000
@@ -51,10 +51,12 @@
   {
     int result = 0 ;
     if (this.of_type == category.TRACK){
-      result = this.owner.menu_offset + 4 + this.proxy_items.size; 
+      result = this.owner.menu_offset + this.owner.WIDGET_QUANTITY + this.proxy_items.size; 
     }
     else if (this.of_type == category.PLAYER){
-      int pos = this.owner.menu_offset + 4 + this.owner.track_specific_count();
+      int pos = this.owner.menu_offset + this.owner.WIDGET_QUANTITY + this.owner.track_specific_count();
+      //Surely the playlists item is there whether its visible or not ?
+      //TODO test playlists and player specific item positioning.
       pos  += this.owner.use_playlists == true ? 1 : 0;
       result = pos;
     }