Merge playlist branch against trunk to date.

[disorder] / disobedience / disobedience.h

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index db4bff0e1444020db84306d661fa5a4bedbd711f..46877245e29cfbbb03703d601a885a8ac9fbd82b 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -250,6 +250,18 @@ void load_settings(void);
 void set_tool_colors(GtkWidget *w);
 void popup_settings(void);
 
 void set_tool_colors(GtkWidget *w);
 void popup_settings(void);
 

+/* Playlists */
+
+void playlists_init(void);
+void edit_playlists(gpointer callback_data,
+                    guint callback_action,
+                    GtkWidget  *menu_item);
+extern char **playlists;
+extern int nplaylists;
+extern GtkWidget *playlists_widget;
+extern GtkWidget *playlists_menu;
+extern GtkWidget *editplaylists_widget;
+

 #endif /* DISOBEDIENCE_H */
 
 /*
 #endif /* DISOBEDIENCE_H */
 
 /*