Revert "sound: workaround softvol channels initialization by running dummy aplay and arecord"

Reported to hang boot on a DELL Optiplex 755 with:

00:1b.0 Audio device: Intel Corporation 82801I (ICH9 Family) HD Audio Controller (rev 02)
	Subsystem: Dell Optiplex 755

Codec: Analog Devices AD1984
Address: 0
AFG Function Id: 0x1 (unsol 0)
Vendor Id: 0x11d41984
Subsystem Id: 0x10280211
Revision Id: 0x100400

A recent patch to libalsa should be the upstream solution to the KWin crash problem this patch was intended to fix.

This reverts commit 30e0db1d2c.
This commit is contained in:
Silvan Calarco 2012-07-24 11:53:35 +02:00
parent 1f22c78861
commit 74bdfeb5dd

View File

@ -93,11 +93,7 @@ if [ "$SOUND_FORCE_RESCAN" != "on" -a "$SOUND_FORCE_RESCAN" != "1" ]; then
fi fi
fi fi
# WORKAROUND: custom softvol controls are not actived until a play/rec is done echo "$SOUND_DEV" > $postpluglibdir/sound.cache
# this also triggers kmix crash problem at first boot
aplay -q -d1 < /dev/zero
arecord -q -d1 > /dev/null
for c in /proc/asound/card[0-9]*; do for c in /proc/asound/card[0-9]*; do
id=`cat $c/id` id=`cat $c/id`
codec=`grep Codec: $c/codec* 2>/dev/null | head -n1` codec=`grep Codec: $c/codec* 2>/dev/null | head -n1`
@ -108,7 +104,9 @@ done
if [ -x /usr/sbin/alsactl ]; then if [ -x /usr/sbin/alsactl ]; then
logmsg "$me" $"saving the mixer setup (/var/lib/sound/asound.state)" logmsg "$me" $"saving the mixer setup (/var/lib/sound/asound.state)"
/usr/sbin/alsactl store > /dev/null /usr/sbin/alsactl store >/dev/null
fi fi
echo "$SOUND_DEV" > $postpluglibdir/sound.cache echo "$SOUND_DEV" > $postpluglibdir/sound.cache
exit 0 exit 0