X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/681103026e308772b67867c6a4fbac1f0692faa2..HEAD:/disobedience/disobedience.h
diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index f709a27..454a65f 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
@@ -44,15 +42,19 @@
#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 "inputline.h"
#include
#include
#include
+#include
/* Types ------------------------------------------------------------------- */
@@ -60,28 +62,6 @@ 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
@@ -107,6 +87,11 @@ struct button {
void (*clicked)(GtkButton *button, gpointer userdata);
const char *tip;
GtkWidget *widget;
+ void (*pack)(GtkBox *box,
+ GtkWidget *child,
+ gboolean expand,
+ gboolean fill,
+ guint padding);
};
/* Variables --------------------------------------------------------------- */
@@ -123,7 +108,6 @@ 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;
@@ -139,7 +123,8 @@ void popup_protocol_error(int code,
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);
@@ -156,7 +141,8 @@ void popup_submsg(GtkWidget *parent, GtkMessageType mt, const char *msg);
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,
@@ -181,6 +167,7 @@ void all_update(void);
GtkWidget *menubar(GtkWidget *w);
/* Create the menu bar */
+extern int full_mode;
void users_set_sensitive(int sensitive);
@@ -194,6 +181,7 @@ extern int suppress_actions;
/* 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
@@ -232,13 +220,15 @@ void choose_update(void);
/* Called when we think the choose tree might need updating */
void play_completed(void *v,
- const char *error);
+ const char *err);
+
+extern const GtkTargetEntry choose_targets[];
/* Login details */
void login_box(void);
-GtkWidget *login_window;
+extern GtkWidget *login_window;
/* User management */
@@ -246,13 +236,24 @@ void manage_users(void);
/* 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);
+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 */
@@ -273,6 +274,18 @@ void load_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 */
/*