Complete Disobedience transition to event_ from _monitor.

[disorder] / disobedience / disobedience.h

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 617148e41dd4b64f5e72b50222962abcdb6e23db..452526d9fd8f26ca818070dcc70e227db7d4bdd2 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -24,13 +24,9 @@
 #ifndef DISOBEDIENCE_H
 #define DISOBEDIENCE_H
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
-#include <stdio.h>
 #include <time.h>
-#include <string.h>
-#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <math.h>
@@ -49,6 +45,8 @@
 #include "configuration.h"
 #include "hash.h"
 #include "selection.h"
+#include "kvp.h"
+#include "eventdist.h"
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -76,6 +74,9 @@ struct callbackdata {
     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;
 };
 
@@ -121,8 +122,6 @@ extern GtkItemFactory *mainmenufactory;
 
 extern const disorder_eclient_log_callbacks log_callbacks;
 
-typedef void monitor_callback(void *u);
-
 /* Functions --------------------------------------------------------------- */
 
 disorder_eclient *gtkclient(void);
@@ -140,6 +139,8 @@ void properties_reset(void);
 GtkWidget *scroll_widget(GtkWidget *child);
 /* Wrap a widget up for scrolling */
 
+GtkWidget *frame_widget(GtkWidget *w, const char *title);
+
 GdkPixbuf *find_image(const char *name);
 /* Get the pixbuf for an image.  Returns a null pointer if it cannot be
  * found. */
@@ -165,11 +166,6 @@ 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);
 
@@ -190,17 +186,13 @@ 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);
 
 /* Controls */
 
 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 */
@@ -211,12 +203,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 */
@@ -232,7 +218,6 @@ void namepart_update(const char *track,
                      const char *part);
 /* Called when a namepart might have changed */
 
-
 /* Choose */
 
 GtkWidget *choose_widget(void);
@@ -241,6 +226,9 @@ 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 *error);
+
 /* Login details */
 
 void login_box(void);