playlists merged

11 files changed, 233 insertions, 250 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ef9ef0..82830e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,7 @@ music_bridge_VALASOURCES = \
 	mpris2-controller.vala \
 	player-item.vala \
 	settings-manager.vala \
+	playlists-menu-item.vala \
 	fetch-file.vala
 
 
diff --git a/src/common-defs.h b/src/common-defs.h
index 214f60a..8ec69e8 100644
--- a/src/common-defs.h
+++ b/src/common-defs.h
@@ -49,3 +49,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DBUSMENU_SCRUB_MENUITEM_POSITION        "x-canonical-sound-menu-player-scrub-position"
 #define DBUSMENU_SCRUB_MENUITEM_PLAY_STATE      "x-canonical-sound-menu-player-scrub-play-state"
 
+#define DBUSMENU_PLAYLISTS_MENUITEM_TYPE        "x-canonical-sound-menu-player-playlists-type"
+#define DBUSMENU_PLAYLISTS_MENUITEM_TITLE       "x-canonical-sound-menu-player-playlists-title"
+#define DBUSMENU_PLAYLISTS_MENUITEM_PLAYLISTS   "x-canonical-sound-menu-player-playlists-playlists"
\ No newline at end of file
diff --git a/src/dbus-menu-manager.c b/src/dbus-menu-manager.c
index 37e1c18..f92c324 100644
--- a/src/dbus-menu-manager.c
+++ b/src/dbus-menu-manager.c
@@ -214,6 +214,7 @@ static void rebuild_sound_menu(DbusmenuMenuitem *root, SoundServiceDbus *service
   // Sound preferences dialog
   DbusmenuMenuitem *settings_mi = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set(settings_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Sound Preferences..."));
+  
   //_("Sound Preferences..."));
   dbusmenu_menuitem_child_append(root, settings_mi);
   g_signal_connect(G_OBJECT(settings_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala
index 7f14efe..5f98541 100644
--- a/src/mpris2-controller.vala
+++ b/src/mpris2-controller.vala
@@ -18,11 +18,10 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 using Dbusmenu;
 
-
 [DBus (name = "org.freedesktop.DBus.Properties")]
-  public interface FreeDesktopProperties : Object{
-  public signal void PropertiesChanged(string source, HashTable<string, Variant?> changed_properties,
-                                       string[] invalid);
+public interface FreeDesktopProperties : Object{
+  public signal void PropertiesChanged (string source, HashTable<string, Variant?> changed_properties,
+                                        string[] invalid );
 }
 
 /*
@@ -33,13 +32,14 @@ public class Mpris2Controller : GLib.Object
 {
   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)
   {
-    GLib.Object(owner: ctrl);
+    GLib.Object(owner: ctrl);    
   }
 
   construct{
@@ -50,10 +50,13 @@ public class Mpris2Controller : GLib.Object
       this.player = Bus.get_proxy_sync ( BusType.SESSION,
                                          this.owner.dbus_name,
                                          "/org/mpris/MediaPlayer2" );
+      this.playlists = 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" );                                                                                
+                                                       "/org/mpris/MediaPlayer2" );
       this.properties_interface.PropertiesChanged.connect ( property_changed_cb );
     }
     catch (IOError e) {
@@ -91,8 +94,21 @@ public class Mpris2Controller : GLib.Object
       metadata.property_set_bool ( MENUITEM_PROP_VISIBLE,
                                    metadata.populated(MetadataMenuitem.attributes_format()));
     }
+    Variant? playlist_v = changed_properties.lookup("ActivePlaylist");
+    if ( playlist_v != null ){
+      this.fetch_active_playlist();
+      //Timeout.add ( 200, fetch_active_playlist );
+    }
   }
 
+  public bool playlists_support_exist()
+  {
+    if (this.playlists == null) return false;
+    uint32? count = this.playlists.PlaylistCount;
+    if ( count == null || count <= 0 ) return false;
+    return true;
+  }
+  
   private bool ensure_correct_playback_status(){
     debug("TEST playback status = %s", this.player.PlaybackStatus);
     TransportMenuitem.state p = (TransportMenuitem.state)this.determine_play_state(this.player.PlaybackStatus);
@@ -138,6 +154,8 @@ public class Mpris2Controller : GLib.Object
     GLib.HashTable<string, Value?>? cleaned_metadata = this.clean_metadata();
     this.owner.custom_items[PlayerController.widget_order.METADATA].update(cleaned_metadata,
                                                                             MetadataMenuitem.attributes_format());
+    this.fetch_playlists();
+    this.fetch_active_playlist();    
   }
 
   public void transport_update(TransportMenuitem.action command)
@@ -154,6 +172,32 @@ public class Mpris2Controller : GLib.Object
     }
   }
 
+  public void fetch_playlists()
+  {
+    if (this.playlists == null) return;
+
+    PlaylistDetails[] current_playlists =  this.playlists.GetPlaylists(0,
+                                                                       10,
+                                                                       "Alphabetical",
+                                                                       false);
+    if( current_playlists != null ){
+      debug( "Size of the playlist array = %i", current_playlists.length );
+      PlaylistsMenuitem playlists_item = this.owner.custom_items[PlayerController.widget_order.PLAYLISTS] as PlaylistsMenuitem;
+      playlists_item.update(current_playlists);
+    }
+    return;
+  }
+
+  private void fetch_active_playlist()
+  {
+    if (this.playlists == null && this.playlists.ActivePlaylist.valid == false){
+      warning("Playlists object is null or we don't have an active playlist");
+    }
+    PlaylistsMenuitem playlists_item = this.owner.custom_items[PlayerController.widget_order.PLAYLISTS] as PlaylistsMenuitem;
+    playlists_item.update_active_playlist ( this.playlists.ActivePlaylist.details );
+  }
+
+
   public bool connected()
   {
     return (this.player != null && this.mpris2_root != null);
@@ -165,4 +209,18 @@ public class Mpris2Controller : GLib.Object
       this.mpris2_root.Raise.begin();
     }
   }
+
+  public void activate_playlist (ObjectPath path)
+  {
+    if(this.playlists == null){
+      warning("playlists mpris instance is null !");
+      return;       
+    }
+    try{
+      this.playlists.ActivatePlaylist.begin(path);
+    }
+    catch(IOError e){
+      debug("Could not activate playlist %s because %s", (string)path, e.message);     
+    }
+  } 
 }
\ No newline at end of file
diff --git a/src/mpris2-interfaces.vala b/src/mpris2-interfaces.vala
index ebea135..88610e6 100644
--- a/src/mpris2-interfaces.vala
+++ b/src/mpris2-interfaces.vala
@@ -1,6 +1,5 @@
 /*
 Copyright 2010 Canonical Ltd.
-
 Authors:
     Conor Curran <conor.curran@canonical.com>
 
@@ -44,3 +43,31 @@ public interface MprisPlayer : Object {
   // signals
   public signal void Seeked(int64 new_position);
 }
+
+// Playlist container
+public struct PlaylistDetails{
+  public ObjectPath path;
+  public string name;
+  public string icon_path;
+}
+
+// Active playlist property container
+public struct ActivePlaylistContainer{
+  public bool valid;
+  public PlaylistDetails details;
+}
+
+[DBus (name = "org.mpris.MediaPlayer2.Playlists")]
+public interface MprisPlaylists : Object {
+  //properties
+  public abstract string[] Orderings{owned get; set;}
+  public abstract uint32 PlaylistCount{owned get; set;}
+  public abstract ActivePlaylistContainer ActivePlaylist {owned get; set;}
+  
+  //methods
+  public abstract async void ActivatePlaylist(ObjectPath playlist_id) throws IOError;
+  public abstract PlaylistDetails[] GetPlaylists (  uint32 index,
+                                                    uint32 max_count,
+                                                    string order,
+                                                    bool reverse_order ) throws IOError;
+}
\ No newline at end of file
diff --git a/src/music-player-bridge.vala b/src/music-player-bridge.vala
index 327a775..de8609d 100644
--- a/src/music-player-bridge.vala
+++ b/src/music-player-bridge.vala
@@ -76,7 +76,7 @@ public class MusicPlayerBridge : GLib.Object
     }
   }
 
-  public void  client_has_become_available ( string desktop, string dbus_name )
+  public void client_has_become_available ( string desktop, string dbus_name )
   {
     if (desktop == null || desktop == ""){
       warning("Client %s attempting to register without desktop entry being set on the mpris root",
@@ -129,10 +129,10 @@ public class MusicPlayerBridge : GLib.Object
   public void set_root_menu_item ( Dbusmenu.Menuitem menu )
   {
     this.root_menu = menu;
+    this.try_to_add_inactive_familiar_clients();
     this.watcher = new Mpris2Watcher ();
     this.watcher.client_appeared += this.client_has_become_available;
     this.watcher.client_disappeared += this.client_has_vanished;
-    this.try_to_add_inactive_familiar_clients();    
   }
 
   private static AppInfo? create_app_info ( string path )
diff --git a/src/player-controller.vala b/src/player-controller.vala
index 97f5303..638c44d 100644
--- a/src/player-controller.vala
+++ b/src/player-controller.vala
@@ -23,13 +23,14 @@ using Gee;
 
 public class PlayerController : GLib.Object
 {
-  public const int WIDGET_QUANTITY = 4;
+  public const int WIDGET_QUANTITY = 5;
 
   public static enum widget_order{
     SEPARATOR,
     TITLE,
     METADATA,
-    TRANSPORT
+    TRANSPORT,
+    PLAYLISTS
   }
 
   public enum state{
@@ -130,17 +131,23 @@ public class PlayerController : GLib.Object
 
   public void update_layout()
   {     
+    PlaylistsMenuitem playlists_menuitem = this.custom_items[widget_order.PLAYLISTS] as PlaylistsMenuitem;
+
     if(this.current_state != state.CONNECTED){
       this.custom_items[widget_order.TRANSPORT].property_set_bool(MENUITEM_PROP_VISIBLE,
                                                                   false);
       this.custom_items[widget_order.METADATA].property_set_bool(MENUITEM_PROP_VISIBLE,
                                                                  false);
+      playlists_menuitem.root_item.property_set_bool ( MENUITEM_PROP_VISIBLE,
+                                                       false );   
       return; 
     }
     this.custom_items[widget_order.METADATA].property_set_bool(MENUITEM_PROP_VISIBLE,
                                                               this.custom_items[widget_order.METADATA].populated(MetadataMenuitem.attributes_format()));    
     this.custom_items[widget_order.TRANSPORT].property_set_bool(MENUITEM_PROP_VISIBLE,
                                                                 true);
+    playlists_menuitem.root_item.property_set_bool ( MENUITEM_PROP_VISIBLE,
+                                                     this.mpris_bridge.playlists_support_exist() );
   }
     
   private void construct_widgets()
@@ -159,9 +166,19 @@ public class PlayerController : GLib.Object
     // Transport item
     TransportMenuitem transport_item = new TransportMenuitem(this);
     this.custom_items.add(transport_item);
-        
+    
+    // Playlist item
+    PlaylistsMenuitem playlist_menuitem = new PlaylistsMenuitem(this);
+    this.custom_items.add(playlist_menuitem);
+    
     foreach(PlayerItem item in this.custom_items){
-      root_menu.child_add_position(item, this.menu_offset + this.custom_items.index_of(item));      
+      if (this.custom_items.index_of(item) != 4) {
+        root_menu.child_add_position(item, this.menu_offset + this.custom_items.index_of(item));      
+      }
+      else{
+        PlaylistsMenuitem playlists_menuitem = item as PlaylistsMenuitem;
+        root_menu.child_add_position(playlists_menuitem.root_item, this.menu_offset + this.custom_items.index_of(item));              
+      }
     }
   }   
   
@@ -184,11 +201,11 @@ public class PlayerController : GLib.Object
     if(this.mpris_bridge.connected() == true){
       this.update_state(state.CONNECTED);
       TitleMenuitem title = this.custom_items[widget_order.TITLE] as TitleMenuitem;
-      title.toggle_active_triangle(true); 
+      title.toggle_active_triangle(true);
       this.mpris_bridge.initial_update();
     }
     else{
       this.update_state(state.DISCONNECTED);
     }
-  } 
+  }
 }
diff --git a/src/player-item.vala b/src/player-item.vala
index c80a17d..f883a1e 100644
--- a/src/player-item.vala
+++ b/src/player-item.vala
@@ -54,7 +54,7 @@ public class PlayerItem : Dbusmenu.Menuitem
     if(data == null){
       debug("PlayerItem::Update -> The hashtable was null - just leave it!");
       return;
-    }   
+    }
     
     foreach(string property in attributes){
       string[] input_keys = property.split("-");
diff --git a/src/playlists-menu-item.vala b/src/playlists-menu-item.vala
new file mode 100644
index 0000000..024839c
--- /dev/null
+++ b/src/playlists-menu-item.vala
@@ -0,0 +1,87 @@
+/*
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Conor Curran <conor.curran@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Dbusmenu;
+using DbusmenuPlaylists;
+using Gee;
+
+public class PlaylistsMenuitem : PlayerItem
+{
+  private HashMap<int, PlaylistDetails?> current_playlists;    
+  public Menuitem root_item;
+  public PlaylistsMenuitem ( PlayerController parent )
+  {
+    Object ( item_type: MENUITEM_TYPE, owner: parent );
+  }
+  construct{
+    this.current_playlists = new HashMap<int, PlaylistDetails?>();
+    this.root_item = new Menuitem();
+    this.root_item.property_set ( MENUITEM_PROP_LABEL, "Choose Playlist" );
+  }
+
+  public new void update (PlaylistDetails[] playlists)
+  {
+    foreach ( PlaylistDetails detail in playlists ){
+      if (this.already_observed(detail)) continue;
+      Dbusmenu.Menuitem menuitem = new Menuitem();
+      menuitem.property_set (MENUITEM_PROP_LABEL, detail.name);
+      menuitem.property_set (MENUITEM_PROP_ICON_NAME, "source-smart-playlist");
+      menuitem.property_set_bool (MENUITEM_PROP_VISIBLE, true);
+      menuitem.property_set_bool (MENUITEM_PROP_ENABLED, true);
+      this.current_playlists.set( menuitem.id, detail );
+      menuitem.item_activated.connect(() => {
+        submenu_item_activated (menuitem.id );});
+      this.root_item.child_append( menuitem );
+    }
+  }
+
+  private bool already_observed (PlaylistDetails new_detail)
+  {
+    foreach ( PlaylistDetails detail in this.current_playlists.values ){
+      if (new_detail.path == detail.path) return true;
+    }
+    return false;
+  }
+
+  public void update_active_playlist(PlaylistDetails detail)
+  {
+    var update = detail.name; 
+    if ( update == "" ) update = "Choose Playlist";
+    this.root_item.property_set ( MENUITEM_PROP_LABEL, update );    
+  }
+  
+  private void submenu_item_activated (int menu_item_id)
+  {
+    if(!this.current_playlists.has_key(menu_item_id)){
+      warning( "item %i was activated but we don't have a corresponding playlist",
+               menu_item_id );
+      return;
+    }
+    this.owner.mpris_bridge.activate_playlist ( this.current_playlists[menu_item_id].path );
+  }
+  
+  public static HashSet<string> attributes_format()
+  {
+    HashSet<string> attrs = new HashSet<string>();    
+    attrs.add(MENUITEM_TITLE);
+    attrs.add(MENUITEM_PLAYLISTS);
+    return attrs;
+  } 
+  
+}
diff --git a/vapi/Indicate-0.2.vapi b/vapi/Indicate-0.2.vapi
deleted file mode 100644
index 1381037..0000000
--- a/vapi/Indicate-0.2.vapi
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Indicate-0.2.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Indicate", lower_case_cprefix = "indicate_")]
-namespace Indicate {
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public class Indicator : GLib.Object {
-		public weak GLib.Object parent;
-		[CCode (has_construct_function = false)]
-		public Indicator ();
-		public bool get_displayed ();
-		public uint get_id ();
-		public virtual GLib.Value get_property (string key);
-		public GLib.Value get_property_value (string key);
-		public Indicate.Server get_server ();
-		public bool is_visible ();
-		public string[] list_properties ();
-		public void set_displayed (bool displayed);
-		public virtual void set_property (string key, GLib.Value data);
-		public void set_property_bool (string key, bool value);
-		public void set_property_int (string key, int value);
-		public void set_property_time (string key, GLib.TimeVal time);
-		public void set_property_value (string key, GLib.Value value);
-		public void set_server (Indicate.Server server);
-		[CCode (has_construct_function = false)]
-		public Indicator.with_server (Indicate.Server server);
-		public signal void displayed (bool object);
-		[HasEmitter]
-		public signal void hide ();
-		public signal void modified (string object);
-		[HasEmitter]
-		public signal void show ();
-		[HasEmitter]
-		public signal void user_display (uint object);
-	}
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public class Listener : GLib.Object {
-		public weak GLib.Object parent;
-		[CCode (has_construct_function = false)]
-		public Listener ();
-		public void display (Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, uint timestamp);
-		public void displayed (Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, bool displayed);
-		public void get_property (Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, owned string property, [CCode (delegate_target_pos = 0)] Indicate.listener_get_property_cb callback);
-		public void get_property_bool (Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, owned string property, [CCode (delegate_target_pos = 0)] Indicate.listener_get_property_bool_cb callback);
-		public void get_property_int (Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, owned string property, [CCode (delegate_target_pos = 0)] Indicate.listener_get_property_int_cb callback);
-		public void get_property_time (Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, owned string property, [CCode (delegate_target_pos = 0)] Indicate.listener_get_property_time_cb callback);
-		public void get_property_value (Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, owned string property, [CCode (delegate_target_pos = 0)] Indicate.listener_get_property_value_cb callback);
-		public static GLib.Type indicator_get_gtype ();
-		public static Indicate.Listener ref_default ();
-		public bool server_check_interest (Indicate.ListenerServer server, Indicate.Interests interest);
-		public void server_get_count (Indicate.ListenerServer server, [CCode (delegate_target_pos = 0)] Indicate.listener_get_server_uint_property_cb callback);
-		public void server_get_desktop (Indicate.ListenerServer server, [CCode (delegate_target_pos = 0)] Indicate.listener_get_server_property_cb callback, void* data);
-		public static GLib.Type server_get_gtype ();
-		public void server_get_menu (Indicate.ListenerServer server, [CCode (delegate_target_pos = 0)] Indicate.listener_get_server_property_cb callback);
-		public static void server_get_type (Indicate.Listener listener, Indicate.ListenerServer server, [CCode (delegate_target_pos = 0)] Indicate.listener_get_server_property_cb callback);
-		public void server_remove_interest (Indicate.ListenerServer server, Indicate.Interests interest);
-		public void server_show_interest (Indicate.ListenerServer server, Indicate.Interests interest);
-		public void set_default_max_indicators (int max);
-		public void set_server_max_indicators (Indicate.ListenerServer server, int max);
-		public signal void indicator_added (Indicate.ListenerServer object, Indicate.ListenerIndicator p0);
-		public signal void indicator_modified (Indicate.ListenerServer object, Indicate.ListenerIndicator p0, string p1);
-		public signal void indicator_removed (Indicate.ListenerServer object, Indicate.ListenerIndicator p0);
-		public signal void indicator_servers_report ();
-		public signal void server_added (Indicate.ListenerServer object, string p0);
-		public signal void server_count_changed (Indicate.ListenerServer object, uint p0);
-		public signal void server_removed (Indicate.ListenerServer object, string p0);
-	}
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public class Server : GLib.Object {
-		public weak GLib.Object parent;
-		public void add_indicator (Indicate.Indicator indicator);
-		public virtual bool check_interest (Indicate.Interests interest);
-		public virtual bool get_indicator_count (out uint count) throws GLib.Error;
-		public virtual bool get_indicator_property (uint id, owned string property, GLib.Value value) throws GLib.Error;
-		public int get_max_indicators ();
-		public virtual uint get_next_id ();
-		public void hide ();
-		public virtual void indicator_added (uint id);
-		public virtual bool indicator_displayed (owned string sender, uint id, bool displayed) throws GLib.Error;
-		public virtual void indicator_removed (uint id);
-		public virtual int max_indicators_get ();
-		public virtual bool max_indicators_set (owned string sender, int max);
-		public static Indicate.Server ref_default ();
-		public void remove_indicator (Indicate.Indicator indicator);
-		public virtual bool remove_interest (owned string sender, Indicate.Interests interest);
-		public void set_count (uint count);
-		public static void set_dbus_object (string obj);
-		public void set_default ();
-		public void set_desktop_file (string path);
-		public void set_menu (Dbusmenu.Server menu);
-		public void set_type (string type);
-		public void show ();
-		public virtual bool show_indicator_to_user (uint id, uint timestamp) throws GLib.Error;
-		public virtual bool show_interest (owned string sender, Indicate.Interests interest);
-		public uint count { get; set; }
-		public string desktop { get; set; }
-		public string type { get; set; }
-		public signal void indicator_delete (uint object);
-		public signal void indicator_modified (uint object, string p0);
-		public signal void indicator_new (uint object);
-		public signal void interest_added (uint object);
-		public signal void interest_removed (uint object);
-		public signal void max_indicators_changed (int object);
-		public signal void server_count_changed (uint object);
-		public signal void server_display (uint object);
-		public signal void server_hide (string object);
-		public signal void server_show (string object);
-	}
-	[CCode (type_id = "INDICATE_TYPE_LISTENER_INDICATOR", cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public struct ListenerIndicator {
-		public uint get_id ();
-	}
-	[CCode (type_id = "INDICATE_TYPE_LISTENER_SERVER", cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public struct ListenerServer {
-		public unowned string get_dbusname ();
-	}
-	[CCode (cprefix = "INDICATE_INTEREST_", cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public enum Interests {
-		NONE,
-		SERVER_DISPLAY,
-		SERVER_SIGNAL,
-		INDICATOR_DISPLAY,
-		INDICATOR_SIGNAL,
-		INDICATOR_COUNT,
-		LAST
-	}
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h", has_target = false)]
-	public delegate string[] indicator_list_properties_slot_t (Indicate.Indicator indicator);
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h", has_target = false)]
-	public delegate void listener_get_property_bool_cb (Indicate.Listener listener, Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, owned string property, bool propertydata, void* data);
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h", has_target = false)]
-	public delegate void listener_get_property_cb (Indicate.Listener listener, Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, owned string property, string propertydata, void* data);
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h", has_target = false)]
-	public delegate void listener_get_property_int_cb (Indicate.Listener listener, Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, owned string property, int propertydata, void* data);
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h", has_target = false)]
-	public delegate void listener_get_property_time_cb (Indicate.Listener listener, Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, owned string property, GLib.TimeVal propertydata, void* data);
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h", has_target = false)]
-	public delegate void listener_get_property_value_cb (Indicate.Listener listener, Indicate.ListenerServer server, Indicate.ListenerIndicator indicator, owned string property, GLib.Value propertydata, void* data);
-	[CCode (cname ="indicate_listener_get_server_property_cb", cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h", has_target = false)]
-	public delegate void listener_get_server_property_cb (Indicate.Listener listener, Indicate.ListenerServer server, owned string value, void* data);
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h", has_target = false)]
-	public delegate void listener_get_server_uint_property_cb (Indicate.Listener listener, Indicate.ListenerServer server, uint value, void* data);
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h", has_target = false)]
-	public delegate bool server_get_indicator_list_slot_t (Indicate.Server server, out unowned Indicate.Indicator[] indicators);
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h", has_target = false)]
-	public delegate bool server_get_indicator_properties_slot_t (Indicate.Server server, uint id, out string[] properties);
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h", has_target = false)]
-	public delegate bool server_get_indicator_property_group_slot_t (Indicate.Server server, uint id, string[] properties, out string[] value);
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const int INDICATOR_H_INCLUDED__;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const int INDICATOR_MESSAGES_H_INCLUDED__;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_MESSAGES_PROP_ATTENTION;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_MESSAGES_PROP_COUNT;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_MESSAGES_PROP_ICON;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_MESSAGES_PROP_NAME;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_MESSAGES_PROP_TIME;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_MESSAGES_SERVER_TYPE;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_SIGNAL_DISPLAY;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_SIGNAL_DISPLAYED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_SIGNAL_HIDE;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_SIGNAL_MODIFIED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_SIGNAL_SHOW;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_VALUE_FALSE;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string INDICATOR_VALUE_TRUE;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const int INTERESTS_H_INCLUDED__;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const int LISTENER_H_INCLUDED__;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string LISTENER_SIGNAL_INDICATOR_ADDED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string LISTENER_SIGNAL_INDICATOR_MODIFIED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string LISTENER_SIGNAL_INDICATOR_REMOVED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string LISTENER_SIGNAL_SERVER_ADDED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string LISTENER_SIGNAL_SERVER_COUNT_CHANGED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string LISTENER_SIGNAL_SERVER_REMOVED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const int SERVER_H_INCLUDED__;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const int SERVER_INDICATOR_NULL;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string SERVER_SIGNAL_INDICATOR_ADDED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string SERVER_SIGNAL_INDICATOR_MODIFIED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string SERVER_SIGNAL_INDICATOR_REMOVED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string SERVER_SIGNAL_INTEREST_ADDED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string SERVER_SIGNAL_INTEREST_REMOVED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string SERVER_SIGNAL_MAX_INDICATORS_CHANGED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string SERVER_SIGNAL_SERVER_COUNT_CHANGED;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string SERVER_SIGNAL_SERVER_DISPLAY;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string SERVER_SIGNAL_SERVER_HIDE;
-	[CCode (cheader_filename = "libindicate/./indicator-messages.h,libindicate/./indicator.h,libindicate/./interests.h,libindicate/./listener.h,libindicate/./server.h")]
-	public const string SERVER_SIGNAL_SERVER_SHOW;
-}
diff --git a/vapi/common-defs.vapi b/vapi/common-defs.vapi
index 6938420..2946d25 100644
--- a/vapi/common-defs.vapi
+++ b/vapi/common-defs.vapi
@@ -19,31 +19,38 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 [CCode (cheader_filename = "common-defs.h")]
 namespace DbusmenuMetadata{
-	public const string MENUITEM_TYPE;
-	public const string MENUITEM_ARTIST;
-	public const string MENUITEM_TITLE;
-	public const string MENUITEM_ALBUM;
-	public const string MENUITEM_ARTURL;	
+        public const string MENUITEM_TYPE;
+        public const string MENUITEM_ARTIST;
+        public const string MENUITEM_TITLE;
+        public const string MENUITEM_ALBUM;
+        public const string MENUITEM_ARTURL;    
 }
 
 [CCode (cheader_filename = "common-defs.h")]
 namespace DbusmenuTransport{
-	public const string MENUITEM_TYPE;
-	public const string MENUITEM_PLAY_STATE;
+        public const string MENUITEM_TYPE;
+        public const string MENUITEM_PLAY_STATE;
 }
 
 [CCode (cheader_filename = "common-defs.h")]
 namespace DbusmenuTitle{
-	public const string MENUITEM_TYPE;
-	public const string MENUITEM_NAME;
-	public const string MENUITEM_ICON;
-	public const string MENUITEM_RUNNING;
+        public const string MENUITEM_TYPE;
+        public const string MENUITEM_NAME;
+        public const string MENUITEM_ICON;
+        public const string MENUITEM_RUNNING;
 }
 
 [CCode (cheader_filename = "common-defs.h")]
 namespace DbusmenuScrub{
-	public const string MENUITEM_TYPE;
-	public const string MENUITEM_POSITION;
-	public const string MENUITEM_DURATION;	
-	public const string MENUITEM_PLAY_STATE;		
+        public const string MENUITEM_TYPE;
+        public const string MENUITEM_POSITION;
+        public const string MENUITEM_DURATION;
+        public const string MENUITEM_PLAY_STATE;
+}
+
+[CCode (cheader_filename = "common-defs.h")]
+namespace DbusmenuPlaylists{
+        public const string MENUITEM_TYPE;
+        public const string MENUITEM_TITLE;
+        public const string MENUITEM_PLAYLISTS;
 }
\ No newline at end of file