71 lines
3.0 KiB
Diff
71 lines
3.0 KiB
Diff
--- alsa-utils-1.0.14/alsaconf/alsaconf.in~ 2007-05-31 11:07:21.000000000 +0300
|
|
+++ alsa-utils-1.0.14/alsaconf/alsaconf.in 2007-08-26 22:40:21.000000000 +0300
|
|
@@ -938,8 +938,8 @@ If you have a big amplifier, lower your
|
|
aplay -N $TESTSOUND
|
|
fi
|
|
fi
|
|
- if [ ! -r /etc/asound.state ]; then
|
|
- xecho "Saving the mixer setup used for this in /etc/asound.state."
|
|
+ if [ ! -r /etc/alsa/asound.state ]; then
|
|
+ xecho "Saving the mixer setup used for this in /etc/alsa/asound.state."
|
|
$sbindir/alsactl store
|
|
fi
|
|
clear
|
|
--- alsa-utils-1.0.14/alsaconf/po/ja.po~ 2007-05-31 11:07:21.000000000 +0300
|
|
+++ alsa-utils-1.0.14/alsaconf/po/ja.po 2007-08-26 22:40:43.000000000 +0300
|
|
@@ -203,8 +203,8 @@ msgstr ""
|
|
" テスト音が聞こえるかどうか確認してください。\n"
|
|
|
|
#: ../alsaconf.in:932
|
|
-msgid "Saving the mixer setup used for this in /etc/asound.state."
|
|
-msgstr "ミキサーの設定を /etc/asound.state に保存します"
|
|
+msgid "Saving the mixer setup used for this in /etc/alsa/asound.state."
|
|
+msgstr "ミキサーの設定を /etc/alsa/asound.state に保存します"
|
|
|
|
#: ../alsaconf.in:936
|
|
msgid ""
|
|
--- alsa-utils-1.0.14/alsaconf/po/ru.po~ 2007-05-31 11:07:21.000000000 +0300
|
|
+++ alsa-utils-1.0.14/alsaconf/po/ru.po 2007-08-26 22:40:34.000000000 +0300
|
|
@@ -211,8 +211,8 @@ msgstr ""
|
|
" и удостоверьтесь что вы слышите тестовый пример.\n"
|
|
|
|
#: ../alsaconf.in:932
|
|
-msgid "Saving the mixer setup used for this in /etc/asound.state."
|
|
-msgstr "Сохраняем настройки микшера в /etc/asound.state."
|
|
+msgid "Saving the mixer setup used for this in /etc/alsa/asound.state."
|
|
+msgstr "Сохраняем настройки микшера в /etc/alsa/asound.state."
|
|
|
|
#: ../alsaconf.in:936
|
|
msgid ""
|
|
--- alsa-utils-1.0.14/alsactl/alsactl.1~ 2007-05-31 11:07:21.000000000 +0300
|
|
+++ alsa-utils-1.0.14/alsactl/alsactl.1 2007-08-26 22:40:03.000000000 +0300
|
|
@@ -35,7 +35,7 @@ Help: show available flags and commands.
|
|
|
|
.TP
|
|
\fI\-f, \-\-file\fP
|
|
-Select the configuration file to use. The default is /etc/asound.state or
|
|
+Select the configuration file to use. The default is /etc/alsa/asound.state or
|
|
/etc/asound.names (for the \fInames\fP command).
|
|
|
|
.TP
|
|
@@ -52,7 +52,7 @@ Use debug mode: a bit more verbose.
|
|
Print alsactl version number.
|
|
|
|
.SH FILES
|
|
-\fI/etc/asound.state\fP (or whatever file you specify with the
|
|
+\fI/etc/alsa/asound.state\fP (or whatever file you specify with the
|
|
\fB\-f\fP flag) is used to store current settings for your
|
|
soundcards. The settings include all the usual soundcard mixer
|
|
settings. More importantly, alsactl is
|
|
--- alsa-utils-1.0.14/alsactl/alsactl.c~ 2007-05-31 11:07:21.000000000 +0300
|
|
+++ alsa-utils-1.0.14/alsactl/alsactl.c 2007-08-26 22:40:10.000000000 +0300
|
|
@@ -30,7 +30,7 @@
|
|
#include <alsa/asoundlib.h>
|
|
#include "alsactl.h"
|
|
|
|
-#define SYS_ASOUNDRC "/etc/asound.state"
|
|
+#define SYS_ASOUNDRC "/etc/alsa/asound.state"
|
|
#define SYS_ASOUNDNAMES "/etc/asound.names"
|
|
|
|
int debugflag = 0;
|