From 547c373a47db208f49c36d16e711ebaad0f947be Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 2 Jan 2006 16:13:06 +0000 Subject: [PATCH] envy24control - Fix/clean up checks of DMX 6fire Fix/clean up checks of DMX 6fire. --- envy24control/envy24control.h | 4 ++++ envy24control/hardware.c | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/envy24control/envy24control.h b/envy24control/envy24control.h index 810a5ee..be7231a 100644 --- a/envy24control/envy24control.h +++ b/envy24control/envy24control.h @@ -165,6 +165,9 @@ extern GtkLabel *av_ipga_volume_label[]; extern GtkWidget *av_dac_sense_radio[][4]; extern GtkWidget *av_adc_sense_radio[][4]; +/* flags */ +extern int card_is_dmx6fire; + gint level_meters_configure_event(GtkWidget *widget, GdkEventConfigure *event); gint level_meters_expose_event(GtkWidget *widget, GdkEventExpose *event); gint level_meters_timeout_callback(gpointer data); @@ -243,3 +246,4 @@ void adc_sense_toggled(GtkWidget *togglebutton, gpointer data); void control_input_callback(gpointer data, gint source, GdkInputCondition condition); void mixer_input_callback(gpointer data, gint source, GdkInputCondition condition); + diff --git a/envy24control/hardware.c b/envy24control/hardware.c index 8f8a5a6..fd2a956 100644 --- a/envy24control/hardware.c +++ b/envy24control/hardware.c @@ -608,13 +608,14 @@ void spdif_input_update(void) int digoptical = FALSE; int diginternal = FALSE; - if ((card_eeprom.subvendor != ICE1712_SUBDEVICE_DELTADIO2496) && (card_eeprom.subvendor != ICE1712_SUBDEVICE_DMX6FIRE)) + if ((card_eeprom.subvendor != ICE1712_SUBDEVICE_DELTADIO2496) && + ! card_is_dmx6fire) return; if ((err = snd_ctl_elem_read(ctl, spdif_input)) < 0) g_print("Unable to read S/PDIF input switch: %s\n", snd_strerror(err)); if (snd_ctl_elem_value_get_boolean(spdif_input, 0)) digoptical = TRUE; - if (card_eeprom.subvendor = ICE1712_SUBDEVICE_DMX6FIRE) { + if (card_is_dmx6fire) { if ((err = snd_ctl_elem_read(ctl, spdif_on_off)) < 0) g_print("Unable to read S/PDIF on/off switch: %s\n", snd_strerror(err)); if (!(snd_ctl_elem_value_get_boolean(spdif_on_off, 0))) @@ -656,7 +657,7 @@ void analog_input_select_update(void) { int err, input_interface; - if (card_eeprom.subvendor != ICE1712_SUBDEVICE_DMX6FIRE) + if (! card_is_dmx6fire) return; if ((err = snd_ctl_elem_read(ctl, analog_input_select)) < 0) g_print("Unable to read analog input switch: %s\n", snd_strerror(err)); @@ -711,7 +712,7 @@ void phono_input_update(void) { int err; - if (card_eeprom.subvendor != ICE1712_SUBDEVICE_DMX6FIRE) + if (! card_is_dmx6fire) return; if ((err = snd_ctl_elem_read(ctl, phono_input)) < 0) g_print("Unable to read phono input switch: %s\n", snd_strerror(err)); @@ -773,12 +774,12 @@ void hardware_init(void) snd_ctl_elem_value_set_interface(volume_rate, SND_CTL_ELEM_IFACE_MIXER); snd_ctl_elem_value_set_name(volume_rate, "Multi Track Volume Rate"); - if(card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE){ + if (! card_is_dmx6fire) { snd_ctl_elem_value_set_interface(spdif_input, SND_CTL_ELEM_IFACE_MIXER); snd_ctl_elem_value_set_name(spdif_input, "Optical Digital Input Switch"); } else { - snd_ctl_elem_value_set_interface(spdif_input, SND_CTL_ELEM_IFACE_MIXER); - snd_ctl_elem_value_set_name(spdif_input, "IEC958 Input Optical"); + snd_ctl_elem_value_set_interface(spdif_input, SND_CTL_ELEM_IFACE_MIXER); + snd_ctl_elem_value_set_name(spdif_input, "IEC958 Input Optical"); } snd_ctl_elem_value_set_interface(spdif_output, SND_CTL_ELEM_IFACE_PCM); -- 2.47.1