X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/b6ba548b7628455c9f9ededfd37815c4dd4681f6..7fe2807d48006b2191dfe8b1985176cd378e80c3:/disobedience/disobedience.h
diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 21f3bf6..95ab02f 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
@@ -48,10 +48,13 @@
#include "kvp.h"
#include "eventdist.h"
#include "split.h"
+#include "timeval.h"
+#include "uaudio.h"
#include
#include
#include
+#include
/* Types ------------------------------------------------------------------- */
@@ -59,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
@@ -90,9 +71,12 @@ struct tabtype {
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 (*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;
};
@@ -119,10 +103,10 @@ 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;
@@ -177,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);
@@ -209,13 +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 */
-extern struct queue_entry *playing_track;
-
/* Choose */
GtkWidget *choose_widget(void);
@@ -225,7 +212,7 @@ 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);
/* Login details */
@@ -266,6 +253,20 @@ void load_settings(void);
void set_tool_colors(GtkWidget *w);
void popup_settings(void);
+/* Playlists */
+
+#if PLAYLISTS
+void playlists_init(void);
+void edit_playlists(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 */
/*