[xmp] Add configuration file reader

Port the configuration file reader from xmp 3.5 to 4.0. Module-specific configuration still not ported. Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>
14 years ago · 8470cdc070
parent 229caddca0
commit 8470cdc070
6 changed files with 277 additions and 6 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -1,7 +1,8 @@
 VERSION	= 3.9.1

 CC		= @CC@
-CFLAGS		= -c -Wall @CFLAGS@ @DEFS@ @CPPFLAGS@
+CFLAGS		= -c -Wall @CFLAGS@ @DEFS@ @CPPFLAGS@ \
+		  -DSYSCONFDIR=\"$(SYSCONFDIR)\"
 LD		= @CC@
 LDFLAGS		= @LDFLAGS@
 LIBS		= @LIBS@
--- a/src/Makefile
+++ b/src/Makefile
@ -1,6 +1,7 @@

 SRC_OBJS	= sound.o sound_null.o terminal.o info.o commands.o \
-		  options.o getopt.o getopt1.o main.o sound_wav.o sound_file.o
+		  options.o getopt.o getopt1.o main.o sound_wav.o \
+		  sound_file.o read_config.o
 SRC_DFILES	= Makefile xmp.1 $(SRC_OBJS:.o=.c) common.h getopt.h list.h \
 		  sound.h sound_alsa.c sound_coreaudio.c sound_oss.c \
 		  sound_sndio.c sound_netbsd.c sound_bsd.c sound_solaris.c \
--- a/src/common.h
+++ b/src/common.h
@ -1,7 +1,7 @@
 #ifndef __COMMON_H
 #define __COMMON_H

-#define MAX_DRV_PARM 10
+#define MAX_DRV_PARM 20

 struct options {
 	int start;		/* start order */
@ -19,6 +19,7 @@ struct options {
 	int info;		/* display information and exit */
 	int probeonly;		/* probe sound driver and exit */
 	int nocmd;		/* disable interactive commands */
+	int dparm;		/* driver parameter index */
 	char *driver_id;	/* sound driver ID */
 	char *out_file;		/* output file name */
 	char *ins_path;		/* instrument path */
@ -39,6 +40,7 @@ int report(char *, ...);

 /* option */
 void get_options(int, char **, struct options *);
+int read_config(struct options *);

 /* terminal */
 int set_tty(void);
--- a/src/main.c
+++ b/src/main.c
@ -176,6 +176,9 @@ int main(int argc, char **argv)
 	options.interp = XMP_INTERP_SPLINE;
 	options.dsp = XMP_DSP_LOWPASS;

+	/* read configuration file */
+	read_config(&options);
+
 	get_options(argc, argv, &options);

 	if (!options.probeonly && optind >= argc) {
--- a/src/options.c
+++ b/src/options.c
@ -131,7 +131,6 @@ static struct option lopt[] = {
 void get_options(int argc, char **argv, struct options *options)
 {
 	int optidx = 0;
-	int dparm = 0;
 	int o;

 #define OPTIONS "a:b:cD:d:Ff:hI:i:LlM:mNo:P:qRS:s:T:t:uVv"
@ -150,13 +149,14 @@ void get_options(int argc, char **argv, struct options *options)
 			options->out_file = "-";
 			break;
 		case 'D':
-			options->driver_parm[dparm++] = optarg;
+			if (options->dparm < MAX_DRV_PARM)
+				options->driver_parm[options->dparm++] = optarg;
 			break;
 		case 'd':
 			options->driver_id = optarg;
 			break;
 		case 'F':
-			options->dsp &= ~XMP_DSP_LOWPASS;;
+			options->dsp &= ~XMP_DSP_LOWPASS;
 			break;
 		case 'f':
 			options->rate = strtoul(optarg, NULL, 0);
--- a/src/read_config.c
+++ b/src/read_config.c
@ -0,0 +1,264 @@
+/* Extended Module Player
+ * Copyright (C) 1996-2012 Claudio Matsuoka and Hipolito Carraro Jr
+ *
+ * This file is part of the Extended Module Player and is distributed
+ * under the terms of the GNU General Public License. See doc/COPYING
+ * for more information.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <xmp.h>
+#include "common.h"
+
+#ifdef __AMIGA__
+#include <sys/unistd.h>
+#endif
+
+static char driver[32];
+static char instrument_path[256];
+
+static void delete_spaces(char *s)
+{
+	while (*s) {
+		if (*s == ' ' || *s == '\t') {
+			memmove(s, s + 1, strlen(s));
+		} else {
+			s++;
+		}
+	}
+}
+
+static int get_yesno(char *s)
+{
+	return !(strncmp(s, "y", 1) && strncmp(s, "o", 1));
+}
+
+int read_config(struct options *o)
+{
+	FILE *rc;
+	char myrc[PATH_MAX];
+	char *hash, *var, *val, line[256];
+	char cparm[512];
+
+#if defined __EMX__
+	char myrc2[PATH_MAX];
+	char *home = getenv("HOME");
+
+	snprintf(myrc, PATH_MAX, "%s\\.xmp\\xmp.conf", home);
+
+	if ((rc = fopen(myrc2, "r")) == NULL) {
+		if ((rc = fopen(myrc, "r")) == NULL) {
+			if ((rc = fopen("xmp.conf", "r")) == NULL) {
+				return -1;
+			}
+		}
+	}
+#elif defined __AMIGA__
+	strncpy(myrc, "PROGDIR:xmp.conf", PATH_MAX);
+
+	if ((rc = fopen(myrc, "r")) == NULL)
+		return -1;
+#elif defined WIN32
+	char *home = getenv("SystemRoot");
+
+	snprintf(myrc, PATH_MAX, "%s/xmp.conf", home);
+
+	if ((rc = fopen(myrc, "r")) == NULL)
+		return -1;
+#else
+	char *home = getenv("HOME");
+
+	snprintf(myrc, PATH_MAX, "%s/.xmp/xmp.conf", home);
+
+	if ((rc = fopen(myrc, "r")) == NULL) {
+		if ((rc = fopen(SYSCONFDIR "/xmp.conf", "r")) == NULL) {
+			return -1;
+		}
+	}
+#endif
+
+	while (!feof(rc)) {
+		memset(line, 0, 256);
+		fscanf(rc, "%255[^\n]", line);
+		fgetc(rc);
+
+		/* Delete comments */
+		if ((hash = strchr(line, '#')))
+			*hash = 0;
+
+		delete_spaces(line);
+
+		if (!(var = strtok(line, "=\n")))
+			continue;
+
+		val = strtok(NULL, " \t\n");
+
+#define getval_yn(w,x,y) { \
+	if (!strcmp(var,x)) { if (get_yesno (val)) w |= (y); \
+	    else w &= ~(y); continue; } }
+
+#define getval_no(x,y) { \
+	if (!strcmp(var,x)) { y = atoi (val); continue; } }
+
+		getval_yn(o->format, "8bit", XMP_FORMAT_8BIT);
+		getval_yn(o->format, "mono", XMP_FORMAT_MONO);
+		getval_yn(o->dsp, "filter", XMP_DSP_LOWPASS);
+		getval_no("amplify", o->amplify);
+		getval_no("mix", o->mix);
+		/*getval_no("crunch", o->crunch);
+		getval_no("chorus", o->chorus);
+		getval_no("reverb", o->reverb);*/
+		getval_no("srate", o->rate);
+		/*getval_no("time", o->time);
+		getval_no("verbosity", o->verbosity);*/
+
+		if (!strcmp(var, "driver")) {
+			strncpy(driver, val, 31);
+			o->driver_id = driver;
+			continue;
+		}
+
+		if (!strcmp(var, "interpolation")) {
+			if (!strcmp(val, "nearest")) {
+				o->interp = XMP_INTERP_NEAREST;
+			} else if (!strcmp(val, "linear")) {
+				o->interp = XMP_INTERP_LINEAR;
+			} else if (!strcmp(val, "spline")) {
+				o->interp = XMP_INTERP_SPLINE;
+			} else {
+				fprintf(stderr, "%s: unknown interpolation "
+						"type \"%s\"\n", myrc, val);
+			}
+		}
+
+		if (!strcmp(var, "loop")) {
+			o->loop = get_yesno(val);
+			continue;
+		}
+
+		if (!strcmp(var, "bits")) {
+			if (atoi(val) == 8)
+				o->format = XMP_FORMAT_8BIT;;
+			continue;
+		}
+
+		if (!strcmp(var, "instrument_path")) {
+			strncpy(instrument_path, val, 256);
+			o->ins_path = instrument_path;
+			continue;
+		}
+		/* If the line does not match any of the previous parameter,
+		 * send it to the device driver
+		 */
+		if (o->dparm < MAX_DRV_PARM) {
+			snprintf(cparm, 512, "%s=%s", var, val);
+			o->driver_parm[o->dparm++] = strdup(cparm);
+		}
+	}
+
+	fclose(rc);
+
+	return 0;
+}
+
+static void parse_modconf(xmp_context opaque, char *confname, char *md5)
+{
+	FILE *rc;
+	char *hash, *var, *val, line[256];
+	int active = 0;
+
+	if ((rc = fopen(confname, "r")) == NULL)
+		return;
+
+	while (!feof(rc)) {
+		memset(line, 0, 256);
+		fscanf(rc, "%255[^\n]", line);
+		fgetc(rc);
+
+		/* Delete comments */
+		if ((hash = strchr(line, '#')))
+			*hash = 0;
+
+		if (line[0] == ':') {
+			if (strcmp(md5, line + 1) == 0) {
+				active = 1;
+			}
+			continue;
+		}
+
+		if (!active)
+			continue;
+
+		delete_spaces(line);
+
+		if (!(var = strtok(line, "=\n")))
+			continue;
+
+		val = strtok(NULL, " \t\n");
+
+		/*getval_yn(m->flags, "8bit", XMP_CTL_8BIT);
+		getval_yn(m->flags, "interpolate", XMP_CTL_ITPT);
+		getval_yn(m->flags, "loop", XMP_CTL_LOOP);
+		getval_yn(m->flags, "reverse", XMP_CTL_REVERSE);
+		getval_yn(m->flags, "pan", XMP_CTL_DYNPAN);
+		getval_yn(m->flags, "filter", XMP_CTL_FILTER);
+		getval_yn(m->flags, "fixloop", XMP_CTL_FIXLOOP);
+		getval_yn(m->quirk, "fx9bug", XMP_QRK_FX9BUG);
+		getval_yn(m->flags, "vblank", XMP_CTL_VBLANK);
+		getval_yn(o->outfmt, "mono", XMP_FMT_MONO);
+		getval_no("mix", o->mix);*/
+		/*getval_no("crunch", o->crunch);
+		getval_no("chorus", o->chorus);
+		getval_no("reverb", o->reverb);*/
+
+		if (!strcmp(var, "interpolation")) {
+			int interp = -1; 
+			if (!strcmp(val, "nearest")) {
+				interp = XMP_INTERP_NEAREST;
+			} else if (!strcmp(val, "linear")) {
+				interp = XMP_INTERP_LINEAR;
+			} else if (!strcmp(val, "spline")) {
+				interp = XMP_INTERP_SPLINE;
+			} else {
+				fprintf(stderr, "%s: unknown interpolation "
+					"type \"%s\"\n", confname, val);
+			}
+
+			if (interp >= 0) {
+				xmp_mixer_set(opaque, XMP_MIXER_INTERP, interp);
+			}
+		}
+	}
+
+	fclose(rc);
+}
+
+void read_modconf(xmp_context opaque, char *md5)
+{
+#if defined __EMX__
+	char myrc[PATH_MAX];
+	char *home = getenv("HOME");
+
+	snprintf(myrc, PATH_MAX, "%s\\.xmp\\modules.conf", home);
+	parse_modconf(ctx, "xmp-modules.conf", crc, size);
+	parse_modconf(ctx, myrc, crc, size);
+#elif defined __AMIGA__
+	parse_modconf(ctx, "PROGDIR:modules.conf", crc, size);
+#elif defined WIN32
+	char myrc[PATH_MAX];
+	char *home = getenv("SystemRoot");
+
+	snprintf(myrc, PATH_MAX, "%s/modules.conf", home);
+	parse_modconf(ctx, myrc, crc, size);
+#else
+	char myrc[PATH_MAX];
+	char *home = getenv("HOME");
+
+	snprintf(myrc, PATH_MAX, "%s/.xmp/modules.conf", home);
+	parse_modconf(opaque, SYSCONFDIR "/modules.conf", md5);
+	parse_modconf(opaque, myrc, md5);
+#endif
+}