~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
81de1f6
..
454a65f
100644
(file)
--- a/
disobedience/disobedience.h
+++ b/
disobedience/disobedience.h
@@
-42,12
+42,14
@@
#include "defs.h"
#include "configuration.h"
#include "hash.h"
#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 "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>
#include <glib.h>
#include <gtk/gtk.h>
@@
-109,7
+111,6
@@
extern int choosealpha; /* break up choose by letter */
extern int rtp_supported;
extern int rtp_is_running;
extern GtkItemFactory *mainmenufactory;
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;
extern const disorder_eclient_log_callbacks log_callbacks;
@@
-166,7
+167,7
@@
void all_update(void);
GtkWidget *menubar(GtkWidget *w);
/* Create the menu bar */
GtkWidget *menubar(GtkWidget *w);
/* Create the menu bar */
-int full_mode;
+
extern
int full_mode;
void users_set_sensitive(int sensitive);
void users_set_sensitive(int sensitive);
@@
-227,7
+228,7
@@
extern const GtkTargetEntry choose_targets[];
void login_box(void);
void login_box(void);
-GtkWidget *login_window;
+
extern
GtkWidget *login_window;
/* User management */
/* User management */
@@
-239,14
+240,20
@@
void popup_help(const char *what);
/* Filtering */
/* Filtering */
-void popup_
filtering
(void);
-void
init_filtering
(void);
+void popup_
globals
(void);
+void
globals_init
(void);
/* RTP */
int rtp_running(void);
void start_rtp(void);
void stop_rtp(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 */
/* Settings */