chiark
/
gitweb
/
~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 ca5f7eff32ba7c6a2d2e91a0e911f6fcb39409d5..454a65fda0c684fb8541e675fd176033522dacee 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>
@@
-85,6
+87,11
@@
struct button {
void (*clicked)(GtkButton *button, gpointer userdata);
const char *tip;
GtkWidget *widget;
void (*clicked)(GtkButton *button, gpointer userdata);
const char *tip;
GtkWidget *widget;
+ void (*pack)(GtkBox *box,
+ GtkWidget *child,
+ gboolean expand,
+ gboolean fill,
+ guint padding);
};
/* Variables --------------------------------------------------------------- */
};
/* Variables --------------------------------------------------------------- */
@@
-101,11
+108,9
@@
extern int playing; /* true if playing some track */
extern int volume_l, volume_r; /* current volume */
extern double goesupto; /* volume upper bound */
extern int choosealpha; /* break up choose by letter */
extern int volume_l, volume_r; /* current volume */
extern double goesupto; /* volume upper bound */
extern int choosealpha; /* break up choose by letter */
-extern GtkTooltips *tips;
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;
@@
-118,7
+123,8
@@
void popup_protocol_error(int code,
const char *msg);
/* Report an error */
const char *msg);
/* Report an error */
-void properties(int ntracks, const char **tracks);
+void properties(int ntracks, const char **tracks,
+ GtkWidget *parent);
/* Pop up a properties window for a list of tracks */
GtkWidget *scroll_widget(GtkWidget *child);
/* Pop up a properties window for a list of tracks */
GtkWidget *scroll_widget(GtkWidget *child);
@@
-135,7
+141,8
@@
void popup_submsg(GtkWidget *parent, GtkMessageType mt, const char *msg);
void fpopup_msg(GtkMessageType mt, const char *fmt, ...);
void fpopup_msg(GtkMessageType mt, const char *fmt, ...);
-struct progress_window *progress_window_new(const char *title);
+struct progress_window *progress_window_new(const char *title,
+ GtkWidget *parent);
/* Pop up a progress window */
void progress_window_progress(struct progress_window *pw,
/* Pop up a progress window */
void progress_window_progress(struct progress_window *pw,
@@
-160,6
+167,7
@@
void all_update(void);
GtkWidget *menubar(GtkWidget *w);
/* Create the menu bar */
GtkWidget *menubar(GtkWidget *w);
/* Create the menu bar */
+extern int full_mode;
void users_set_sensitive(int sensitive);
void users_set_sensitive(int sensitive);
@@
-173,6
+181,7
@@
extern int suppress_actions;
/* Queue/Recent/Added */
GtkWidget *queue_widget(void);
/* 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
GtkWidget *recent_widget(void);
GtkWidget *added_widget(void);
/* Create widgets for displaying the queue, the recently played list and the
@@
-213,11
+222,13
@@
void choose_update(void);
void play_completed(void *v,
const char *err);
void play_completed(void *v,
const char *err);
+extern const GtkTargetEntry choose_targets[];
+
/* Login details */
void login_box(void);
/* Login details */
void login_box(void);
-GtkWidget *login_window;
+
extern
GtkWidget *login_window;
/* User management */
/* User management */
@@
-225,13
+236,24
@@
void manage_users(void);
/* Help */
/* 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);
/* 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 */
@@
-252,6
+274,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 playlist_window_create(gpointer callback_data,
+ guint callback_action,
+ GtkWidget *menu_item);
+extern char **playlists;
+extern int nplaylists;
+extern GtkWidget *menu_playlists_widget;
+extern GtkWidget *playlists_menu;
+extern GtkWidget *menu_editplaylists_widget;
+
#endif /* DISOBEDIENCE_H */
/*
#endif /* DISOBEDIENCE_H */
/*