Comment # 3 on bug 1042644 from Takashi Iwai

I hacked a bit now and it seems fairly easy to integrate.
A lightly tested patch is attached below.