chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Complete Disobedience transition to event_ from _monitor.
[disorder]
/
disobedience
/
disobedience.h
diff --git
a/disobedience/disobedience.h
b/disobedience/disobedience.h
index ccb9acc3d7258b4df8fe3c8e8d40284343aa98db..452526d9fd8f26ca818070dcc70e227db7d4bdd2 100644
(file)
--- a/
disobedience/disobedience.h
+++ b/
disobedience/disobedience.h
@@
-24,13
+24,9
@@
#ifndef DISOBEDIENCE_H
#define DISOBEDIENCE_H
#ifndef DISOBEDIENCE_H
#define DISOBEDIENCE_H
-#include <config.h>
-#include "types.h"
+#include "common.h"
-#include <stdio.h>
#include <time.h>
#include <time.h>
-#include <string.h>
-#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <math.h>
#include <ctype.h>
#include <errno.h>
#include <math.h>
@@
-49,6
+45,8
@@
#include "configuration.h"
#include "hash.h"
#include "selection.h"
#include "configuration.h"
#include "hash.h"
#include "selection.h"
+#include "kvp.h"
+#include "eventdist.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <glib.h>
#include <gtk/gtk.h>
@@
-124,8
+122,6
@@
extern GtkItemFactory *mainmenufactory;
extern const disorder_eclient_log_callbacks log_callbacks;
extern const disorder_eclient_log_callbacks log_callbacks;
-typedef void monitor_callback(void *u);
-
/* Functions --------------------------------------------------------------- */
disorder_eclient *gtkclient(void);
/* Functions --------------------------------------------------------------- */
disorder_eclient *gtkclient(void);
@@
-170,11
+166,6
@@
GtkWidget *create_buttons_box(struct button *buttons,
size_t nbuttons,
GtkWidget *box);
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);
/** @brief Type signature for a reset callback */
typedef void reset_callback(void);
@@
-202,11
+193,6
@@
void users_set_sensitive(int sensitive);
GtkWidget *control_widget(void);
/* Make the controls widget */
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 */
extern int suppress_actions;
/* Queue/Recent/Added */
@@
-217,12
+203,6
@@
GtkWidget *added_widget(void);
/* Create widgets for displaying the queue, the recently played list and the
* newly added tracks list */
/* 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 */
void queue_select_all(struct queuelike *ql);
void queue_select_none(struct queuelike *ql);
/* Select all/none on some queue */
@@
-238,7
+218,6
@@
void namepart_update(const char *track,
const char *part);
/* Called when a namepart might have changed */
const char *part);
/* Called when a namepart might have changed */
-
/* Choose */
GtkWidget *choose_widget(void);
/* Choose */
GtkWidget *choose_widget(void);
@@
-247,6
+226,9
@@
GtkWidget *choose_widget(void);
void choose_update(void);
/* Called when we think the choose tree might need updating */
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);
/* Login details */
void login_box(void);