/*
* This file is part of DisOrder.
- * Copyright (C) 2006 Richard Kettlewell
+ * Copyright (C) 2006, 2007 Richard Kettlewell
*
* 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
#include "disobedience.h"
-/* Forward declartions ----------------------------------------------------- */
+/* Forward declarations ---------------------------------------------------- */
+
+WT(adjustment);
+WT(hscale);
+WT(hbox);
+WT(tooltips);
+WT(button);
+WT(image);
+WT(label);
+WT(vbox);
struct icon;
static gchar *format_volume(GtkScale *scale, gdouble value);
static gchar *format_balance(GtkScale *scale, gdouble value);
+static void control_monitor(void *u);
+
/* Control bar ------------------------------------------------------------- */
static int suppress_set_volume;
GtkAdjustment *volume_adj, *balance_adj;
/* Create the control bar */
- GtkWidget *control_widget(void) {
+GtkWidget *control_widget(void) {
GtkWidget *hbox = gtk_hbox_new(FALSE, 1), *vbox;
GtkWidget *content;
GdkPixbuf *pb;
GtkTooltips *tips = gtk_tooltips_new();
int n;
+ NW(hbox);
+ NW(tooltips);
D(("control_widget"));
for(n = 0; n < NICONS; ++n) {
+ NW(button);
icons[n].button = gtk_button_new();
- if((pb = find_image(icons[n].icon)))
+ if((pb = find_image(icons[n].icon))) {
+ NW(image);
content = gtk_image_new_from_pixbuf(pb);
- else
+ } else {
+ NW(label);
content = gtk_label_new(icons[n].icon);
+ }
gtk_container_add(GTK_CONTAINER(icons[n].button), content);
gtk_tooltips_set_tip(tips, icons[n].button, icons[n].tip, "");
g_signal_connect(G_OBJECT(icons[n].button), "clicked",
G_CALLBACK(icons[n].clicked), &icons[n]);
/* pop the icon in a vbox so it doesn't get vertically stretch if there are
* taller things in the control bar */
+ NW(vbox);
vbox = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), icons[n].button, TRUE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
}
/* create the adjustments for the volume control */
+ NW(adjustment);
volume_adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, goesupto,
goesupto / 20, goesupto / 20,
0));
+ NW(adjustment);
balance_adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -1, 1,
0.2, 0.2, 0));
/* the volume control */
+ NW(hscale);
v = gtk_hscale_new(volume_adj);
+ NW(hscale);
b = gtk_hscale_new(balance_adj);
gtk_scale_set_digits(GTK_SCALE(v), 10);
gtk_scale_set_digits(GTK_SCALE(b), 10);
G_CALLBACK(format_volume), 0);
g_signal_connect(G_OBJECT(b), "format-value",
G_CALLBACK(format_balance), 0);
+ register_monitor(control_monitor, 0, -1UL);
return hbox;
}
-/* Update the control bar after some kind of state change */
+/** @brief Update the control bar after some kind of state change */
void control_update(void) {
- int n;
double l, r;
D(("control_update"));
- for(n = 0; n < NICONS; ++n)
- icons[n].update(&icons[n]);
+ /*control_monitor(0, disorder_eclient_state(client));*/
l = volume_l / 100.0;
r = volume_r / 100.0;
- ++suppress_set_volume;;
+ ++suppress_set_volume;
gtk_adjustment_set_value(volume_adj, volume(l, r) * goesupto);
gtk_adjustment_set_value(balance_adj, balance(l, r));
--suppress_set_volume;
}
-static void update_icon(GtkWidget *button,
- int visible, int attribute((unused)) usable) {
- (visible ? gtk_widget_show : gtk_widget_hide)(button);
- /* TODO: show usability */
+static void control_monitor(void attribute((unused)) *u) {
+ int n;
+
+ for(n = 0; n < NICONS; ++n)
+ icons[n].update(&icons[n]);
+}
+
+/** @brief Update the state of one of the control icons
+ * @param icon Target icon
+ * @param visible True if this version of the button should be visible
+ * @param usable True if the button is currently usable
+ *
+ * Several of the icons, rather bizarrely, come in pairs: for instance exactly
+ * one of the play and pause buttons is supposed to be visible at any given
+ * moment.
+ *
+ * @p usable need not take into account server availability, that is done
+ * automatically.
+ */
+static void update_icon(const struct icon *icon,
+ int visible, int usable) {
+ /* If the connection is down nothing is ever usable */
+ if(!(last_state & DISORDER_CONNECTED))
+ usable = 0;
+ (visible ? gtk_widget_show : gtk_widget_hide)(icon->button);
+ /* Only both updating usability if the button is visible */
+ if(visible)
+ gtk_widget_set_sensitive(icon->button, usable);
}
static void update_pause(const struct icon *icon) {
- int visible = !(last_state & DISORDER_TRACK_PAUSED);
- int usable = playing; /* TODO: might be a lie */
- update_icon(icon->button, visible, usable);
+ const int visible = !(last_state & DISORDER_TRACK_PAUSED);
+ const int usable = !!(last_state & DISORDER_PLAYING); /* TODO: might be a lie */
+ update_icon(icon, visible, usable);
}
static void update_play(const struct icon *icon) {
- int visible = !!(last_state & DISORDER_TRACK_PAUSED);
- int usable = playing;
- update_icon(icon->button, visible, usable);
+ const int visible = !!(last_state & DISORDER_TRACK_PAUSED);
+ const int usable = !!(last_state & DISORDER_PLAYING);
+ update_icon(icon, visible, usable);
}
static void update_scratch(const struct icon *icon) {
- int visible = 1;
- int usable = playing;
- update_icon(icon->button, visible, usable);
+ const int visible = 1;
+ const int usable = !!(last_state & DISORDER_PLAYING);
+ update_icon(icon, visible, usable);
}
static void update_random_enable(const struct icon *icon) {
- int visible = !(last_state & DISORDER_RANDOM_ENABLED);
- int usable = 1;
- update_icon(icon->button, visible, usable);
+ const int visible = !(last_state & DISORDER_RANDOM_ENABLED);
+ const int usable = 1;
+ update_icon(icon, visible, usable);
}
static void update_random_disable(const struct icon *icon) {
- int visible = !!(last_state & DISORDER_RANDOM_ENABLED);
- int usable = 1;
- update_icon(icon->button, visible, usable);
+ const int visible = !!(last_state & DISORDER_RANDOM_ENABLED);
+ const int usable = 1;
+ update_icon(icon, visible, usable);
}
static void update_enable(const struct icon *icon) {
- int visible = !(last_state & DISORDER_PLAYING_ENABLED);
- int usable = 1;
- update_icon(icon->button, visible, usable);
+ const int visible = !(last_state & DISORDER_PLAYING_ENABLED);
+ const int usable = 1;
+ update_icon(icon, visible, usable);
}
static void update_disable(const struct icon *icon) {
- int visible = !!(last_state & DISORDER_PLAYING_ENABLED);
- int usable = 1;
- update_icon(icon->button, visible, usable);
+ const int visible = !!(last_state & DISORDER_PLAYING_ENABLED);
+ const int usable = 1;
+ update_icon(icon, visible, usable);
}
static void clicked_icon(GtkButton attribute((unused)) *button,
char s[32];
snprintf(s, sizeof s, "%.1f", (double)value);
- return xstrdup(s);
+ return g_strdup(s);
}
/* Called to format the balance value. */
char s[32];
if(fabs(value) < 0.1)
- return xstrdup("0");
+ return g_strdup("0");
snprintf(s, sizeof s, "%+.1f", (double)value);
- return xstrdup(s);
+ return g_strdup(s);
}
/* Volume mapping. We consider left, right, volume to be in [0,1]
indent-tabs-mode:nil
End:
*/
-/* arch-tag:IEbGnYlX8cqOFjY1EXlXBA */
~mdw / disorder / blobdiff