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 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,
+ 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);
/** @brief Text for tooltip */
const char *tip;
- /** @brief Called when button is clicked (activated) */
- void (*clicked)(GtkButton *button, gpointer userdata);
+ /** @brief Associated menu item or NULL */
+ const char *menuitem;
/** @brief Called to update button when state may have changed */
void (*update)(const struct icon *i);
disorder_eclient_no_response *completed,
void *v);
+ /** @brief Flag */
+ unsigned flags;
+
/** @brief Pointer to button */
GtkWidget *button;
+
+ /** @brief Pointer to menu item */
+ 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", clicked_icon, update_pause,
- disorder_eclient_pause, 0 },
- { "play.png", "Resume playing track", clicked_icon, update_play,
- disorder_eclient_resume, 0 },
- { "cross.png", "Cancel playing track", clicked_icon, update_scratch,
- disorder_eclient_scratch_playing, 0 },
- { "random.png", "Enable random play", clicked_icon, update_random_enable,
- disorder_eclient_random_enable, 0 },
- { "randomcross.png", "Disable random play", clicked_icon, update_random_disable,
- disorder_eclient_random_disable, 0 },
- { "notes.png", "Enable play", clicked_icon, update_enable,
- disorder_eclient_enable, 0 },
- { "notescross.png", "Disable play", clicked_icon, update_disable,
- disorder_eclient_disable, 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 *balance_adj;
/** @brief Called whenever last_state changes in any way */
-static void control_monitor(void attribute((unused)) *u) {
+void control_monitor(void attribute((unused)) *u) {
int n;
D(("control_monitor"));
NW(hbox);
D(("control_widget"));
+ assert(mainmenufactory); /* ordering must be right */
for(n = 0; n < NICONS; ++n) {
NW(button);
icons[n].button = gtk_button_new();
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]);
+ G_CALLBACK(clicked_icon), &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);
+ if(icons[n].menuitem) {
+ icons[n].item = gtk_item_factory_get_widget(mainmenufactory,
+ icons[n].menuitem);
+ 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 */
NW(adjustment);
/* Only both updating usability if the button is visible */
if(visible)
gtk_widget_set_sensitive(icon->button, usable);
+ if(icon->item) {
+ /* 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);
+ }
}
static void update_pause(const struct icon *icon) {
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);
}
+static void clicked_menu(GtkMenuItem attribute((unused)) *menuitem,
+ gpointer userdata) {
+ const struct icon *icon = userdata;
+
+ icon->action(client, 0, 0);
+}
+
+static void toggled_menu(GtkCheckMenuItem *menuitem,
+ gpointer userdata) {
+ const struct icon *icon = userdata;
+ size_t n;
+
+ /* 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 */
static void volume_adjusted(GtkAdjustment attribute((unused)) *a,
gpointer attribute((unused)) user_data) {
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