From ebc3eb8e867c4a3dcd71b4b3e9a2be4492a612e2 Mon Sep 17 00:00:00 2001 From: pius Date: Thu, 23 Mar 2000 12:40:18 +0000 Subject: [PATCH] - updated for 2.4 Changed files: aumix-home_etc.patch -> 1.6 --- aumix-home_etc.patch | 195 +++++++++++++++++++++++-------------------- 1 file changed, 106 insertions(+), 89 deletions(-) diff --git a/aumix-home_etc.patch b/aumix-home_etc.patch index 1ba373a..47c5b4c 100644 --- a/aumix-home_etc.patch +++ b/aumix-home_etc.patch @@ -1,5 +1,5 @@ ---- aumix-2.1/doc/aumix.1 Mon Jan 31 23:30:12 2000 -+++ aumix-2.1.pius/doc/aumix.1 Tue Feb 8 02:09:41 2000 +--- aumix-2.4.pius/doc/aumix.1 Mon Jan 31 23:30:12 2000 ++++ aumix-2.4/doc/aumix.1 Thu Mar 23 12:50:51 2000 @@ -115,15 +115,19 @@ go into interactive mode after doing things non-interactively. .It Fl L @@ -48,49 +48,49 @@ Color schemes are normally kept in the directory given by .Ev DATADIRNAME ---- aumix-2.1/po/aumix.pot Mon Jan 31 23:30:12 2000 -+++ aumix-2.1.pius/po/aumix.pot Tue Feb 8 02:09:41 2000 +--- aumix-2.4.pius/po/aumix.pot Thu Mar 23 02:01:18 2000 ++++ aumix-2.4/po/aumix.pot Thu Mar 23 13:02:15 2000 @@ -175,7 +175,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" +-" ~/.aumixrc or /etc/aumixrc)\n" ++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n" " C: specify color scheme\n" " h: this helpful message\n" msgstr "" ---- aumix-2.1/po/de.po Sun Nov 28 07:35:18 1999 -+++ aumix-2.1.pius/po/de.po Tue Feb 8 02:09:41 2000 -@@ -81,7 +81,7 @@ +--- aumix-2.4.pius/po/de.po Thu Mar 23 02:01:18 2000 ++++ aumix-2.4/po/de.po Thu Mar 23 12:59:22 2000 +@@ -182,7 +182,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" +-" ~/.aumixrc or /etc/aumixrc)\n" ++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n" " C: specify color scheme\n" " h: this helpful message\n" msgstr "" -@@ -99,7 +99,7 @@ +@@ -200,7 +200,7 @@ "Weitere Optionen:\n" " d: Anderes Gerät als /dev/mixer benutzen\n" " f: spezifizieren Sie Datei für Einsparung- und Ladeneinstellungen\n" --" (Rückstellungen zum ~ /.aumixrc or /etc/aumixrc)\n" -+" (Rückstellungen zum $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n" +-" (Rückstellungen zum ~/.aumixrc or /etc/aumixrc)\n" ++" (Rückstellungen zum $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n" " h: Diese nützlichen Informationen\n" - #: src/common.c:567 ---- aumix-2.1/po/es.po Mon Dec 6 16:41:47 1999 -+++ aumix-2.1.pius/po/es.po Tue Feb 8 02:09:41 2000 -@@ -81,7 +81,7 @@ + #: src/common.c:694 +--- aumix-2.4.pius/po/es.po Thu Mar 23 02:01:18 2000 ++++ aumix-2.4/po/es.po Thu Mar 23 12:59:43 2000 +@@ -181,7 +181,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" +-" ~/.aumixrc or /etc/aumixrc)\n" ++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n" " C: specify color scheme\n" " h: this helpful message\n" msgstr "" -@@ -99,7 +99,7 @@ +@@ -199,7 +199,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" @@ -99,18 +99,38 @@ " C: indicar el esquema de color\n" " h: este mensaje de ayuda\n" ---- aumix-2.1/po/gl.po Mon Dec 6 16:41:47 1999 -+++ aumix-2.1.pius/po/gl.po Tue Feb 8 02:09:41 2000 -@@ -89,7 +89,7 @@ +--- aumix-2.4.pius/po/fr.po Thu Mar 23 02:01:18 2000 ++++ aumix-2.4/po/fr.po Thu Mar 23 13:00:22 2000 +@@ -184,7 +184,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" + msgstr "" +@@ -202,7 +202,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" + " h: ce message d'aide\n" + +--- aumix-2.4.pius/po/gl.po Thu Mar 23 02:01:18 2000 ++++ aumix-2.4/po/gl.po Thu Mar 23 13:00:39 2000 +@@ -187,7 +187,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" +-" ~/.aumixrc or /etc/aumixrc)\n" ++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n" " C: specify color scheme\n" " h: this helpful message\n" msgstr "" -@@ -107,7 +107,7 @@ +@@ -205,7 +205,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" @@ -119,8 +139,8 @@ " C: especifica-lo esquema de cor\n" " h: amosar esta mensaxe de axuda\n" ---- aumix-2.1/po/pl.po Tue Feb 8 02:15:54 2000 -+++ aumix-2.1.pius/po/pl.po Tue Feb 8 02:09:41 2000 +--- aumix-2.4.pius/po/pl.po Thu Mar 23 12:50:19 2000 ++++ aumix-2.4/po/pl.po Thu Mar 23 13:00:58 2000 @@ -181,7 +181,7 @@ "other options:\n" " d: adjust a device besides /dev/mixer\n" @@ -139,34 +159,34 @@ " C: okre¶la plik zawieraj±cy schemat u¿ycia kolorów\n" " h: ta pomocna informacja\n" ---- aumix-2.1/po/pt_BR.po Sun Nov 28 07:35:18 1999 -+++ aumix-2.1.pius/po/pt_BR.po Tue Feb 8 02:09:41 2000 -@@ -84,7 +84,7 @@ +--- aumix-2.4.pius/po/pt_BR.po Thu Mar 23 02:01:18 2000 ++++ aumix-2.4/po/pt_BR.po Thu Mar 23 13:01:22 2000 +@@ -184,7 +184,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" +-" ~/.aumixrc or /etc/aumixrc)\n" ++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n" " C: specify color scheme\n" " h: this helpful message\n" msgstr "" -@@ -102,7 +102,7 @@ +@@ -202,7 +202,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" +-" ~/.aumixrc or /etc/aumixrc)\n" ++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n" " C: SPECIFY COLOR SCHEME\n" " h: esta mensagem de ajuda\n" ---- aumix-2.1/po/ru.po Mon Dec 20 02:13:11 1999 -+++ aumix-2.1.pius/po/ru.po Tue Feb 8 02:09:41 2000 +--- aumix-2.4.pius/po/ru.po Thu Mar 23 02:01:18 2000 ++++ aumix-2.4/po/ru.po Thu Mar 23 13:01:42 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)\n" +-" ~/.aumixrc or /etc/aumixrc)\n" ++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n" " C: specify color scheme\n" " h: this helpful message\n" msgstr "" @@ -174,53 +194,51 @@ "äÒÕÇÉÅ ÏÐÃÉÉ:\n" " d: ÒÅÇÕÌÉÒÏ×ÁÔØ ÕÓÔÒÏÊÓÔ×Á ËÒÏÍÅ /dev/mixer\n" " f: ÕËÁÚÁÎÉÅ ÉÍÅÎÉ ÆÁÊÌÁ ÄÌÑ ÈÒÁÎÅÎÉÑ ÕÓÔÁÎÏ×ÏË (ÐÏ ÕÍÏÌÞÁÎÉÀ\n" --" ~ /.aumixrc ÉÌÉ /etc/aumixrc)\n" -+" $CONFIG_DIR/aumixrc, ~ /.aumixrc ÉÌÉ /etc/aumixrc)\n" +-" ~/.aumixrc ÉÌÉ /etc/aumixrc)\n" ++" $CONFIG_DIR/aumixrc, ~/.aumixrc ÉÌÉ /etc/aumixrc)\n" " C: ×ÙÂÏÒ Ã×ÅÔÏ×ÏÊ ÓÈÅÍÙ\n" " h: ÜÔÁ ÐÏÍÏÝØ\n" ---- aumix-2.1/po/uk.po Sun Nov 28 07:35:18 1999 -+++ aumix-2.1.pius/po/uk.po Tue Feb 8 02:09:41 2000 -@@ -82,7 +82,7 @@ +--- aumix-2.4.pius/po/uk.po Thu Mar 23 02:01:18 2000 ++++ aumix-2.4/po/uk.po Thu Mar 23 13:01:58 2000 +@@ -183,7 +183,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" +-" ~/.aumixrc or /etc/aumixrc)\n" ++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n" " C: specify color scheme\n" " h: this helpful message\n" msgstr "" -@@ -101,7 +101,7 @@ +@@ -202,7 +202,7 @@ "¶ÎÛ¦ ÏÐæ§:\n" " d: ÒÅÇÕÌÀ×ÁÔÉ ÐÒÉÓÔÒϧ ÏËÒ¦Í /dev/mixer\n" " f: ×ËÁÚÁÎÎÑ ¦ÍÅΦ ÆÁÊÌÕ ÄÌÑ ÚÂÅÒ¦ÇÁÎÎÑ Ò¦×Î¦× (ÚÁ ÚÁÍÏ×ÞÁÎÎÑÍ\n" --" ~ /.aumixrc ÞÉ /etc/aumixrc)\n" -+" $CONFIG_DIR/aumixrc, ~ /.aumixrc ÞÉ /etc/aumixrc)\n" +-" ~/.aumixrc ÞÉ /etc/aumixrc)\n" ++" $CONFIG_DIR/aumixrc, ~/.aumixrc ÞÉ /etc/aumixrc)\n" " C: SPECIFY COLOR SCHEME\n" " h: ÃÑ ÄÏÐÏÍÏÇÁ\n" ---- aumix-2.1/src/Makefile.am Sat Dec 25 17:53:54 1999 -+++ aumix-2.1.pius/src/Makefile.am Tue Feb 8 02:09:41 2000 -@@ -1,8 +1,8 @@ +--- aumix-2.4.pius/src/Makefile.am Thu Mar 23 02:01:18 2000 ++++ aumix-2.4/src/Makefile.am Thu Mar 23 12:52:07 2000 +@@ -1,7 +1,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 -+aumix_SOURCES = userdir.c common.c curses.c dummy.c gpm-xterm.c gtk.c \ -+ interactive.c mouse.c userdir.h common.h curses.h gpm-xterm.h \ -+ gtk.h interactive.h mouse.h ++aumix_SOURCES = userdir.c common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c \ ++ mouse.c userdir.h 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@ - CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@ ---- aumix-2.1/src/Makefile.in Mon Jan 31 23:19:53 2000 -+++ aumix-2.1.pius/src/Makefile.in Tue Feb 8 02:09:41 2000 +--- aumix-2.4.pius/src/Makefile.in Thu Mar 23 02:01:18 2000 ++++ aumix-2.4/src/Makefile.in Thu Mar 23 12:52:53 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 -+aumix_SOURCES = userdir.c common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c mouse.c userdir.h common.h curses.h gpm-xterm.h gtk.h interactive.h mouse.h +-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@ @@ -233,27 +251,27 @@ interactive.o mouse.o aumix_LDADD = $(LDADD) aumix_DEPENDENCIES = ---- aumix-2.1/src/common.c Mon Jan 31 23:30:12 2000 -+++ aumix-2.1.pius/src/common.c Tue Feb 8 02:14:43 2000 -@@ -24,6 +24,7 @@ +--- aumix-2.4.pius/src/common.c Thu Mar 23 02:01:18 2000 ++++ aumix-2.4/src/common.c Thu Mar 23 12:58:29 2000 +@@ -26,6 +26,7 @@ #include "gtk.h" - #endif + #endif /* HAVE_GTK */ #include "interactive.h" +#include "userdir.h" void ExitIfError(int error); int InitializeMixer(char *device_file); -@@ -536,7 +537,8 @@ +@@ -578,7 +579,8 @@ { /* Open the settings file for reading or writing. - Try first ${HOME}/.AUMIXRC, then AUMIXRC_PATH/AUMIXRC; -+ Try first ${CONFIG_DIR}/AUMIXRC, then ${HOME}/.AUMIXRC -+ and eventually AUMIXRC_PATH/AUMIXRC; ++ Try first ${HOME}/.AUMIXRC, then then ${HOME}/.AUMIXRC ++ and eventualy AUMIXRC_PATH/AUMIXRC; become an error generator if neither can be opened. Input: -@@ -551,19 +553,25 @@ +@@ -593,19 +595,24 @@ FILE *setfile; char *home; char filename[FILENAME_MAX]; @@ -271,36 +289,35 @@ - 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; ++ 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; } -@@ -649,7 +657,7 @@ +@@ -688,7 +695,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\ +- ~/.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 ---- aumix-2.1/src/userdir.c Thu Jan 1 01:00:00 1970 -+++ aumix-2.1.pius/src/userdir.c Sat Feb 5 21:19:17 2000 +--- aumix-2.4.pius/src/userdir.c Thu Jan 1 01:00:00 1970 ++++ aumix-2.4/src/userdir.c Thu Mar 23 12:50:51 2000 @@ -0,0 +1,167 @@ +// $Id$ +#include "userdir.h" @@ -470,8 +487,8 @@ + +/******************************************************************************/ \ No newline at end of file ---- aumix-2.1/src/userdir.h Thu Jan 1 01:00:00 1970 -+++ aumix-2.1.pius/src/userdir.h Sat Feb 5 21:19:17 2000 +--- aumix-2.4.pius/src/userdir.h Thu Jan 1 01:00:00 1970 ++++ aumix-2.4/src/userdir.h Thu Mar 23 12:50:51 2000 @@ -0,0 +1,56 @@ +// $Id$ +#ifndef USERDIR__H -- 2.43.0