X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/05b75f8d50b83e943af3be4071449304d82dbdcd..a6712ea8e5d17b646625bba5fc1141927c5d6ad9:/disobedience/disobedience.h diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h index db1e8e9..29a278e 100644 --- a/disobedience/disobedience.h +++ b/disobedience/disobedience.h @@ -2,20 +2,18 @@ * This file is part of DisOrder. * Copyright (C) 2006-2008 Richard Kettlewell * - * This program is free software; you can redistribute it and/or modify + * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * along with this program. If not, see . */ /** @file disobedience/disobedience.h * @brief Header file for Disobedience, the DisOrder GTK+ client @@ -24,6 +22,8 @@ #ifndef DISOBEDIENCE_H #define DISOBEDIENCE_H +#define PLAYLISTS 1 + #include "common.h" #include @@ -45,10 +45,16 @@ #include "configuration.h" #include "hash.h" #include "selection.h" +#include "kvp.h" +#include "eventdist.h" +#include "split.h" +#include "timeval.h" +#include "uaudio.h" #include #include #include +#include /* Types ------------------------------------------------------------------- */ @@ -56,40 +62,23 @@ struct queuelike; struct choosenode; struct progress_window; -/** @brief Callback data structure - * - * This program is extremely heavily callback-driven. Rather than have - * numerous different callback structures we have a single one which can be - * interpreted adequately both by success and error handlers. - */ -struct callbackdata { - void (*onerror)(struct callbackdata *cbd, - int code, - const char *msg); /* called on error */ - union { - const char *key; /* gtkqueue.c op_part_lookup */ - struct choosenode *choosenode; /* gtkchoose.c got_files/got_dirs */ - 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; -}; - /** @brief Per-tab callbacks * * Some of the options in the main menu depend on which tab is displayed, so we * 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)(GtkMenuItem *menuitem, + gpointer user_data); + void (*selectall_activate)(GtkMenuItem *menuitem, + gpointer user_data); + void (*selectnone_activate)(GtkMenuItem *menuitem, + gpointer user_data); + void (*selected)(void); + void *extra; }; /** @brief Button definitions */ @@ -109,19 +98,18 @@ 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 */ extern int choosealpha; /* break up choose by letter */ -extern GtkTooltips *tips; 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; -typedef void monitor_callback(void *u); - /* Functions --------------------------------------------------------------- */ disorder_eclient *gtkclient(void); @@ -134,8 +122,6 @@ 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 */ @@ -166,18 +152,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 */ @@ -186,10 +161,6 @@ void all_update(void); GtkWidget *menubar(GtkWidget *w); /* Create the menu bar */ - -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); @@ -198,11 +169,6 @@ void users_set_sensitive(int sensitive); 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 */ @@ -213,12 +179,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 */ @@ -229,12 +189,20 @@ void queue_properties(struct queuelike *ql); int queued(const char *track); /* Return nonzero iff TRACK is queued or playing */ +extern struct queue_entry *playing_track; + +/* Lookups */ +const char *namepart(const char *track, + const char *context, + const char *part); +long namepart_length(const char *track); +char *namepart_resolve(const char *track); + void namepart_update(const char *track, const char *context, const char *part); /* Called when a namepart might have changed */ - /* Choose */ GtkWidget *choose_widget(void); @@ -243,6 +211,11 @@ 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 *err); + +extern const GtkTargetEntry choose_targets[]; + /* Login details */ void login_box(void); @@ -282,33 +255,18 @@ 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) +/* Playlists */ + +#if 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 #endif /* DISOBEDIENCE_H */