[pulseaudio-discuss] unused check_required function in modules/alsa/alsa-mixer.c

[Colin Guthrie]

'Twas brillig, and David Henningsson at 04/03/11 00:05 did gyre and gimble:
> On 2011-03-03 17:54, Maarten Bosmans wrote:
>> I intended to catch diwic on IRC, but didn't see him the last couple
>> of days, so in order not to forget, here is my question to the list.
>>
>> In this commit some stuff got shuffled around in alsa-mixer
>> http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff;h=b0f72311
>> With the result that the check_required function is now unused (or
>> more precise: only used by itself). This is probably incorrect.
>>
>> David, can you explain/fix?
> 
> Hmm, in my patch as posted months ago, the call to check_required was
> moved inside the element_probe function only, not moved from
> element_probe to check_required. Colin, can anything have gone wrong
> when you merged it?
> 

Hmmm, interesting.

Looking at the upstream commit and the patch file, I have to concur that
yes, something messed up in the application of that patch...

I think it should be fixed by:
 http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff;h=f4a2a8ebf
Can you confirm? I had a look through to see if any other bits had been
misapplied but couldn't see any.


I don't remember that patch (0002) failing git am. The patch after
(0003) did fail, which I mentioned in my reply.

What is more worrying (as I've just replayed what I did), it's
reproducable :s

[colin at jimmy pulseaudio (master)]$ git checkout -b misapply
0ce3017b7407ab1c4094f7ce271bb68319a7eba7
[colin at jimmy pulseaudio (misapply)]$ git am
0002-alsa-mixer-add-required-any-and-required-for-enum-op.patch

Have a look and notice it's been misapplied :s

[colin at jimmy pulseaudio (misapply)]$ git --version
git version 1.7.4.1


Can anyone else spot something dumb on my part before I report this
upstream? It could be a very serious problem.....


Col

PS reattached David's patch for convenience.

-- 

Colin Guthrie
gmane(at)colin.guthr.ie
http://colin.guthr.ie/

Day Job:
  Tribalogic Limited [http://www.tribalogic.net/]
Open Source:
  Mageia Contributor [http://www.mageia.org/]
  PulseAudio Hacker [http://www.pulseaudio.org/]
  Trac Hacker [http://trac.edgewall.org/]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-alsa-mixer-add-required-any-and-required-for-enum-op.patch
Type: text/x-patch
Size: 11153 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/pulseaudio-discuss/attachments/20110304/451dc7fb/attachment.bin>