Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / disobedience / disobedience.h

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 001a0b0a88309b909642073c408b2a18355fad37..454a65fda0c684fb8541e675fd176033522dacee 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -22,8 +22,6 @@
 #ifndef DISOBEDIENCE_H
 #define DISOBEDIENCE_H
 
-#define PLAYLISTS 1
-
 #include "common.h"
 
 #include <time.h>
@@ -44,12 +42,14 @@
 #include "defs.h"
 #include "configuration.h"
 #include "hash.h"
+#include "home.h"
 #include "selection.h"
 #include "kvp.h"
 #include "eventdist.h"
 #include "split.h"
 #include "timeval.h"
 #include "uaudio.h"
+#include "inputline.h"
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -87,6 +87,11 @@ struct button {
   void (*clicked)(GtkButton *button, gpointer userdata);
   const char *tip;
   GtkWidget *widget;
+  void (*pack)(GtkBox *box,
+               GtkWidget *child,
+               gboolean expand,
+               gboolean fill,
+               guint padding);
 };
 
 /* Variables --------------------------------------------------------------- */
@@ -106,7 +111,6 @@ extern int choosealpha;                 /* break up choose by letter */
 extern int rtp_supported;
 extern int rtp_is_running;
 extern GtkItemFactory *mainmenufactory;
-extern const struct uaudio *backend;
 
 extern const disorder_eclient_log_callbacks log_callbacks;
 
@@ -163,6 +167,7 @@ void all_update(void);
 
 GtkWidget *menubar(GtkWidget *w);
 /* Create the menu bar */
+extern int full_mode;
 
 void users_set_sensitive(int sensitive);
 
@@ -176,6 +181,7 @@ extern int suppress_actions;
 /* Queue/Recent/Added */
 
 GtkWidget *queue_widget(void);
+GtkWidget *playing_widget(void);
 GtkWidget *recent_widget(void);
 GtkWidget *added_widget(void);
 /* Create widgets for displaying the queue, the recently played list and the
@@ -222,7 +228,7 @@ extern const GtkTargetEntry choose_targets[];
 
 void login_box(void);
 
-GtkWidget *login_window;
+extern GtkWidget *login_window;
 
 /* User management */
 
@@ -230,13 +236,24 @@ void manage_users(void);
 
 /* Help */
 
-void popup_help(void);
+void popup_help(const char *what);
+
+/* Filtering */
+
+void popup_globals(void);
+void globals_init(void);
 
 /* RTP */
 
 int rtp_running(void);
 void start_rtp(void);
 void stop_rtp(void);
+void load_rtp_config(void);
+void save_rtp_config(void);
+void change_rtp_api(const char *api);
+extern const char *rtp_api;
+int rtp_setvol(int *l, int *r);
+int rtp_getvol(int *l, int *r);
 
 /* Settings */
 
@@ -259,7 +276,6 @@ void popup_settings(void);
 
 /* Playlists */
 
-#if PLAYLISTS
 void playlists_init(void);
 void playlist_window_create(gpointer callback_data,
                             guint callback_action,
@@ -269,7 +285,6 @@ extern int nplaylists;
 extern GtkWidget *menu_playlists_widget;
 extern GtkWidget *playlists_menu;
 extern GtkWidget *menu_editplaylists_widget;
-#endif
 
 #endif /* DISOBEDIENCE_H */