[alsa-devel] Envy24control s/pdif input bugfix

[Takashi Iwai]

At Mon, 24 Sep 2007 11:07:55 +0100,
Alan Horstmann wrote:
> 
> On Sunday 23 September 2007 23:06, Alan Horstmann wrote:
> > On Sunday 23 September 2007 15:30, Stephan Zaubzer wrote:
> > > Sorry, used diff the wrong way!
> > > Here the correct patch:
> > >
> > > diff -ubr alsa-tools-1.0.14/envy24control/hardware.c
> > > alsa-tools-1.0.14patch/envy24control/hardware.c ---
> > > alsa-tools-1.0.14/envy24control/hardware.c  2007-06-04 13:27:25.000000000
> > > +0200 +++ alsa-tools-1.0.14patch/envy24control/hardware.c     2007-09-23
> > > 15:58:53.000000000 +0200 @@ -775,7 +775,7 @@
> > >          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_is_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 {
> > >
> > > Regards Stephan
> > >
> > > Stephan Zaubzer wrote:
> > > > Hi!
> > > > This patch against the stable version of envy24control fixes a bug
> > > > where the S/Pdif input switch doesn't work on Terratec DMX 6fire cards.
> > > > This bug first appeared in  version 1.0.11rc3.
> > > >
> > > > diff -ubr alsa-tools-1.0.14patch/envy24control/hardware.c
> > > > alsa-tools-1.0.14/envy24control/hardware.c
> > > > --- alsa-tools-1.0.14patch/envy24control/hardware.c     2007-09-23
> > > > 15:58:53.000000000 +0200
> > > > +++ alsa-tools-1.0.14/envy24control/hardware.c  2007-06-04
> > > > 13:27:25.000000000 +0200
> > > > @@ -775,7 +775,7 @@
> > > >          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_is_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 {
> > > >
> > > >
> > > > Regards
> > > > Stephan
> >
> > I think that's a typo in my original patch -oops!  Will confirm ASAP.
> 
> Actually, it is not from my patch - I added 'card_is_dmx6fire' to 
> envy24control.c.  It was later extended to hardware.c by another:
> 
> http://hg-mirror.alsa-project.org/alsa-tools/rev/48406c03292e
> 
> Obviously a typo though.

Thanks, now fixed on HG tree.

> Also noticed that, as that patch added the declaration of card_is_dmx6fire to 
> envy24control.h, there is now a redundant declaration in envy24control.c, 
> Line 37.

It's the line to define the variable, not to declare.
So should it be.


Takashi