static GtkWidget *balance_widget;
/** @brief Called whenever last_state changes in any way */
-void control_monitor(void attribute((unused)) *u) {
+static void control_changed(const char attribute((unused)) *event,
+ void attribute((unused)) *evendata,
+ void attribute((unused)) *callbackdata) {
int n;
gboolean volume_supported;
- D(("control_monitor"));
+ D(("control_changed"));
for(n = 0; n < NICONS; ++n)
icons[n].update(&icons[n]);
/* Only display volume/balance controls if they will work */
G_CALLBACK(format_volume), 0);
g_signal_connect(G_OBJECT(balance_widget), "format-value",
G_CALLBACK(format_balance), 0);
- register_monitor(control_monitor, 0, -1UL);
+ event_register("enabled-changed", control_changed, 0);
+ event_register("random-changed", control_changed, 0);
+ event_register("pause-changed", control_changed, 0);
+ event_register("playing-changed", control_changed, 0);
+ event_register("rtp-changed", control_changed, 0);
event_register("volume-changed", volume_changed, 0);
return hbox;
}
disorder_eclient_nop(client, nop_completed, 0);
}
if(rtp_supported) {
- const int old_state = rtp_is_running;
+ const int rtp_was_running = rtp_is_running;
rtp_is_running = rtp_running();
- if(old_state != rtp_is_running)
- control_monitor(0);
+ if(rtp_was_running != rtp_is_running)
+ event_raise("rtp-changed", 0);
}
return TRUE; /* keep call me please */
}
const char *error,
int attribute((unused)) nvec,
char attribute((unused)) **vec) {
+ const int rtp_was_running = rtp_is_running;
+
++suppress_actions;
rtp_address_in_flight = 0;
if(error) {
} else {
rtp_supported = 1;
rtp_is_running = rtp_running();
- control_monitor(0);
}
- control_monitor(0);
+ if(rtp_is_running != rtp_was_running)
+ event_raise("rtp-changed", 0);
--suppress_actions;
}
extern const disorder_eclient_log_callbacks log_callbacks;
-typedef void monitor_callback(void *u);
-
/* Functions --------------------------------------------------------------- */
disorder_eclient *gtkclient(void);
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);
GtkWidget *control_widget(void);
/* Make the controls widget */
-void control_monitor(void *u);
-
extern int suppress_actions;
/* Queue/Recent/Added */
log_rescanned
};
-/** @brief State monitor
- *
- * We keep a linked list of everything that is interested in state changes.
- */
-struct monitor {
- /** @brief Next monitor */
- struct monitor *next;
-
- /** @brief State bits of interest */
- unsigned long mask;
-
- /** @brief Function to call if any of @c mask change */
- monitor_callback *callback;
-
- /** @brief User data for callback */
- void *u;
-};
-
-/** @brief List of monitors */
-static struct monitor *monitors;
-
/** @brief Update everything */
void all_update(void) {
++suppress_actions;
* Depending on server and network state the TCP connection to the server may
* go up or down many times during the lifetime of Disobedience. This function
* is called whenever it connects.
- *
- * The intent is to use the monitor logic to achieve this in future.
*/
static void log_connected(void attribute((unused)) *v) {
/* Don't know what we might have missed while disconnected so update
/** @brief Called when a state change occurs */
static void log_state(void attribute((unused)) *v,
unsigned long state) {
- const struct monitor *m;
unsigned long changes = state ^ last_state;
static int first = 1;
for(unsigned n = 0; n < NSTATE_EVENTS; ++n)
if(changes & state_events[n].bit)
event_raise(state_events[n].event, 0);
- /* Tell anything that cares about the state change */
- for(m = monitors; m; m = m->next) {
- if(changes & m->mask)
- m->callback(m->u);
- }
--suppress_actions;
}
event_raise("added-changed", 0);
}
-/** @brief Add a monitor to the list
- * @param callback Function to call
- * @param u User data to pass to @p callback
- * @param mask Mask of flags that @p callback cares about
- *
- * Pass @p mask as -1UL to match all flags.
- */
-void register_monitor(monitor_callback *callback,
- void *u,
- unsigned long mask) {
- struct monitor *m = xmalloc(sizeof *m);
-
- m->next = monitors;
- m->mask = mask;
- m->callback = callback;
- m->u = u;
- monitors = m;
-}
-
/*
Local Variables:
c-basic-offset:2