rmedigicontrol/: port from GTK2 to GTK3

This commit is contained in:
genBTC 2025-03-06 19:34:34 -05:00
parent 60f1430882
commit e9beb0aef6
4 changed files with 53 additions and 46 deletions

View file

@ -23,7 +23,7 @@ ctl_elem_info_val_t att_iv;
void destroy(GtkWidget *widget,gpointer data)
{
snd_ctl_close(ctl);
snd_ctl_close(ctl);
gtk_main_quit();
}
int main(int argc, char *argv[])
@ -32,7 +32,7 @@ int main(int argc, char *argv[])
char name[16],*err;
snd_ctl_card_info_t *hw_info;
card_type_t type;
GtkWidget *window,*main_box,*input_box,*loopback_box,*clock_box,*monitor_box,*att_box,*level_box;
GtkWidget *col1_box,*col2_box,*err_lbl;
snd_ctl_card_info_alloca(&hw_info);
@ -76,27 +76,27 @@ int main(int argc, char *argv[])
}
if(card<0)
err="No RME Digi Soundcard found...";
gtk_init(&argc, &argv);
gtk_init(&argc, &argv);
window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_signal_connect(GTK_OBJECT(window),"destroy",GTK_SIGNAL_FUNC(destroy),NULL);
g_signal_connect(window,"destroy",G_CALLBACK(destroy),NULL);
if(err)
{
err_lbl=gtk_label_new(err);
gtk_container_add(GTK_CONTAINER(window),err_lbl);
gtk_widget_show_all(window);
gtk_main ();
exit(EXIT_FAILURE);
gtk_main ();
exit(EXIT_FAILURE);
}
gtk_window_set_title(GTK_WINDOW(window),snd_ctl_card_info_get_name(hw_info));
//-Wdeprecated-declarations
main_box=gtk_hbox_new(FALSE,0);
col1_box=gtk_vbox_new(FALSE,0);
col2_box=gtk_vbox_new(FALSE,0);
col1_box=gtk_vbox_new(FALSE,0);
col2_box=gtk_vbox_new(FALSE,0);
input_box=create_enum_elem_radio("Input Connector",&input_iv);
gtk_box_pack_start(GTK_BOX(col1_box),input_box,TRUE,FALSE,0);
loopback_box=create_loopback_toggle();
gtk_box_pack_start(GTK_BOX(col1_box),loopback_box,TRUE,FALSE,0);
@ -109,7 +109,7 @@ int main(int argc, char *argv[])
{
monitor_box=create_enum_elem_radio("Monitor Tracks",&monitor_iv);
gtk_box_pack_start(GTK_BOX(col2_box),monitor_box,TRUE,FALSE,0);
att_box=create_enum_elem_radio("Attenuation",&att_iv);
gtk_box_pack_start(GTK_BOX(col2_box),att_box,TRUE,FALSE,0);
@ -118,7 +118,7 @@ int main(int argc, char *argv[])
level_box=create_level_box();
gtk_box_pack_start(GTK_BOX(main_box),level_box,TRUE,TRUE,8);
}
gtk_container_add(GTK_CONTAINER(window),main_box);
gtk_container_add(GTK_CONTAINER(window),main_box);
gtk_widget_show_all(window);
gtk_main ();
return EXIT_SUCCESS;
@ -128,9 +128,9 @@ void elem_radio_toggled(GtkRadioButton *r,gpointer p)
int i;
GSList *l;
ctl_elem_info_val_t *iv;
iv=(ctl_elem_info_val_t *)p;
l=gtk_radio_button_group(r);
l=gtk_radio_button_get_group(r);
i=snd_ctl_elem_info_get_items(iv->info);
while(l)
{
@ -151,27 +151,27 @@ GtkWidget *create_enum_elem_radio(char *elem_name,ctl_elem_info_val_t *iv)
snd_ctl_elem_info_malloc(&iv->info);
snd_ctl_elem_value_malloc(&iv->val);
group=NULL;
active=NULL;
box=gtk_vbox_new(TRUE,0);
box=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
snd_ctl_elem_info_set_interface(iv->info, SND_CTL_ELEM_IFACE_MIXER);
snd_ctl_elem_info_set_name(iv->info,elem_name);
snd_ctl_elem_info_set_numid(iv->info,0);
snd_ctl_elem_info(ctl,iv->info);
snd_ctl_elem_value_set_interface(iv->val, SND_CTL_ELEM_IFACE_MIXER);
snd_ctl_elem_value_set_name(iv->val,elem_name);
snd_ctl_elem_read(ctl,iv->val);
for(i=0;i<snd_ctl_elem_info_get_items(iv->info);i++)
{
snd_ctl_elem_info_set_item(iv->info, i);
snd_ctl_elem_info(ctl,iv->info);
r=gtk_radio_button_new_with_label(group,snd_ctl_elem_info_get_item_name(iv->info));
group=gtk_radio_button_group(GTK_RADIO_BUTTON(r));
gtk_signal_connect(GTK_OBJECT(r),"toggled",GTK_SIGNAL_FUNC(elem_radio_toggled),(gpointer)iv);
r=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(r),
snd_ctl_elem_info_get_item_name(iv->info));
g_signal_connect(r,"toggled",G_CALLBACK(elem_radio_toggled),(gpointer)iv);
if(i==snd_ctl_elem_value_get_integer(iv->val,0))
active=r;
gtk_box_pack_start(GTK_BOX(box),r,TRUE,FALSE,0);