All of lore.kernel.org
 help / color / mirror / Atom feed
* Envy24control s/pdif input bugfix
@ 2007-09-23 14:20 Stephan Zaubzer
  2007-09-23 14:30 ` Stephan Zaubzer
  0 siblings, 1 reply; 5+ messages in thread
From: Stephan Zaubzer @ 2007-09-23 14:20 UTC (permalink / raw)
  To: alsa-devel

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: Envy24control s/pdif input bugfix
  2007-09-23 14:20 Envy24control s/pdif input bugfix Stephan Zaubzer
@ 2007-09-23 14:30 ` Stephan Zaubzer
  2007-09-23 22:06   ` Alan Horstmann
  0 siblings, 1 reply; 5+ messages in thread
From: Stephan Zaubzer @ 2007-09-23 14:30 UTC (permalink / raw)
  To: alsa-devel

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
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: Envy24control s/pdif input bugfix
  2007-09-23 14:30 ` Stephan Zaubzer
@ 2007-09-23 22:06   ` Alan Horstmann
  2007-09-24 10:07     ` Alan Horstmann
  0 siblings, 1 reply; 5+ messages in thread
From: Alan Horstmann @ 2007-09-23 22:06 UTC (permalink / raw)
  To: ALSA devel; +Cc: Stephan Zaubzer

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.

Alan

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: Envy24control s/pdif input bugfix
  2007-09-23 22:06   ` Alan Horstmann
@ 2007-09-24 10:07     ` Alan Horstmann
  2007-10-09 10:31       ` Takashi Iwai
  0 siblings, 1 reply; 5+ messages in thread
From: Alan Horstmann @ 2007-09-24 10:07 UTC (permalink / raw)
  To: ALSA devel; +Cc: Takashi Iwai, Stephan Zaubzer

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.

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.

Alan

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: Envy24control s/pdif input bugfix
  2007-09-24 10:07     ` Alan Horstmann
@ 2007-10-09 10:31       ` Takashi Iwai
  0 siblings, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2007-10-09 10:31 UTC (permalink / raw)
  To: Alan Horstmann; +Cc: ALSA devel, Stephan Zaubzer

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2007-10-09 10:31 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-23 14:20 Envy24control s/pdif input bugfix Stephan Zaubzer
2007-09-23 14:30 ` Stephan Zaubzer
2007-09-23 22:06   ` Alan Horstmann
2007-09-24 10:07     ` Alan Horstmann
2007-10-09 10:31       ` Takashi Iwai

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.