Columns are now resizable and wide columns are ellipsized. Columns

[disorder] / disobedience / disobedience.h

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index db1e8e9284223d1a63496aedf933405b9c7bf56c..e332e82e610dab5ecd097947e54f7b353620129a 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -45,6 +45,9 @@
 #include "configuration.h"
 #include "hash.h"
 #include "selection.h"
+#include "kvp.h"
+#include "eventdist.h"
+#include "split.h"
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -90,6 +93,7 @@ struct tabtype {
   void (*properties_activate)(GtkWidget *tab);
   void (*selectall_activate)(GtkWidget *tab);
   void (*selectnone_activate)(GtkWidget *tab);
+  void (*selected)(void);
 };
 
 /** @brief Button definitions */
@@ -109,6 +113,7 @@ extern GtkWidget *tabs;                 /* main tabs */
 extern disorder_eclient *client;        /* main client */
 
 extern unsigned long last_state;        /* last reported state */
+extern rights_type last_rights;         /* last reported rights bitmap */
 extern int playing;                     /* true if playing some track */
 extern int volume_l, volume_r;          /* current volume */
 extern double goesupto;                 /* volume upper bound */
@@ -120,8 +125,6 @@ extern GtkItemFactory *mainmenufactory;
 
 extern const disorder_eclient_log_callbacks log_callbacks;
 
-typedef void monitor_callback(void *u);
-
 /* Functions --------------------------------------------------------------- */
 
 disorder_eclient *gtkclient(void);
@@ -134,8 +137,6 @@ void popup_protocol_error(int code,
 void properties(int ntracks, const char **tracks);
 /* Pop up a properties window for a list of tracks */
 
-void properties_reset(void);
-
 GtkWidget *scroll_widget(GtkWidget *child);
 /* Wrap a widget up for scrolling */
 
@@ -166,18 +167,7 @@ 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);
-
-void register_reset(reset_callback *callback);
-/* Register a reset callback */
-
-void reset(void);
+void logged_in(void);
 
 void all_update(void);
 /* Update everything */
@@ -198,11 +188,6 @@ void users_set_sensitive(int sensitive);
 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 */
@@ -213,12 +198,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 */
@@ -234,6 +213,7 @@ void namepart_update(const char *track,
                      const char *part);
 /* Called when a namepart might have changed */
 
+extern struct queue_entry *playing_track;
 
 /* Choose */
 
@@ -243,6 +223,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);