asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-09-20 01:59:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.flameeyes.eu/others/alsa/alsa-utils

Browse source
This commit is contained in:
Takashi Iwai 2008-11-13 14:30:01 +01:00
commit 94ae24cfd6
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
alsaconf/alsaconf.in
View file

@ -908,13 +908,12 @@ BEGIN { in_sound=0; }
farewell farewell
clear clear
if [ "$distribution" = "gentoo" ]; then case "$distribution" in
xecho "Running modules-update..." gentoo | debian)
modules-update xecho "Running update-modules..."
elif [ "$distribution" = "debian" ]; then update-modules
xecho "Running update-modules..." ;;
update-modules esac
fi
if [ -x $rcalsasound ] ; then if [ -x $rcalsasound ] ; then
echo Loading driver... echo Loading driver...
$rcalsasound restart $rcalsasound restart
@ -1411,7 +1410,7 @@ if [ x$devs_found != x ]; then
Following card(s) are found on your system. Following card(s) are found on your system.
Choose a soundcard to configure: Choose a soundcard to configure:
") ")
$DIALOG --title "$title" --menu "$msg" 17 76 8 "${devs_found[@]}" 2> $FOUND || acex 0 $DIALOG --title "$title" --menu "$msg" 17 76 8 "${devs_found[@]}" --output-fd 3 3> $FOUND || acex 0
card=`head -n 1 $FOUND` card=`head -n 1 $FOUND`
if [ "$card" = "legacy" ]; then if [ "$card" = "legacy" ]; then
ac_config_legacy ac_config_legacy

7
speaker-test/speaker-test.c
View file

@ -44,9 +44,6 @@
#include <getopt.h> #include <getopt.h>
#include <inttypes.h> #include <inttypes.h>
#include <ctype.h> #include <ctype.h>
#ifdef ENABLE_NLS
#include <locale.h>
#endif
#include <byteswap.h> #include <byteswap.h>
#define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_HW_PARAMS_API
@ -59,6 +56,10 @@
#include "gettext.h" #include "gettext.h"
#include "version.h" #include "version.h"
#ifdef ENABLE_NLS
#include <locale.h>
#endif
enum { enum {
TEST_PINK_NOISE = 1, TEST_PINK_NOISE = 1,
TEST_SINE, TEST_SINE,