X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f44417cf9d3d5ddea2f0dfb2e238a2826eb6691d..54156c626b7377cd012b1de85679801d59da8a09:/disobedience/disobedience.h diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h index 826ccee..21f3bf6 100644 --- a/disobedience/disobedience.h +++ b/disobedience/disobedience.h @@ -24,13 +24,9 @@ #ifndef DISOBEDIENCE_H #define DISOBEDIENCE_H -#include -#include "types.h" +#include "common.h" -#include #include -#include -#include #include #include #include @@ -49,6 +45,9 @@ #include "configuration.h" #include "hash.h" #include "selection.h" +#include "kvp.h" +#include "eventdist.h" +#include "split.h" #include #include @@ -76,6 +75,9 @@ struct callbackdata { struct queuelike *ql; /* gtkqueue.c queuelike_completed */ struct prefdata *f; /* properties.c */ const char *user; /* users.c */ + struct { + const char *user, *email; /* users.c */ + } edituser; } u; }; @@ -85,12 +87,14 @@ struct callbackdata { * have some callbacks to set them appropriately. */ struct tabtype { - int (*properties_sensitive)(GtkWidget *tab); - int (*selectall_sensitive)(GtkWidget *tab); - int (*selectnone_sensitive)(GtkWidget *tab); - void (*properties_activate)(GtkWidget *tab); - void (*selectall_activate)(GtkWidget *tab); - void (*selectnone_activate)(GtkWidget *tab); + int (*properties_sensitive)(void *extra); + int (*selectall_sensitive)(void *extra); + int (*selectnone_sensitive)(void *extra); + void (*properties_activate)(void *extra); + void (*selectall_activate)(void *extra); + void (*selectnone_activate)(void *extra); + void (*selected)(void); + void *extra; }; /** @brief Button definitions */ @@ -110,6 +114,7 @@ extern GtkWidget *tabs; /* main tabs */ extern disorder_eclient *client; /* main client */ extern unsigned long last_state; /* last reported state */ +extern rights_type last_rights; /* last reported rights bitmap */ extern int playing; /* true if playing some track */ extern int volume_l, volume_r; /* current volume */ extern double goesupto; /* volume upper bound */ @@ -121,8 +126,6 @@ extern GtkItemFactory *mainmenufactory; extern const disorder_eclient_log_callbacks log_callbacks; -typedef void monitor_callback(void *u); - /* Functions --------------------------------------------------------------- */ disorder_eclient *gtkclient(void); @@ -135,17 +138,17 @@ void popup_protocol_error(int code, void properties(int ntracks, const char **tracks); /* Pop up a properties window for a list of tracks */ -void properties_reset(void); - GtkWidget *scroll_widget(GtkWidget *child); /* Wrap a widget up for scrolling */ +GtkWidget *frame_widget(GtkWidget *w, const char *title); + GdkPixbuf *find_image(const char *name); /* Get the pixbuf for an image. Returns a null pointer if it cannot be * found. */ void popup_msg(GtkMessageType mt, const char *msg); -/* Pop up a message */ +void popup_submsg(GtkWidget *parent, GtkMessageType mt, const char *msg); void fpopup_msg(GtkMessageType mt, const char *fmt, ...); @@ -165,18 +168,7 @@ GtkWidget *create_buttons_box(struct button *buttons, size_t nbuttons, GtkWidget *box); -void register_monitor(monitor_callback *callback, - void *u, - unsigned long mask); -/* Register a state monitor */ - -/** @brief Type signature for a reset callback */ -typedef void reset_callback(void); - -void register_reset(reset_callback *callback); -/* Register a reset callback */ - -void reset(void); +void logged_in(void); void all_update(void); /* Update everything */ @@ -190,17 +182,13 @@ void menu_update(int page); /* Called whenever the main menu might need to change. PAGE is the current * page if known or -1 otherwise. */ +void users_set_sensitive(int sensitive); /* Controls */ GtkWidget *control_widget(void); /* Make the controls widget */ -void volume_update(void); -/* Called whenever we think the volume control has changed */ - -void control_monitor(void *u); - extern int suppress_actions; /* Queue/Recent/Added */ @@ -211,12 +199,6 @@ GtkWidget *added_widget(void); /* Create widgets for displaying the queue, the recently played list and the * newly added tracks list */ -void queue_update(void); -void recent_update(void); -void added_update(void); -/* Called whenever we think the queue, recent or newly-added list might have - * changed */ - void queue_select_all(struct queuelike *ql); void queue_select_none(struct queuelike *ql); /* Select all/none on some queue */ @@ -232,6 +214,7 @@ void namepart_update(const char *track, const char *part); /* Called when a namepart might have changed */ +extern struct queue_entry *playing_track; /* Choose */ @@ -241,6 +224,9 @@ GtkWidget *choose_widget(void); void choose_update(void); /* Called when we think the choose tree might need updating */ +void play_completed(void *v, + const char *error); + /* Login details */ void login_box(void); @@ -280,35 +266,6 @@ void load_settings(void); void set_tool_colors(GtkWidget *w); void popup_settings(void); -/* Widget leakage debugging rubbish ---------------------------------------- */ - -#if MDEBUG -#define NW(what) do { \ - if(++current##what % 100 > max##what) { \ - fprintf(stderr, "%s:%d: %d %s\n", \ - __FILE__, __LINE__, current##what, #what); \ - max##what = current##what; \ - } \ -} while(0) -#define WT(what) static int current##what, max##what -#define DW(what) (--current##what) -#else -#define NW(what) do { } while(0) -#define DW(what) do { } while(0) -#define WT(what) struct neverused -#endif - -#if MTRACK -extern const char *mtag; -#define MTAG(x) do { mtag = x; } while(0) -#define MTAG_PUSH(x) do { const char *save_mtag = mtag; mtag = x; (void)0 -#define MTAG_POP() mtag = save_mtag; } while(0) -#else -#define MTAG(x) do { } while(0) -#define MTAG_PUSH(x) do {} while(0) -#define MTAG_POP() do {} while(0) -#endif - #endif /* DISOBEDIENCE_H */ /*