X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/229d327f85abd31e64c3b06741c14b8f9233bccd..61366360ff395427a76472e407debad7d3cbecdf:/disobedience/disobedience.h
diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index faf7597..db4bff0 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
@@ -48,10 +46,12 @@
#include "kvp.h"
#include "eventdist.h"
#include "split.h"
+#include "timeval.h"
#include
#include
#include
+#include
/* Types ------------------------------------------------------------------- */
@@ -59,28 +59,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
@@ -208,13 +186,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);
@@ -224,7 +209,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 */