mirrors/alsa-tools
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-tools.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix envy24control digital input on Terratec DMX6fire

Browse source 
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 <gineera@aspect135.co.uk>
This commit is contained in:
Alan Horstmann 2005-11-25 11:52:40 +00:00 • committed by Takashi Iwai
parent 93a6b69818
commit 6b1cf9b7d1
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
envy24control/envy24control.c
View file

@ -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);

6
envy24control/hardware.c
View file

@ -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));
}