robert/alsa-scarlett-gui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove widgets from struct alsa_elem and add data to callbacks

Browse Source 
Rather than having widget/widget2/widget_callback fields in the struct
alsa_elem, have a list of callbacks and allow private data to be
passed to callbacks.
This commit is contained in:
Geoffrey D. Bennett
2023-12-03 04:53:34 +10:30
parent d56a1d34ff
commit 47034d7901
11 changed files with 222 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/widget-dual.c
View File

@@ -3,18 +3,28 @@
#include "widget-dual.h"
static void dual_button_clicked(GtkWidget *widget, struct alsa_elem *elem) {
int value1 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(elem->widget));
int value2 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(elem->widget2));
struct dual_button {
struct alsa_elem *elem;
GtkWidget *button1;
GtkWidget *button2;
};
static void dual_button_clicked(GtkWidget *widget, struct dual_button *data) {
int value1 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->button1));
int value2 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->button2));
int value = value1 ? value2 + 1 : 0;
alsa_set_elem_value(elem, value);
alsa_set_elem_value(data->elem, value);
gtk_widget_set_sensitive(elem->widget2, value1);
gtk_widget_set_sensitive(data->button2, value1);
}
static void dual_button_updated(struct alsa_elem *elem) {
static void dual_button_updated(
struct alsa_elem *elem,
void *private
) {
struct dual_button *data = private;
// value (from ALSA control) is 0/1/2
// value1 (first button) is 0/1/1
@@ -22,14 +32,14 @@ static void dual_button_updated(struct alsa_elem *elem) {
int value = alsa_get_elem_value(elem);
int value1 = !!value;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(elem->widget), value1);
gtk_button_set_label(GTK_BUTTON(elem->widget), elem->bool_text[value1]);
gtk_widget_set_sensitive(elem->widget2, value1);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->button1), value1);
gtk_button_set_label(GTK_BUTTON(data->button1), elem->bool_text[value1]);
gtk_widget_set_sensitive(data->button2, value1);
if (value1) {
int value2 = value - 1;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(elem->widget2), value2);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->button2), value2);
gtk_button_set_label(
GTK_BUTTON(elem->widget2), elem->bool_text[value2 + 2]
GTK_BUTTON(data->button2), elem->bool_text[value2 + 2]
);
}
}
@@ -38,31 +48,40 @@ static void dual_button_updated(struct alsa_elem *elem) {
// buttons:
// first button disables/enables the feature
// second button switches between the two enabled states
void make_dual_boolean_alsa_elems(
GtkWidget *make_dual_boolean_alsa_elems(
struct alsa_elem *elem,
const char *label_text,
const char *disabled_text_1,
const char *enabled_text_1,
const char *disabled_text_2,
const char *enabled_text_2
) {
GtkWidget *button1 = gtk_toggle_button_new();
GtkWidget *button2 = gtk_toggle_button_new();
struct dual_button *data = g_malloc(sizeof(struct dual_button));
data->elem = elem;
data->button1 = gtk_toggle_button_new();
data->button2 = gtk_toggle_button_new();
g_signal_connect(
button1, "clicked", G_CALLBACK(dual_button_clicked), elem
data->button1, "clicked", G_CALLBACK(dual_button_clicked), data
);
g_signal_connect(
button2, "clicked", G_CALLBACK(dual_button_clicked), elem
data->button2, "clicked", G_CALLBACK(dual_button_clicked), data
);
elem->widget = button1;
elem->widget2 = button2;
elem->widget_callback = dual_button_updated;
alsa_elem_add_callback(elem, dual_button_updated, data);
elem->bool_text[0] = disabled_text_1;
elem->bool_text[1] = enabled_text_1;
elem->bool_text[2] = disabled_text_2;
elem->bool_text[3] = enabled_text_2;
gtk_button_set_label(GTK_BUTTON(elem->widget2), disabled_text_2);
gtk_button_set_label(GTK_BUTTON(data->button2), disabled_text_2);
dual_button_updated(elem);
dual_button_updated(elem, data);
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
GtkWidget *label = gtk_label_new(label_text);
gtk_box_append(GTK_BOX(box), label);
gtk_box_append(GTK_BOX(box), GTK_WIDGET(data->button1));
gtk_box_append(GTK_BOX(box), GTK_WIDGET(data->button2));
return box;
}