*/
#include "disobedience.h"
+#include "mixer.h"
/* Forward declarations ---------------------------------------------------- */
static void update_nortp(const struct icon *);
static void clicked_icon(GtkButton *, gpointer);
static void clicked_menu(GtkMenuItem *, gpointer userdata);
+static void toggled_menu(GtkCheckMenuItem *, gpointer userdata);
static int enable_rtp(disorder_eclient *c,
disorder_eclient_no_response *completed,
/* Control bar ------------------------------------------------------------- */
-/** @brief Guard against feedback loop in volume control */
-static int suppress_set_volume;
+/** @brief Guard against feedback */
+int suppress_actions = 1;
/** @brief Definition of an icon
*
disorder_eclient_no_response *completed,
void *v);
+ /** @brief Flag */
+ unsigned flags;
+
/** @brief Pointer to button */
GtkWidget *button;
GtkWidget *item;
};
+/** @brief This is the active half of a pair */
+#define ICON_ACTIVE 0x0001
+
+/** @brief This is the inactive half of a pair */
+#define ICON_INACTIVE 0x0002
+
/** @brief Table of all icons */
static struct icon icons[] = {
- { "pause.png", "Pause playing track", 0,
- update_pause,
- disorder_eclient_pause, 0, 0 },
- { "play.png", "Resume playing track", 0,
- update_play,
- disorder_eclient_resume, 0, 0 },
- { "cross.png", "Cancel playing track", "<GdisorderMain>/Control/Scratch",
- update_scratch,
- disorder_eclient_scratch_playing, 0, 0 },
- { "random.png", "Enable random play", 0,
- update_random_enable,
- disorder_eclient_random_enable, 0, 0 },
- { "randomcross.png", "Disable random play", 0,
- update_random_disable,
- disorder_eclient_random_disable, 0, 0 },
- { "notes.png", "Enable play", 0,
- update_enable,
- disorder_eclient_enable, 0, 0 },
- { "notescross.png", "Disable play", 0,
- update_disable,
- disorder_eclient_disable, 0, 0 },
- { "speaker.png", "Play network stream", 0,
- update_rtp,
- enable_rtp, 0, 0 },
- { "speakercross.png", "Stop playing network stream", 0,
- update_nortp,
- disable_rtp, 0, 0 },
+ {
+ "pause.png", /* icon */
+ "Pause playing track", /* tip */
+ "<GdisorderMain>/Control/Playing", /* menuitem */
+ update_pause, /* update */
+ disorder_eclient_pause, /* action */
+ ICON_ACTIVE, /* flags */
+ 0, /* button */
+ 0 /* item */
+ },
+ {
+ "play.png", /* icon */
+ "Resume playing track", /* tip */
+ "<GdisorderMain>/Control/Playing", /* menuitem */
+ update_play, /* update */
+ disorder_eclient_resume, /* action */
+ ICON_INACTIVE, /* flags */
+ 0, /* button */
+ 0 /* item */
+ },
+ {
+ "cross.png", /* icon */
+ "Cancel playing track", /* tip */
+ "<GdisorderMain>/Control/Scratch", /* menuitem */
+ update_scratch, /* update */
+ disorder_eclient_scratch_playing, /* action */
+ 0, /* flags */
+ 0, /* button */
+ 0 /* item */
+ },
+ {
+ "random.png", /* icon */
+ "Enable random play", /* tip */
+ "<GdisorderMain>/Control/Random play", /* menuitem */
+ update_random_enable, /* update */
+ disorder_eclient_random_enable, /* action */
+ ICON_INACTIVE, /* flags */
+ 0, /* button */
+ 0 /* item */
+ },
+ {
+ "randomcross.png", /* icon */
+ "Disable random play", /* tip */
+ "<GdisorderMain>/Control/Random play", /* menuitem */
+ update_random_disable, /* update */
+ disorder_eclient_random_disable, /* action */
+ ICON_ACTIVE, /* flags */
+ 0, /* button */
+ 0 /* item */
+ },
+ {
+ "notes.png", /* icon */
+ "Enable play", /* tip */
+ 0, /* menuitem */
+ update_enable, /* update */
+ disorder_eclient_enable, /* action */
+ ICON_INACTIVE, /* flags */
+ 0, /* button */
+ 0 /* item */
+ },
+ {
+ "notescross.png", /* icon */
+ "Disable play", /* tip */
+ 0, /* menuitem */
+ update_disable, /* update */
+ disorder_eclient_disable, /* action */
+ ICON_ACTIVE, /* flags */
+ 0, /* button */
+ 0 /* item */
+ },
+ {
+ "speaker.png", /* icon */
+ "Play network stream", /* tip */
+ "<GdisorderMain>/Control/Network player", /* menuitem */
+ update_rtp, /* update */
+ enable_rtp, /* action */
+ ICON_INACTIVE, /* flags */
+ 0, /* button */
+ 0 /* item */
+ },
+ {
+ "speakercross.png", /* icon */
+ "Stop playing network stream", /* tip */
+ "<GdisorderMain>/Control/Network player", /* menuitem */
+ update_nortp, /* update */
+ disable_rtp, /* action */
+ ICON_ACTIVE, /* flags */
+ 0, /* button */
+ 0 /* item */
+ },
};
/** @brief Count of icons */
static GtkAdjustment *volume_adj;
static GtkAdjustment *balance_adj;
+static GtkWidget *volume_widget;
+static GtkWidget *balance_widget;
/** @brief Called whenever last_state changes in any way */
void control_monitor(void attribute((unused)) *u) {
int n;
+ gboolean volume_supported;
D(("control_monitor"));
for(n = 0; n < NICONS; ++n)
icons[n].update(&icons[n]);
+ /* Only display volume/balance controls if they will work */
+ if(!rtp_supported
+ || (rtp_supported && mixer_supported(DEFAULT_BACKEND)))
+ volume_supported = TRUE;
+ else
+ volume_supported = FALSE;
+ (volume_supported ? gtk_widget_show : gtk_widget_hide)(volume_widget);
+ (volume_supported ? gtk_widget_show : gtk_widget_hide)(balance_widget);
}
/** @brief Create the control bar */
GtkWidget *control_widget(void) {
GtkWidget *hbox = gtk_hbox_new(FALSE, 1), *vbox;
- GtkWidget *content;
- GdkPixbuf *pb;
- GtkWidget *v, *b;
int n;
NW(hbox);
assert(mainmenufactory); /* ordering must be right */
for(n = 0; n < NICONS; ++n) {
NW(button);
- icons[n].button = gtk_button_new();
- if((pb = find_image(icons[n].icon))) {
- NW(image);
- content = gtk_image_new_from_pixbuf(pb);
- } 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, "");
+ icons[n].button = iconbutton(icons[n].icon, icons[n].tip);
g_signal_connect(G_OBJECT(icons[n].button), "clicked",
G_CALLBACK(clicked_icon), &icons[n]);
/* pop the icon in a vbox so it doesn't get vertically stretch if there are
if(icons[n].menuitem) {
icons[n].item = gtk_item_factory_get_widget(mainmenufactory,
icons[n].menuitem);
- g_signal_connect(G_OBJECT(icons[n].item), "activate",
- G_CALLBACK(clicked_menu), &icons[n]);
+ switch(icons[n].flags & (ICON_ACTIVE|ICON_INACTIVE)) {
+ case ICON_ACTIVE:
+ g_signal_connect(G_OBJECT(icons[n].item), "toggled",
+ G_CALLBACK(toggled_menu), &icons[n]);
+ break;
+ case ICON_INACTIVE:
+ /* Don't connect two instances of the signal! */
+ break;
+ default:
+ g_signal_connect(G_OBJECT(icons[n].item), "activate",
+ G_CALLBACK(clicked_menu), &icons[n]);
+ break;
+ }
}
}
/* create the adjustments for the volume control */
0.2, 0.2, 0));
/* the volume control */
NW(hscale);
- v = gtk_hscale_new(volume_adj);
+ volume_widget = 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);
- gtk_widget_set_size_request(v, 192, -1);
- gtk_widget_set_size_request(b, 192, -1);
- gtk_tooltips_set_tip(tips, v, "Volume", "");
- gtk_tooltips_set_tip(tips, b, "Balance", "");
- gtk_box_pack_start(GTK_BOX(hbox), v, FALSE, TRUE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), b, FALSE, TRUE, 0);
+ balance_widget = gtk_hscale_new(balance_adj);
+ gtk_widget_set_style(volume_widget, tool_style);
+ gtk_widget_set_style(balance_widget, tool_style);
+ gtk_scale_set_digits(GTK_SCALE(volume_widget), 10);
+ gtk_scale_set_digits(GTK_SCALE(balance_widget), 10);
+ gtk_widget_set_size_request(volume_widget, 192, -1);
+ gtk_widget_set_size_request(balance_widget, 192, -1);
+ gtk_tooltips_set_tip(tips, volume_widget, "Volume", "");
+ gtk_tooltips_set_tip(tips, balance_widget, "Balance", "");
+ gtk_box_pack_start(GTK_BOX(hbox), volume_widget, FALSE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), balance_widget, FALSE, TRUE, 0);
/* space updates rather than hammering the server */
- gtk_range_set_update_policy(GTK_RANGE(v), GTK_UPDATE_DELAYED);
- gtk_range_set_update_policy(GTK_RANGE(b), GTK_UPDATE_DELAYED);
+ gtk_range_set_update_policy(GTK_RANGE(volume_widget), GTK_UPDATE_DELAYED);
+ gtk_range_set_update_policy(GTK_RANGE(balance_widget), GTK_UPDATE_DELAYED);
/* notice when the adjustments are changed */
g_signal_connect(G_OBJECT(volume_adj), "value-changed",
G_CALLBACK(volume_adjusted), 0);
g_signal_connect(G_OBJECT(balance_adj), "value-changed",
G_CALLBACK(volume_adjusted), 0);
/* format the volume/balance values ourselves */
- g_signal_connect(G_OBJECT(v), "format-value",
+ g_signal_connect(G_OBJECT(volume_widget), "format-value",
G_CALLBACK(format_volume), 0);
- g_signal_connect(G_OBJECT(b), "format-value",
+ g_signal_connect(G_OBJECT(balance_widget), "format-value",
G_CALLBACK(format_balance), 0);
register_monitor(control_monitor, 0, -1UL);
return hbox;
D(("volume_update"));
l = volume_l / 100.0;
r = volume_r / 100.0;
- ++suppress_set_volume;
+ ++suppress_actions;
gtk_adjustment_set_value(volume_adj, volume(l, r) * goesupto);
gtk_adjustment_set_value(balance_adj, balance(l, r));
- --suppress_set_volume;
+ --suppress_actions;
}
/** @brief Update the state of one of the control icons
if(visible)
gtk_widget_set_sensitive(icon->button, usable);
if(icon->item) {
- /* There's an associated menu item */
- (visible ? gtk_widget_show : gtk_widget_hide)(icon->item);
- if(visible)
- gtk_widget_set_sensitive(icon->item, usable);
+ /* There's an associated menu item. These are always visible, but may not
+ * be usable. */
+ if((icon->flags & (ICON_ACTIVE|ICON_INACTIVE)) == ICON_ACTIVE) {
+ /* The active half of a pair */
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(icon->item), visible);
+ }
+ gtk_widget_set_sensitive(icon->item, usable);
}
}
gpointer userdata) {
const struct icon *icon = userdata;
- icon->action(client, 0, 0);
+ if(!suppress_actions)
+ icon->action(client, 0, 0);
}
static void clicked_menu(GtkMenuItem attribute((unused)) *menuitem,
gpointer userdata) {
const struct icon *icon = userdata;
- icon->action(client, 0, 0);
+ if(!suppress_actions)
+ icon->action(client, 0, 0);
+}
+
+static void toggled_menu(GtkCheckMenuItem *menuitem,
+ gpointer userdata) {
+ const struct icon *icon = userdata;
+ size_t n;
+
+ if(suppress_actions)
+ return;
+ /* This is a bit fiddlier than the others, we need to find the action for the
+ * new state. If the new state is active then we want the ICON_INACTIVE
+ * version and vica versa. */
+ for(n = 0; n < NICONS; ++n)
+ if(icons[n].item == icon->item
+ && !!(icons[n].flags & ICON_INACTIVE) == !!menuitem->active)
+ break;
+ if(n < NICONS)
+ icons[n].action(client, 0, 0);
}
/** @brief Called when the volume has been adjusted */
double v = gtk_adjustment_get_value(volume_adj) / goesupto;
double b = gtk_adjustment_get_value(balance_adj);
- if(suppress_set_volume)
+ if(suppress_actions)
/* This is the result of an update from the server, not a change from the
* user. Don't feedback! */
return;
b = nearbyint(5 * b) / 5;
/* Set the volume. We don't want a reply, we'll get the actual new volume
* from the log. */
- disorder_eclient_volume(client, 0,
- nearbyint(left(v, b) * 100),
- nearbyint(right(v, b) * 100),
- 0);
+ if(rtp_supported) {
+ int l = nearbyint(left(v, b) * 100), r = nearbyint(right(v, b) * 100);
+ mixer_control(DEFAULT_BACKEND, &l, &r, 1);
+ } else
+ /* We don't want a reply, we'll get the actual new volume from the log. */
+ disorder_eclient_volume(client, 0,
+ nearbyint(left(v, b) * 100),
+ nearbyint(right(v, b) * 100),
+ 0);
}
/** @brief Formats the volume value */