* Can be NULL for always sensitive.
*/
int (*sensitive)(void);
+
+ /** @brief True if the menu item has inverse sense to the button */
+ gboolean menu_invert;
/** @brief Pointer to button */
GtkWidget *button;
/** @brief Table of all icons */
static struct icon icons[] = {
{
- toggle: TRUE,
- stock: TRUE,
- icon: GTK_STOCK_MEDIA_PAUSE,
- label: "Pause",
- tip_on: "Pause playing track",
- tip_off: "Resume playing track",
- menuitem: "<GdisorderMain>/Control/Playing",
- on: pause_resume_on,
- sensitive: pause_resume_sensitive,
- action_go_on: disorder_eclient_pause,
- action_go_off: disorder_eclient_resume,
- events: "pause-changed playing-changed rights-changed playing-track-changed",
+ .toggle = TRUE,
+ .stock = TRUE,
+ .icon = GTK_STOCK_MEDIA_PAUSE,
+ .label = "Pause",
+ .tip_on = "Resume playing track",
+ .tip_off = "Pause playing track",
+ .menuitem = "<GdisorderMain>/Control/Playing",
+ .on = pause_resume_on,
+ .sensitive = pause_resume_sensitive,
+ .action_go_on = disorder_eclient_pause,
+ .action_go_off = disorder_eclient_resume,
+ .events = "pause-changed playing-changed rights-changed playing-track-changed",
+ .menu_invert = TRUE,
},
{
- stock: TRUE,
- icon: GTK_STOCK_STOP,
- label: "Scratch",
- tip_on: "Cancel playing track",
- menuitem: "<GdisorderMain>/Control/Scratch",
- sensitive: scratch_sensitive,
- action_go_off: disorder_eclient_scratch_playing,
- events: "playing-track-changed rights-changed",
+ .stock = TRUE,
+ .icon = GTK_STOCK_STOP,
+ .label = "Scratch",
+ .tip_on = "Cancel playing track",
+ .menuitem = "<GdisorderMain>/Control/Scratch",
+ .sensitive = scratch_sensitive,
+ .action_go_off = disorder_eclient_scratch_playing,
+ .events = "playing-track-changed rights-changed",
},
{
- toggle: TRUE,
- stock: TRUE,
- icon: GTK_STOCK_REFRESH,
- label: "Random",
- tip_on: "Disable random play",
- tip_off: "Enable random play",
- menuitem: "<GdisorderMain>/Control/Random play",
- on: random_enabled,
- sensitive: random_sensitive,
- action_go_on: disorder_eclient_random_enable,
- action_go_off: disorder_eclient_random_disable,
- events: "random-changed rights-changed",
+ .toggle = TRUE,
+ .stock = FALSE,
+ .icon = "cards24.png",
+ .label = "Random",
+ .tip_on = "Disable random play",
+ .tip_off = "Enable random play",
+ .menuitem = "<GdisorderMain>/Control/Random play",
+ .on = random_enabled,
+ .sensitive = random_sensitive,
+ .action_go_on = disorder_eclient_random_enable,
+ .action_go_off = disorder_eclient_random_disable,
+ .events = "random-changed rights-changed",
},
{
- toggle: TRUE,
- stock: TRUE,
- icon: GTK_STOCK_MEDIA_PLAY,
- label: "Play",
- tip_on: "Disable play",
- tip_off: "Enable play",
- on: playing_enabled,
- sensitive: playing_sensitive,
- action_go_on: disorder_eclient_enable,
- action_go_off: disorder_eclient_disable,
- events: "enabled-changed rights-changed",
+ .toggle = TRUE,
+ .stock = TRUE,
+ .icon = GTK_STOCK_MEDIA_PLAY,
+ .label = "Play",
+ .tip_on = "Disable play",
+ .tip_off = "Enable play",
+ .on = playing_enabled,
+ .sensitive = playing_sensitive,
+ .action_go_on = disorder_eclient_enable,
+ .action_go_off = disorder_eclient_disable,
+ .events = "enabled-changed rights-changed",
},
{
- toggle: TRUE,
- stock: TRUE,
- icon: GTK_STOCK_CONNECT,
- label: "RTP",
- tip_on: "Stop playing network stream",
- tip_off: "Play network stream",
- menuitem: "<GdisorderMain>/Control/Network player",
- on: rtp_enabled,
- sensitive: rtp_sensitive,
- action_go_on: enable_rtp,
- action_go_off: disable_rtp,
- events: "rtp-changed",
+ .toggle = TRUE,
+ .stock = TRUE,
+ .icon = GTK_STOCK_CONNECT,
+ .label = "RTP",
+ .tip_on = "Stop playing network stream",
+ .tip_off = "Play network stream",
+ .menuitem = "<GdisorderMain>/Control/Network player",
+ .on = rtp_enabled,
+ .sensitive = rtp_sensitive,
+ .action_go_on = enable_rtp,
+ .action_go_off = disable_rtp,
+ .events = "rtp-changed",
},
};
* sliders hang down from the toolbar so it unavoidably gets the whole width
* of the window to play with. */
gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), FALSE);
- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),
- full_mode ? GTK_TOOLBAR_BOTH : GTK_TOOLBAR_ICONS);
+ if(full_mode) gtk_toolbar_unset_style(GTK_TOOLBAR(toolbar));
+ else gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
for(n = 0; n < NICONS; ++n) {
struct icon *const icon = &icons[n];
icon->button = (icon->toggle
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_widget_set_size_request(volume_widget, 128, -1);
+ gtk_widget_set_size_request(balance_widget, 128, -1);
gtk_widget_set_tooltip_text(volume_widget, "Volume");
gtk_widget_set_tooltip_text(balance_widget, "Balance");
gtk_box_pack_start(GTK_BOX(hbox), toolbar,
static int volume_supported(void) {
/* TODO: if the server doesn't know how to set the volume [but isn't using
* network play] then we should have volume_supported = FALSE */
- return (!rtp_supported
- || (rtp_supported && backend && backend->set_volume));
+ return 1;
}
/** @brief Update the volume control when it changes */
/* Icons with an associated menu item */
if(icon->item) {
if(icon->toggle)
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(icon->item), on);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(icon->item),
+ !!icon->menu_invert ^ !!on);
gtk_widget_set_sensitive(icon->item, sensitive);
}
--suppress_actions;
static void toggled_menu(GtkCheckMenuItem attribute((unused)) *menuitem,
gpointer userdata) {
- clicked_icon(NULL, userdata);
+ toggled_icon(NULL, userdata);
}
/** @brief Called when a volume command completes */
static void volume_completed(void attribute((unused)) *v,
- const char *err,
- int attribute((unused)) l,
- int attribute((unused)) r) {
+ const char *err) {
if(err)
popup_protocol_error(0, err);
/* We don't set the UI's notion of the volume here, it is set from the log
* from the log. */
if(rtp_supported) {
int l = nearbyint(left(v, b) * 100), r = nearbyint(right(v, b) * 100);
- if(backend && backend->set_volume)
- backend->set_volume(&l, &r);
+ rtp_setvol(&l, &r);
} else
- disorder_eclient_volume(client, volume_completed,
- nearbyint(left(v, b) * 100),
- nearbyint(right(v, b) * 100),
- 0);
+ disorder_eclient_set_volume(client, volume_completed,
+ nearbyint(left(v, b) * 100),
+ nearbyint(right(v, b) * 100),
+ 0);
}
/** @brief Formats the volume value */
gtk_widget_hide(balance_widget);
gtk_scale_set_value_pos(GTK_SCALE(volume_widget), GTK_POS_RIGHT);
}
- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),
- full_mode ? GTK_TOOLBAR_BOTH : GTK_TOOLBAR_ICONS);
+ if(full_mode) gtk_toolbar_unset_style(GTK_TOOLBAR(toolbar));
+ else gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
}
/*