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 8e1d7f71836385bc4cff39742f005134a7448afd..454a65fda0c684fb8541e675fd176033522dacee 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -42,6 +42,7 @@
 #include "defs.h"
 #include "configuration.h"
 #include "hash.h"
+#include "home.h"
 #include "selection.h"
 #include "kvp.h"
 #include "eventdist.h"
@@ -110,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;
 
@@ -167,7 +167,7 @@ void all_update(void);
 
 GtkWidget *menubar(GtkWidget *w);
 /* Create the menu bar */
-int full_mode;
+extern int full_mode;
 
 void users_set_sensitive(int sensitive);
 
@@ -228,7 +228,7 @@ extern const GtkTargetEntry choose_targets[];
 
 void login_box(void);
 
-GtkWidget *login_window;
+extern GtkWidget *login_window;
 
 /* User management */
 
@@ -251,7 +251,9 @@ void stop_rtp(void);
 void load_rtp_config(void);
 void save_rtp_config(void);
 void change_rtp_api(const char *api);
-const char *rtp_api;
+extern const char *rtp_api;
+int rtp_setvol(int *l, int *r);
+int rtp_getvol(int *l, int *r);
 
 /* Settings */