From 6b1cf9b7d1a519d7b98f6936a9d441eb84d78623 Mon Sep 17 00:00:00 2001 From: Alan Horstmann Date: Fri, 25 Nov 2005 11:52:40 +0000 Subject: [PATCH] Fix envy24control digital input on Terratec DMX6fire This patch fixes typo in hardware.c that prevented front digital inputs being selected on the Terratec DMX6fire. Also renames the digital input controls for greater clarity with this card. Signed-off-by: Alan Horstmann --- envy24control/envy24control.c | 8 ++++---- envy24control/hardware.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/envy24control/envy24control.c b/envy24control/envy24control.c index 1aaf982..3728634 100644 --- a/envy24control/envy24control.c +++ b/envy24control/envy24control.c @@ -1165,7 +1165,7 @@ static void create_spdif_input_select(GtkWidget *box) if((card_eeprom.subvendor == ICE1712_SUBDEVICE_DELTADIO2496) || (card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE)) hide = 0; - frame = gtk_frame_new("S/PDIF Input"); + frame = gtk_frame_new("Digital Input"); gtk_widget_show(frame); gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(frame), 6); @@ -1208,7 +1208,7 @@ static void create_spdif_on_off(GtkWidget *box) if( card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) hide = 0; - frame = gtk_frame_new("S/PDIF On/Off"); + frame = gtk_frame_new("Digital Select"); gtk_widget_show(frame); gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(frame), 6); @@ -1218,7 +1218,7 @@ static void create_spdif_on_off(GtkWidget *box) gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); - radiobutton = gtk_radio_button_new_with_label(group, "On"); + radiobutton = gtk_radio_button_new_with_label(group, "Front Digital"); hw_spdif_switch_on_radio = radiobutton; group = gtk_radio_button_group(GTK_RADIO_BUTTON(radiobutton)); gtk_widget_show(radiobutton); @@ -1227,7 +1227,7 @@ static void create_spdif_on_off(GtkWidget *box) (GtkSignalFunc)spdif_on_off_toggled, (gpointer)"On"); - radiobutton = gtk_radio_button_new_with_label(group, "Off"); + radiobutton = gtk_radio_button_new_with_label(group, "Internal CD"); hw_spdif_switch_off_radio = radiobutton; group = gtk_radio_button_group(GTK_RADIO_BUTTON(radiobutton)); gtk_widget_show(radiobutton); diff --git a/envy24control/hardware.c b/envy24control/hardware.c index 521c337..6b6d3a2 100644 --- a/envy24control/hardware.c +++ b/envy24control/hardware.c @@ -734,10 +734,10 @@ void spdif_on_off_toggled(GtkWidget *togglebutton, gpointer data) if (!is_active(togglebutton)) return; if (!strcmp(str, "On")) - snd_ctl_elem_value_set_boolean(spdif_input, 0, 1); + snd_ctl_elem_value_set_boolean(spdif_on_off, 0, 1); else - snd_ctl_elem_value_set_boolean(spdif_input, 0, 0); - if ((err = snd_ctl_elem_write(ctl, spdif_input)) < 0) + snd_ctl_elem_value_set_boolean(spdif_on_off, 0, 0); + if ((err = snd_ctl_elem_write(ctl, spdif_on_off)) < 0) g_print("Unable to write S/PDIF on/off switch: %s\n", snd_strerror(err)); } -- 2.47.1