* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*/
+/** @file disobedience/control.c
+ * @brief Volume control and buttons
+ */
#include "disobedience.h"
WT(adjustment);
WT(hscale);
WT(hbox);
-WT(tooltips);
WT(button);
WT(image);
WT(label);
static void update_random_disable(const struct icon *);
static void update_enable(const struct icon *);
static void update_disable(const struct icon *);
+static void update_rtp(const struct icon *);
+static void update_nortp(const struct icon *);
static void clicked_icon(GtkButton *, gpointer);
+static int enable_rtp(disorder_eclient *c,
+ disorder_eclient_no_response *completed,
+ void *v);
+static int disable_rtp(disorder_eclient *c,
+ disorder_eclient_no_response *completed,
+ void *v);
+
static double left(double v, double b);
static double right(double v, double b);
static double volume(double l, double r);
static gchar *format_volume(GtkScale *scale, gdouble value);
static gchar *format_balance(GtkScale *scale, gdouble value);
-static void control_monitor(void *u);
-
/* Control bar ------------------------------------------------------------- */
+/** @brief Guard against feedback loop in volume control */
static int suppress_set_volume;
-/* Guard against feedback loop in volume control */
-static struct icon {
+/** @brief Definition of an icon
+ *
+ * The design here is rather mad: rather than changing the image displayed by
+ * icons according to their state, we flip the visibility of pairs of icons.
+ */
+struct icon {
+ /** @brief Filename for image */
const char *icon;
+
+ /** @brief Text for tooltip */
const char *tip;
+
+ /** @brief Called when button is clicked (activated) */
void (*clicked)(GtkButton *button, gpointer userdata);
+
+ /** @brief Called to update button when state may have changed */
void (*update)(const struct icon *i);
+
+ /** @brief @ref eclient.h function to call */
int (*action)(disorder_eclient *c,
disorder_eclient_no_response *completed,
void *v);
+
+ /** @brief Pointer to button */
GtkWidget *button;
-} icons[] = {
+};
+
+/** @brief Table of all icons */
+static struct icon icons[] = {
{ "pause.png", "Pause playing track", clicked_icon, update_pause,
disorder_eclient_pause, 0 },
{ "play.png", "Resume playing track", clicked_icon, update_play,
disorder_eclient_enable, 0 },
{ "notescross.png", "Disable play", clicked_icon, update_disable,
disorder_eclient_disable, 0 },
+ { "speaker.png", "Play network stream", clicked_icon, update_rtp,
+ enable_rtp, 0 },
+ { "speakercross.png", "Stop playing network stream", clicked_icon, update_nortp,
+ disable_rtp, 0 },
};
+
+/** @brief Count of icons */
#define NICONS (int)(sizeof icons / sizeof *icons)
-GtkAdjustment *volume_adj, *balance_adj;
+static GtkAdjustment *volume_adj;
+static GtkAdjustment *balance_adj;
+
+/** @brief Called whenever last_state changes in any way */
+void control_monitor(void attribute((unused)) *u) {
+ int n;
+
+ D(("control_monitor"));
+ for(n = 0; n < NICONS; ++n)
+ icons[n].update(&icons[n]);
+}
-/* Create the control bar */
+/** @brief Create the control bar */
GtkWidget *control_widget(void) {
GtkWidget *hbox = gtk_hbox_new(FALSE, 1), *vbox;
GtkWidget *content;
GdkPixbuf *pb;
GtkWidget *v, *b;
- GtkTooltips *tips = gtk_tooltips_new();
int n;
NW(hbox);
- NW(tooltips);
D(("control_widget"));
for(n = 0; n < NICONS; ++n) {
NW(button);
return hbox;
}
-/** @brief Update the control bar after some kind of state change */
-void control_update(void) {
+/** @brief Update the volume control when it changes */
+void volume_update(void) {
double l, r;
- D(("control_update"));
- /*control_monitor(0, disorder_eclient_state(client));*/
+ D(("volume_update"));
l = volume_l / 100.0;
r = volume_r / 100.0;
++suppress_set_volume;
--suppress_set_volume;
}
-static void control_monitor(void attribute((unused)) *u) {
- int n;
-
- fprintf(stderr, "control_monitor\n");
- for(n = 0; n < NICONS; ++n)
- icons[n].update(&icons[n]);
- fprintf(stderr, "\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
/* If the connection is down nothing is ever usable */
if(!(last_state & DISORDER_CONNECTED))
usable = 0;
- fprintf(stderr, "%s usable=%d visible=%d\n", icon->tip, usable, visible);
(visible ? gtk_widget_show : gtk_widget_hide)(icon->button);
/* Only both updating usability if the button is visible */
if(visible)
update_icon(icon, visible, usable);
}
+static void update_rtp(const struct icon *icon) {
+ const int visible = !rtp_is_running;
+ const int usable = rtp_supported;
+ update_icon(icon, visible, usable);
+}
+
+static void update_nortp(const struct icon *icon) {
+ const int visible = rtp_is_running;
+ const int usable = rtp_supported;
+ update_icon(icon, visible, usable);
+}
+
static void clicked_icon(GtkButton attribute((unused)) *button,
gpointer userdata) {
const struct icon *icon = userdata;
icon->action(client, 0, 0);
}
+/** @brief Called when the volume has been adjusted */
static void volume_adjusted(GtkAdjustment attribute((unused)) *a,
gpointer attribute((unused)) user_data) {
double v = gtk_adjustment_get_value(volume_adj) / goesupto;
0);
}
-/* Called to format the volume value */
+/** @brief Formats the volume value */
static gchar *format_volume(GtkScale attribute((unused)) *scale,
gdouble value) {
char s[32];
return g_strdup(s);
}
-/* Called to format the balance value. */
+/** @brief Formats the balance value */
static gchar *format_balance(GtkScale attribute((unused)) *scale,
gdouble value) {
char s[32];
* Thanks to Clive and Andrew.
*/
+/** @brief Return the greater of @p x and @p y */
static double max(double x, double y) {
return x > y ? x : y;
}
+/** @brief Compute the left channel volume */
static double left(double v, double b) {
if(b > 0) /* volume = right */
return v * (1 - b);
return v;
}
+/** @brief Compute the right channel volume */
static double right(double v, double b) {
if(b > 0) /* volume = right */
return v;
return v * (1 + b);
}
+/** @brief Compute the overall volume */
static double volume(double l, double r) {
return max(l, r);
}
+/** @brief Compute the balance */
static double balance(double l, double r) {
if(l > r)
return r / l - 1;
return 0;
}
+/** @brief Called to enable RTP play
+ *
+ * Rather odd signature is to fit in with the other icons which all call @ref
+ * lib/eclient.h functions.
+ */
+static int enable_rtp(disorder_eclient attribute((unused)) *c,
+ disorder_eclient_no_response attribute((unused)) *completed,
+ void attribute((unused)) *v) {
+ start_rtp();
+ return 0;
+}
+
+/** @brief Called to disable RTP play
+ *
+ * Rather odd signature is to fit in with the other icons which all call @ref
+ * lib/eclient.h functions.
+ */
+static int disable_rtp(disorder_eclient attribute((unused)) *c,
+ disorder_eclient_no_response attribute((unused)) *completed,
+ void attribute((unused)) *v) {
+ stop_rtp();
+ return 0;
+}
+
/*
Local Variables:
c-basic-offset:2
~mdw / disorder / blobdiff