diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-13 14:30:01 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-13 14:30:01 +0100 |
| commit | 94ae24cfd6f34122d1943ed442dc1c0e79647ca8 (patch) | |
| tree | d83dca73cf970f37d4a986754f76159a0052576b | |
| parent | 88ff7791df690eb2e94f8a4b20a07c29b3da354c (diff) | |
| parent | 2c79b79b4780cae2192ecfc4ba5615d6b0d13f5b (diff) | |
| download | alsa-utils-94ae24cfd6f34122d1943ed442dc1c0e79647ca8.tar.gz | |
Merge branch 'master' of git://git.flameeyes.eu/others/alsa/alsa-utils
| -rw-r--r-- | alsaconf/alsaconf.in | 15 | ||||
| -rw-r--r-- | speaker-test/speaker-test.c | 7 |
2 files changed, 11 insertions, 11 deletions
diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in index 47d6da5..6e9ff75 100644 --- a/alsaconf/alsaconf.in +++ b/alsaconf/alsaconf.in @@ -908,13 +908,12 @@ BEGIN { in_sound=0; } farewell clear - if [ "$distribution" = "gentoo" ]; then - xecho "Running modules-update..." - modules-update - elif [ "$distribution" = "debian" ]; then - xecho "Running update-modules..." - update-modules - fi + case "$distribution" in + gentoo | debian) + xecho "Running update-modules..." + update-modules + ;; + esac if [ -x $rcalsasound ] ; then echo Loading driver... $rcalsasound restart @@ -1411,7 +1410,7 @@ if [ x$devs_found != x ]; then Following card(s) are found on your system. 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` if [ "$card" = "legacy" ]; then ac_config_legacy diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c index 57a7cbc..b8cd5c8 100644 --- a/speaker-test/speaker-test.c +++ b/speaker-test/speaker-test.c @@ -44,9 +44,6 @@ #include <getopt.h> #include <inttypes.h> #include <ctype.h> -#ifdef ENABLE_NLS -#include <locale.h> -#endif #include <byteswap.h> #define ALSA_PCM_NEW_HW_PARAMS_API @@ -59,6 +56,10 @@ #include "gettext.h" #include "version.h" +#ifdef ENABLE_NLS +#include <locale.h> +#endif + enum { TEST_PINK_NOISE = 1, TEST_SINE, |