1 diff -Nur aumix-1.27.4-orig/doc/aumix.1 aumix-1.27.4/doc/aumix.1
2 --- aumix-1.27.4-orig/doc/aumix.1 Wed Nov 24 13:51:36 1999
3 +++ aumix-1.27.4/doc/aumix.1 Sat Nov 27 18:59:03 1999
6 go into interactive mode after doing things non-interactively.
8 -load settings from $HOME/.aumixrc, or /etc/aumixrc if the former is inaccessible
9 +load settings from $HOME/etc/aumixrc, $HOME/.aumixrc, or /etc/aumixrc if the former are inaccessible
11 query all devices and print their settings
13 -save settings to $HOME/.aumixrc
14 +save settings to $HOME/etc/aumixrc
20 show a description of the functions of keys
22 -load settings from $HOME/.aumixrc, falling back to /etc/aumixrc
23 +load settings from $HOME/.aumixrc or $HOME/etc/aumixrc, falling back to /etc/aumixrc
31 -Saved settings for the mixer are kept in the /etc/aumixrc and $HOME/.aumixrc files, but can be kept anywhere if specified explicitly. Color schemes are normally kept in the directory given by DATADIRNAME at compilation time, but are preferentially loaded from the current directory and can be kept anywhere so long as the path to them is specified. The format of these files is:
32 +Saved settings for the mixer are kept in the /etc/aumixrc and $HOME/etc/aumixrc files ($HOME/.aumixrc is now obsolete, but still works), but can be kept anywhere if specified explicitly. Color schemes are normally kept in the directory given by DATADIRNAME at compilation time, but are preferentially loaded from the current directory and can be kept anywhere so long as the path to them is specified. The format of these files is:
34 item foreground background
36 diff -Nur aumix-1.27.4-orig/po/aumix.pot aumix-1.27.4/po/aumix.pot
37 --- aumix-1.27.4-orig/po/aumix.pot Wed Nov 24 13:52:05 1999
38 +++ aumix-1.27.4/po/aumix.pot Sat Nov 27 19:07:58 1999
41 " d: adjust a device besides /dev/mixer\n"
42 " f: specify file for saving and loading settings (defaults to\n"
43 -" ~ /.aumixrc or /etc/aumixrc)\n"
44 +" ~/etc/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
45 " C: specify color scheme\n"
46 " h: this helpful message\n"
48 Binary files aumix-1.27.4-orig/po/de.gmo and aumix-1.27.4/po/de.gmo differ
49 diff -Nur aumix-1.27.4-orig/po/de.po aumix-1.27.4/po/de.po
50 --- aumix-1.27.4-orig/po/de.po Sat Nov 13 11:02:53 1999
51 +++ aumix-1.27.4/po/de.po Sat Nov 27 19:00:43 1999
54 " d: adjust a device besides /dev/mixer\n"
55 " f: specify file for saving and loading settings (defaults to\n"
56 -" ~ /.aumixrc or /etc/aumixrc)\n"
57 +" ~/etc/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
58 " C: specify color scheme\n"
59 " h: this helpful message\n"
63 " d: Anderes Gerät als /dev/mixer benutzen\n"
64 " f: spezifizieren Sie Datei für Einsparung- und Ladeneinstellungen\n"
65 -" (Rückstellungen zum ~ /.aumixrc or /etc/aumixrc)\n"
66 +" (Rückstellungen zum ~/etc/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
67 " h: Diese nützlichen Informationen\n"
70 Binary files aumix-1.27.4-orig/po/es.gmo and aumix-1.27.4/po/es.gmo differ
71 diff -Nur aumix-1.27.4-orig/po/es.po aumix-1.27.4/po/es.po
72 --- aumix-1.27.4-orig/po/es.po Sat Nov 13 11:02:53 1999
73 +++ aumix-1.27.4/po/es.po Sat Nov 27 19:01:09 1999
76 " d: adjust a device besides /dev/mixer\n"
77 " f: specify file for saving and loading settings (defaults to\n"
78 -" ~ /.aumixrc or /etc/aumixrc)\n"
79 +" ~/etc/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
80 " C: specify color scheme\n"
81 " h: this helpful message\n"
85 " d: ajustar dispositivos además de /dev/mixer\n"
86 " f: indicar el fichero para guardar y cargar las preferencias (por\n"
87 -" defecto es ~/.aumixrc o /etc/aumixrc\n"
88 +" defecto es ~/etc/aumixrc, ~/.aumixrc o /etc/aumixrc\n"
89 " C: indicar el esquema de color\n"
90 " h: este mensaje de ayuda\n"
92 Binary files aumix-1.27.4-orig/po/gl.gmo and aumix-1.27.4/po/gl.gmo differ
93 diff -Nur aumix-1.27.4-orig/po/gl.po aumix-1.27.4/po/gl.po
94 --- aumix-1.27.4-orig/po/gl.po Sat Nov 13 11:02:53 1999
95 +++ aumix-1.27.4/po/gl.po Sat Nov 27 19:07:46 1999
98 " d: adjust a device besides /dev/mixer\n"
99 " f: specify file for saving and loading settings (defaults to\n"
100 -" ~ /.aumixrc or /etc/aumixrc)\n"
101 +" ~/etc/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
102 " C: specify color scheme\n"
103 " h: this helpful message\n"
107 " d: axustar outro dispositivo que non sexa /dev/mixer\n"
108 " f: especificar ficheiro para gardar e cargar parámetros (por omisión é\n"
109 -" ~/.aumixrc ou /etc/aumixrc)\n"
110 +" ~/etc/aumixrc, ~/.aumixrc ou /etc/aumixrc)\n"
111 " C: especifica-lo esquema de cor\n"
112 " h: amosar esta mensaxe de axuda\n"
114 Binary files aumix-1.27.4-orig/po/pl.gmo and aumix-1.27.4/po/pl.gmo differ
115 diff -Nur aumix-1.27.4-orig/po/pl.po aumix-1.27.4/po/pl.po
116 --- aumix-1.27.4-orig/po/pl.po Sat Nov 13 11:02:53 1999
117 +++ aumix-1.27.4/po/pl.po Sat Nov 27 19:00:09 1999
120 " d: adjust a device besides /dev/mixer\n"
121 " f: specify file for saving and loading settings (defaults to\n"
122 -" ~ /.aumixrc or /etc/aumixrc)\n"
123 +" ~/etc/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
124 " C: specify color scheme\n"
125 " h: this helpful message\n"
129 " d: dostosowuje urz±dzenie inne ni¿ /dev/mixer\n"
130 " f: okre¶la plik do zapisywania i ³adowania ustawieñ (domy¶lnie jest to\n"
131 -" ~ /.aumixrc lub /etc/aumixrc)\n"
132 +" ~/etc/aumixrc, ~/.aumixrc lub /etc/aumixrc)\n"
133 " C: okre¶la plik zawieraj±cy schemat u¿ycia kolorów\n"
134 " h: ta pomocna informacja\n"
136 Binary files aumix-1.27.4-orig/po/pt_BR.gmo and aumix-1.27.4/po/pt_BR.gmo differ
137 diff -Nur aumix-1.27.4-orig/po/pt_BR.po aumix-1.27.4/po/pt_BR.po
138 --- aumix-1.27.4-orig/po/pt_BR.po Sat Nov 13 11:02:54 1999
139 +++ aumix-1.27.4/po/pt_BR.po Sat Nov 27 19:01:53 1999
142 " d: adjust a device besides /dev/mixer\n"
143 " f: specify file for saving and loading settings (defaults to\n"
144 -" ~ /.aumixrc or /etc/aumixrc)\n"
145 +" ~/etc/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
146 " C: specify color scheme\n"
147 " h: this helpful message\n"
151 " d: usar outro dispositivo que não o /dev/mixer\n"
152 " f: SPECIFY FILE FOR SAVING AND LOADING SETTINGS (DEFAULTS TO\n"
153 -" ~ /.aumixrc or /etc/aumixrc)\n"
154 +" ~/etc/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
155 " C: SPECIFY COLOR SCHEME\n"
156 " h: esta mensagem de ajuda\n"
158 Binary files aumix-1.27.4-orig/po/ru.gmo and aumix-1.27.4/po/ru.gmo differ
159 diff -Nur aumix-1.27.4-orig/po/ru.po aumix-1.27.4/po/ru.po
160 --- aumix-1.27.4-orig/po/ru.po Sat Nov 13 11:02:54 1999
161 +++ aumix-1.27.4/po/ru.po Sat Nov 27 19:02:27 1999
164 " d: adjust a device besides /dev/mixer\n"
165 " f: specify file for saving and loading settings (defaults to\n"
166 -" ~ /.aumixrc or /etc/aumixrc)\n"
167 +" ~/etc/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
168 " C: specify color scheme\n"
169 " h: this helpful message\n"
173 " d: ÒÅÇÕÌÉÒÏ×ÁÔØ ÕÓÔÒÏÊÓÔ×Á ËÒÏÍÅ /dev/mixer É /dev/sound/mixer\n"
174 " f: ÕËÁÚÁÎÉÅ ÉÍÅÎÉ ÆÁÊÌÁ ÄÌÑ ÈÒÁÎÅÎÉÑ ÕÓÔÁÎÏ×ÏË (ÐÏ ÕÍÏÌÞÁÎÉÀ\n"
175 -" ~ /.aumixrc ÉÌÉ /etc/aumixrc)\n"
176 +" ~/etc/aumixrc, ~/.aumixrc ÉÌÉ /etc/aumixrc)\n"
177 " C: SPECIFY COLOR SCHEME\n"
180 Binary files aumix-1.27.4-orig/po/uk.gmo and aumix-1.27.4/po/uk.gmo differ
181 diff -Nur aumix-1.27.4-orig/po/uk.po aumix-1.27.4/po/uk.po
182 --- aumix-1.27.4-orig/po/uk.po Sat Nov 20 07:59:46 1999
183 +++ aumix-1.27.4/po/uk.po Sat Nov 27 19:05:46 1999
186 " d: adjust a device besides /dev/mixer\n"
187 " f: specify file for saving and loading settings (defaults to\n"
188 -" ~ /.aumixrc or /etc/aumixrc)\n"
189 +" ~/etc/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
190 " C: specify color scheme\n"
191 " h: this helpful message\n"
195 " d: ÒÅÇÕÌÀ×ÁÔÉ ÐÒÉÓÔÒϧ ÏËÒ¦Í /dev/mixer\n"
196 " f: ×ËÁÚÁÎÎÑ ¦ÍÅΦ ÆÁÊÌÕ ÄÌÑ ÚÂÅÒ¦ÇÁÎÎÑ Ò¦×Î¦× (ÚÁ ÚÁÍÏ×ÞÁÎÎÑÍ\n"
197 -" ~ /.aumixrc ÞÉ /etc/aumixrc)\n"
198 +" ~/etc/aumixrc, ~/.aumixrc ÞÉ /etc/aumixrc)\n"
199 " C: SPECIFY COLOR SCHEME\n"
202 diff -Nur aumix-1.27.4-orig/src/common.c aumix-1.27.4/src/common.c
203 --- aumix-1.27.4-orig/src/common.c Wed Nov 24 13:51:36 1999
204 +++ aumix-1.27.4/src/common.c Sat Nov 27 18:55:57 1999
207 /* Open the settings file for reading or writing.
209 - Try first ${HOME}/.AUMIXRC, then AUMIXRC_PATH/AUMIXRC;
210 + Try first ${HOME}/.AUMIXRC, ${HOME}/etc/AUMIXRC,
211 + then AUMIXRC_PATH/AUMIXRC;
212 become an error generator if neither can be opened.
216 char filename[FILENAME_MAX];
217 if (save_filename == NULL) {
218 home = getenv("HOME");
219 - sprintf(filename, "%s/.%s", home, AUMIXRC);
220 - setfile = fopen(filename, mode);
221 + sprintf(filename, "%s/etc/%s", home, AUMIXRC);
222 + setfile = fopen(filename, mode);
223 + if (setfile == NULL) {
224 + sprintf(filename, "%s/.%s", home, AUMIXRC);
225 + setfile = fopen(filename, mode);
227 if (setfile == NULL) {
228 sprintf(filename, "%s/%s", AUMIXRC_PATH, AUMIXRC);
229 setfile = fopen(filename, mode);
232 d: adjust a device besides /dev/mixer\n\
233 f: specify file for saving and loading settings (defaults to\n\
234 - ~ /.aumixrc or /etc/aumixrc)\n\
235 + ~/etc/aumixrc, ~/.aumixrc or /etc/aumixrc)\n\
236 C: specify color scheme\n\
237 h: this helpful message\n"));
238 #ifdef HAVE_LIBNCURSES