-diff -Nru aumix-2.6/doc/aumix.1 aumix-2.6.new/doc/aumix.1
---- aumix-2.6/doc/aumix.1 Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/doc/aumix.1 Fri Apr 14 06:46:17 2000
+diff -Nru aumix-2.6.1/doc/aumix.1 aumix-2.6.1.new/doc/aumix.1
+--- aumix-2.6.1/doc/aumix.1 Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/doc/aumix.1 Tue Jun 27 23:11:28 2000
@@ -115,15 +115,19 @@
go into interactive mode after doing things non-interactively.
.It Fl L
falling back to
.Pa /etc/aumixrc
.It M or m
-@@ -257,8 +264,11 @@
+@@ -264,8 +271,11 @@
Saved settings for the mixer are kept in the
.Pa /etc/aumixrc
and
+but can be kept anywhere if specified explicitly.
Color schemes are normally kept in the directory given
by
- .Ev DATADIRNAME
-diff -Nru aumix-2.6/po/aumix.pot aumix-2.6.new/po/aumix.pot
---- aumix-2.6/po/aumix.pot Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/po/aumix.pot Fri Apr 14 06:46:17 2000
-@@ -180,7 +180,7 @@
- "other options:\n"
+ .Ev DATADIR
+diff -Nru aumix-2.6.1/po/de.po aumix-2.6.1.new/po/de.po
+--- aumix-2.6.1/po/de.po Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/po/de.po Tue Jun 27 23:15:28 2000
+@@ -206,12 +206,12 @@
+ msgid ""
" d: adjust a device besides /dev/mixer\n"
" f: specify file for saving and loading settings (defaults to\n"
-" ~/.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
++" $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
" h: this helpful message\n"
msgstr ""
-diff -Nru aumix-2.6/po/de.po aumix-2.6.new/po/de.po
---- aumix-2.6/po/de.po Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/po/de.po Fri Apr 14 06:48:27 2000
-@@ -188,7 +188,7 @@
- "other options:\n"
- " d: adjust a device besides /dev/mixer\n"
- " f: specify file for saving and loading settings (defaults to\n"
--" ~/.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc) or /etc/aumixrc)\n"
- " C: specify color scheme\n"
- " h: this helpful message\n"
- msgstr ""
-@@ -206,7 +206,7 @@
- "Weitere Optionen:\n"
" d: Anderes Gerät als /dev/mixer benutzen\n"
" f: Spezifizieren Sie die Datei zum Speichern und Laden von Einstellungen\n"
-" (Standard sind ~/.aumixrc oder /etc/aumixrc)\n"
-+" (Standard sind ~/.aumixrc oder /etc/aumixrc) or /etc/aumixrc)\n"
++" (Standard sind $CONFIG_DIR/aumixrc oder /etc/aumixrc) or /etc/aumixrc)\n"
" h: Diese nützlichen Informationen\n"
- #: src/common.c:675
-diff -Nru aumix-2.6/po/es.po aumix-2.6.new/po/es.po
---- aumix-2.6/po/es.po Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/po/es.po Fri Apr 14 06:46:17 2000
-@@ -187,7 +187,7 @@
- "other options:\n"
+ #: src/common.c:689
+diff -Nru aumix-2.6.1/po/es.po aumix-2.6.1.new/po/es.po
+--- aumix-2.6.1/po/es.po Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/po/es.po Tue Jun 27 23:14:48 2000
+@@ -206,12 +206,12 @@
+ msgid ""
" d: adjust a device besides /dev/mixer\n"
" f: specify file for saving and loading settings (defaults to\n"
-" ~/.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
++" $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
" h: this helpful message\n"
msgstr ""
-@@ -205,7 +205,7 @@
- "Otras opciones:\n"
" d: ajustar dispositivos además de /dev/mixer\n"
" f: indicar el fichero para guardar y cargar las preferencias (por\n"
-" defecto es ~/.aumixrc o /etc/aumixrc\n"
-+" defecto es $CONFIG_DIR/aumixrc, ~/.aumixrc o /etc/aumixrc\n"
- " C: indicar el esquema de color\n"
++" defecto es $CONFIG_DIR/aumixrc o /etc/aumixrc\n"
" h: este mensaje de ayuda\n"
-diff -Nru aumix-2.6/po/fr.po aumix-2.6.new/po/fr.po
---- aumix-2.6/po/fr.po Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/po/fr.po Fri Apr 14 06:46:17 2000
-@@ -190,7 +190,7 @@
- "other options:\n"
+ #: src/common.c:689
+diff -Nru aumix-2.6.1/po/fr.po aumix-2.6.1.new/po/fr.po
+--- aumix-2.6.1/po/fr.po Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/po/fr.po Tue Jun 27 23:15:18 2000
+@@ -206,12 +206,12 @@
+ msgid ""
" d: adjust a device besides /dev/mixer\n"
" f: specify file for saving and loading settings (defaults to\n"
-" ~/.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
++" $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
" h: this helpful message\n"
msgstr ""
-@@ -208,7 +208,7 @@
- "autres options:\n"
" d: ajuster un périphérique autre que /dev/mixer\n"
" f: spécifier le fichier de sauvegarde/chargement des paramètres\n"
-" (par défaut il s'agit de ~/.aumixrc ou /etc/aumixrc)\n"
-+" (par défaut il s'agit de $CONFIG_DIR/aumixrc, ~/.aumixrc ou /etc/aumixrc)\n"
- " C: spécifier le modèle de couleurs\n"
++" (par défaut il s'agit de $CONFIG_DIR/aumixrc ou /etc/aumixrc)\n"
" h: ce message d'aide\n"
-diff -Nru aumix-2.6/po/gl.po aumix-2.6.new/po/gl.po
---- aumix-2.6/po/gl.po Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/po/gl.po Fri Apr 14 06:46:17 2000
-@@ -193,7 +193,7 @@
- "other options:\n"
+ #: src/common.c:689
+diff -Nru aumix-2.6.1/po/gl.po aumix-2.6.1.new/po/gl.po
+--- aumix-2.6.1/po/gl.po Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/po/gl.po Tue Jun 27 23:14:38 2000
+@@ -214,12 +214,12 @@
+ msgid ""
" d: adjust a device besides /dev/mixer\n"
" f: specify file for saving and loading settings (defaults to\n"
-" ~/.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
++" $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
" h: this helpful message\n"
msgstr ""
-@@ -211,7 +211,7 @@
- "outras opcións:\n"
" d: axustar outro dispositivo que non sexa /dev/mixer\n"
" f: especificar ficheiro para gardar e cargar parámetros (por omisión é\n"
-" ~/.aumixrc ou /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc ou /etc/aumixrc)\n"
- " C: especifica-lo esquema de cor\n"
++" $CONFIG_DIR/aumixrc ou /etc/aumixrc)\n"
" h: amosar esta mensaxe de axuda\n"
-diff -Nru aumix-2.6/po/pl.po aumix-2.6.new/po/pl.po
---- aumix-2.6/po/pl.po Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/po/pl.po Fri Apr 14 06:46:17 2000
-@@ -187,7 +187,7 @@
- "other options:\n"
+ #: src/common.c:689
+diff -Nru aumix-2.6.1/po/pl.po aumix-2.6.1.new/po/pl.po
+--- aumix-2.6.1/po/pl.po Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/po/pl.po Tue Jun 27 23:16:16 2000
+@@ -210,12 +210,12 @@
+ msgid ""
" d: adjust a device besides /dev/mixer\n"
" f: specify file for saving and loading settings (defaults to\n"
-" ~/.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
++" $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
" h: this helpful message\n"
msgstr ""
-@@ -205,7 +205,7 @@
- "inne opcje:\n"
" d: dostosowuje urz±dzenie inne ni¿ /dev/mixer\n"
" f: okre¶la plik do zapisywania i ³adowania ustawieñ (domy¶lnie jest to\n"
-" ~/.aumixrc lub /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc lub /etc/aumixrc)\n"
- " C: okre¶la plik zawieraj±cy schemat u¿ycia kolorów\n"
++" $CONFIG_DIR/aumixrc lub /etc/aumixrc)\n"
" h: ta pomocna informacja\n"
-diff -Nru aumix-2.6/po/pt_BR.po aumix-2.6.new/po/pt_BR.po
---- aumix-2.6/po/pt_BR.po Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/po/pt_BR.po Fri Apr 14 06:46:17 2000
-@@ -190,7 +190,7 @@
- "other options:\n"
+ #: src/common.c:689
+diff -Nru aumix-2.6.1/po/pt_BR.po aumix-2.6.1.new/po/pt_BR.po
+--- aumix-2.6.1/po/pt_BR.po Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/po/pt_BR.po Tue Jun 27 23:14:27 2000
+@@ -212,12 +212,12 @@
+ msgid ""
" d: adjust a device besides /dev/mixer\n"
" f: specify file for saving and loading settings (defaults to\n"
-" ~/.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
++" $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
" h: this helpful message\n"
msgstr ""
-@@ -208,7 +208,7 @@
- "outras opções:\n"
" d: usar outro dispositivo que não o /dev/mixer\n"
" f: SPECIFY FILE FOR SAVING AND LOADING SETTINGS (DEFAULTS TO\n"
-" ~/.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
- " C: SPECIFY COLOR SCHEME\n"
++" $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
" h: esta mensagem de ajuda\n"
-diff -Nru aumix-2.6/po/ru.po aumix-2.6.new/po/ru.po
---- aumix-2.6/po/ru.po Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/po/ru.po Fri Apr 14 06:46:17 2000
-@@ -194,7 +194,7 @@
- "other options:\n"
+ #: src/common.c:689
+diff -Nru aumix-2.6.1/po/ru.po aumix-2.6.1.new/po/ru.po
+--- aumix-2.6.1/po/ru.po Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/po/ru.po Tue Jun 27 23:16:07 2000
+@@ -210,12 +210,12 @@
+ msgid ""
" d: adjust a device besides /dev/mixer\n"
" f: specify file for saving and loading settings (defaults to\n"
-" ~/.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
++" $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
" h: this helpful message\n"
msgstr ""
-@@ -213,7 +213,7 @@
- "äÒÕÇÉÅ ÏÐÃÉÉ:\n"
" d: ÒÅÇÕÌÉÒÏ×ÁÔØ ÕÓÔÒÏÊÓÔ×Á ËÒÏÍÅ /dev/mixer\n"
" f: ÕËÁÚÁÎÉÅ ÉÍÅÎÉ ÆÁÊÌÁ ÄÌÑ ÈÒÁÎÅÎÉÑ ÕÓÔÁÎÏ×ÏË (ÐÏ ÕÍÏÌÞÁÎÉÀ\n"
-" ~/.aumixrc ÉÌÉ /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc ÉÌÉ /etc/aumixrc)\n"
- " C: ×ÙÂÏÒ Ã×ÅÔÏ×ÏÊ ÓÈÅÍÙ\n"
++" $CONFIG_DIR/aumixrc ÉÌÉ /etc/aumixrc)\n"
" h: ÜÔÁ ÐÏÍÏÝØ\n"
-diff -Nru aumix-2.6/po/uk.po aumix-2.6.new/po/uk.po
---- aumix-2.6/po/uk.po Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/po/uk.po Fri Apr 14 06:46:17 2000
-@@ -189,7 +189,7 @@
- "other options:\n"
+ #: src/common.c:689
+diff -Nru aumix-2.6.1/po/uk.po aumix-2.6.1.new/po/uk.po
+--- aumix-2.6.1/po/uk.po Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/po/uk.po Tue Jun 27 23:14:13 2000
+@@ -212,12 +212,12 @@
+ msgid ""
" d: adjust a device besides /dev/mixer\n"
" f: specify file for saving and loading settings (defaults to\n"
-" ~/.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
++" $CONFIG_DIR/aumixrc or /etc/aumixrc)\n"
" h: this helpful message\n"
msgstr ""
-@@ -208,7 +208,7 @@
- "¶ÎÛ¦ ÏÐæ§:\n"
" d: ÒÅÇÕÌÀ×ÁÔÉ ÐÒÉÓÔÒϧ ÏËÒ¦Í /dev/mixer\n"
" f: ×ËÁÚÁÎÎÑ ¦ÍÅΦ ÆÁÊÌÕ ÄÌÑ ÚÂÅÒ¦ÇÁÎÎÑ Ò¦×Î¦× (ÚÁ ÚÁÍÏ×ÞÁÎÎÑÍ\n"
-" ~/.aumixrc ÞÉ /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc ÞÉ /etc/aumixrc)\n"
- " C: SPECIFY COLOR SCHEME\n"
++" $CONFIG_DIR/aumixrc ÞÉ /etc/aumixrc)\n"
" h: ÃÑ ÄÏÐÏÍÏÇÁ\n"
-diff -Nru aumix-2.6/src/Makefile.am aumix-2.6.new/src/Makefile.am
---- aumix-2.6/src/Makefile.am Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/src/Makefile.am Fri Apr 14 06:46:17 2000
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = aumix
+ #: src/common.c:689
+diff -Nru aumix-2.6.1/src/Makefile.am aumix-2.6.1.new/src/Makefile.am
+--- aumix-2.6.1/src/Makefile.am Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/src/Makefile.am Wed Jun 28 00:12:13 2000
+@@ -2,8 +2,8 @@
+ if CURSES
bin_SCRIPTS = xaumix
+ endif
-aumix_SOURCES = common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c \
- mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h \
+aumix_SOURCES = userdir.c common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c \
mouse.h play.xpm record.xpm
localedir = $(datadir)/locale
INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
-diff -Nru aumix-2.6/src/Makefile.in aumix-2.6.new/src/Makefile.in
---- aumix-2.6/src/Makefile.in Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/src/Makefile.in Fri Apr 14 06:46:17 2000
-@@ -84,7 +84,7 @@
-
- bin_PROGRAMS = aumix
- bin_SCRIPTS = xaumix
--aumix_SOURCES = common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h mouse.h play.xpm record.xpm
-+aumix_SOURCES = userdir.c common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h mouse.h play.xpm record.xpm
-
- localedir = $(datadir)/locale
- INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
-@@ -99,7 +99,7 @@
+diff -Nru aumix-2.6.1/src/Makefile.in aumix-2.6.1.new/src/Makefile.in
+--- aumix-2.6.1/src/Makefile.in Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/src/Makefile.in Tue Jun 27 23:11:28 2000
+@@ -100,7 +100,7 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
interactive.o mouse.o
aumix_LDADD = $(LDADD)
aumix_DEPENDENCIES =
-diff -Nru aumix-2.6/src/common.c aumix-2.6.new/src/common.c
---- aumix-2.6/src/common.c Fri Apr 14 06:47:08 2000
-+++ aumix-2.6.new/src/common.c Fri Apr 14 06:46:17 2000
+diff -Nru aumix-2.6.1/src/common.c aumix-2.6.1.new/src/common.c
+--- aumix-2.6.1/src/common.c Tue Jun 27 23:11:47 2000
++++ aumix-2.6.1.new/src/common.c Wed Jun 28 00:10:45 2000
@@ -26,6 +26,7 @@
#include "gtk.h"
#endif /* HAVE_GTK */
become an error generator if neither can be opened.
Input:
-@@ -571,19 +573,24 @@
+@@ -571,6 +573,8 @@
FILE *setfile;
char *home;
char filename[FILENAME_MAX];
-+ struct cfv etcfile;
-+
++ struct cfv etcfile;
++
if (save_filename == NULL) {
-- home = getenv("HOME");
-- sprintf(filename, "%s/.%s", home, AUMIXRC);
-- setfile = fopen(filename, mode);
-- if (setfile == NULL) {
-- sprintf(filename, "%s/%s", AUMIXRC_PATH, AUMIXRC);
-- setfile = fopen(filename, mode);
-- }
-- if (setfile == NULL) {
-- return NULL;
-- }
-+ etcfile.variable = "CONFIG_DIR";
-+ etcfile.home_dir = NULL;
-+ etcfile.home_scd = NULL;
-+ etcfile.subname = AUMIXRC;
-+ etcfile.prefix = ".";
-+ etcfile.suffix = "";
-+ etcfile.mode = M_REGULAR_FILE;
+ home = getenv("HOME");
+ if ((strlen(home) + strlen(AUMIXRC)) < PATH_MAX) {
+@@ -585,6 +589,19 @@
+ }
+ if (setfile == NULL) {
+ return NULL;
++ }
++ etcfile.variable = "CONFIG_DIR";
++ etcfile.home_dir = NULL;
++ etcfile.home_scd = NULL;
++ etcfile.subname = AUMIXRC;
++ etcfile.prefix = ".";
++ etcfile.suffix = "";
++ etcfile.mode = M_REGULAR_FILE;
+
-+ setfile = fopencfv(&etcfile, mode);
-+ if (setfile == NULL) {
-+ sprintf(filename, "%s/%s", AUMIXRC_PATH, AUMIXRC);
-+ setfile = fopen(filename, mode);
-+ }
++ setfile = fopencfv(&etcfile, mode);
++ if (setfile == NULL) {
++ sprintf(filename, "%s/%s", AUMIXRC_PATH, AUMIXRC);
++ setfile = fopen(filename, mode);
+ }
} else
-- setfile = fopen(save_filename, mode);
-+ setfile = fopen(save_filename, mode);
- return setfile;
- }
-
-@@ -668,7 +675,7 @@
- other options:\n\
- d: adjust a device besides /dev/mixer\n\
- f: specify file for saving and loading settings (defaults to\n\
-- ~/.aumixrc or /etc/aumixrc)\n\
-+ $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n\
- C: specify color scheme\n\
- h: this helpful message\n"));
- #ifdef HAVE_CURSES
-diff -Nru aumix-2.6/src/userdir.c aumix-2.6.new/src/userdir.c
---- aumix-2.6/src/userdir.c Thu Jan 1 01:00:00 1970
-+++ aumix-2.6.new/src/userdir.c Fri Apr 14 06:46:17 2000
+ setfile = fopen(save_filename, mode);
+diff -Nru aumix-2.6.1/src/userdir.c aumix-2.6.1.new/src/userdir.c
+--- aumix-2.6.1/src/userdir.c Thu Jan 1 01:00:00 1970
++++ aumix-2.6.1.new/src/userdir.c Tue Jun 27 23:11:28 2000
@@ -0,0 +1,167 @@
+// $Id$
+#include "userdir.h"
+
+/******************************************************************************/
\ No newline at end of file
-diff -Nru aumix-2.6/src/userdir.h aumix-2.6.new/src/userdir.h
---- aumix-2.6/src/userdir.h Thu Jan 1 01:00:00 1970
-+++ aumix-2.6.new/src/userdir.h Fri Apr 14 06:46:17 2000
+diff -Nru aumix-2.6.1/src/userdir.h aumix-2.6.1.new/src/userdir.h
+--- aumix-2.6.1/src/userdir.h Thu Jan 1 01:00:00 1970
++++ aumix-2.6.1.new/src/userdir.h Tue Jun 27 23:11:28 2000
@@ -0,0 +1,56 @@
+// $Id$
+#ifndef USERDIR__H
projects / packages / aumix-gtk.git / commitdiff