pool/alsa
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 65299 from multimedia:libs

Browse Source 
Accepted submit request 65299 from user coolo

OBS-URL: https://build.opensuse.org/request/show/65299
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa?expand=0&rev=99
This commit is contained in:
Sascha Peilicke 2011-03-30 07:20:17 +00:00 committed by Git OBS Bridge
commit b3123703ba
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alsa-init.sh
View File

@ -2,7 +2,7 @@
# alsa-init card# # alsa-init card#
/usr/bin/set_default_volume -f $1 >/dev/null 2>&1 /usr/bin/set_default_volume -f $1 >/dev/null 2>&1
test -s /etc/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1 test -s /var/lib/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1
# increase buffer-preallocation size (for PA) # increase buffer-preallocation size (for PA)
if [ -f /proc/asound/card$1/pcm0p/sub0/prealloc_max ]; then if [ -f /proc/asound/card$1/pcm0p/sub0/prealloc_max ]; then
pmax=$(< /proc/asound/card$1/pcm0p/sub0/prealloc_max) pmax=$(< /proc/asound/card$1/pcm0p/sub0/prealloc_max)

12
alsa.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Mar 25 11:41:18 CET 2011 - tiwai@suse.de
- Fix asound.state path in other scripts, too
- Replace the asound.state path for older distros
-------------------------------------------------------------------
Thu Mar 24 11:27:27 UTC 2011 - werner@suse.de
- Make boot script load modules on boot (bnc#682222)
- Correct location of saved sound state in the boot script (bnc#682222)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 31 17:14:35 CET 2011 - tiwai@suse.de Mon Jan 31 17:14:35 CET 2011 - tiwai@suse.de

7
alsa.spec
View File

@ -166,6 +166,10 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_sbindir}
install -c -m 0755 %{SOURCE16} $RPM_BUILD_ROOT%{_bindir} install -c -m 0755 %{SOURCE16} $RPM_BUILD_ROOT%{_bindir}
install -c -m 0755 %{SOURCE34} $RPM_BUILD_ROOT%{_sbindir}/alsa-init install -c -m 0755 %{SOURCE34} $RPM_BUILD_ROOT%{_sbindir}/alsa-init
%if %suse_version < 1140
sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_bindir}/set_default_volume
sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_sbindir}/alsa-init
%endif
# install test wave file # install test wave file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/sounds/alsa mkdir -p $RPM_BUILD_ROOT%{_datadir}/sounds/alsa
install -c -m 0644 %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/sounds/alsa/test.wav install -c -m 0644 %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/sounds/alsa/test.wav
@ -180,6 +184,9 @@ install -c -m 0644 %{SOURCE32} $RPM_BUILD_ROOT/usr/lib
mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/etc/init.d
install -c -m 0755 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d install -c -m 0755 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d
install -c -m 0755 %{SOURCE13} $RPM_BUILD_ROOT/etc/init.d install -c -m 0755 %{SOURCE13} $RPM_BUILD_ROOT/etc/init.d
%if %suse_version < 1140
sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT/etc/init.d/alsasound
%endif
rm -f $RPM_BUILD_ROOT%{_sbindir}/rcalsasound rm -f $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
ln -s ../../etc/init.d/alsasound $RPM_BUILD_ROOT%{_sbindir}/rcalsasound ln -s ../../etc/init.d/alsasound $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
rm -f $RPM_BUILD_ROOT%{_sbindir}/rcjoystick rm -f $RPM_BUILD_ROOT%{_sbindir}/rcjoystick

8
alsasound
View File

@ -58,7 +58,7 @@
rc_reset rc_reset
alsactl=/usr/sbin/alsactl alsactl=/usr/sbin/alsactl
asoundcfg=/etc/asound.state asoundcfg=/var/lib/asound.state
aconnect=/usr/bin/aconnect aconnect=/usr/bin/aconnect
# #
@ -78,7 +78,7 @@ load_sequencer() {
get_drivers() { get_drivers() {
/sbin/modprobe -c | \ /sbin/modprobe -c | \
grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | sort | \ grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | sort -u | \
while read a b card; do while read a b card; do
echo $card echo $card
done done
@ -188,8 +188,8 @@ stop_all() {
# See how we were called. # See how we were called.
case "$1" in case "$1" in
start) start)
if [ "$PREVLEVEL" = "N" ]; then if test "$PREVLEVEL" = "N" -a -d /proc/asound ; then
test -d /proc/asound && start_rest start_rest
else else
start_all start_all
fi fi

2
set_default_volume
View File

@ -7,7 +7,7 @@
# written by Takashi Iwai <tiwai@suse.de> # written by Takashi Iwai <tiwai@suse.de>
# #
if [ -f /etc/asound.state -a x$1 != x-f ]; then if [ -f /var/lib/asound.state -a x$1 != x-f ]; then
/usr/sbin/alsactl restore >/dev/null 2>&1 /usr/sbin/alsactl restore >/dev/null 2>&1
exit 0 exit 0
fi fi