Search timidity.cfg also in /etc

libsdl-org · Jul 4, 2005 · 836db36 · 836db36
1 parent e035fba
commit 836db36
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/timidity/config.h b/timidity/config.h
@@ -218,6 +218,8 @@ typedef char int8;
 /* You could specify a complete path, e.g. "/etc/timidity.cfg", and
    then specify the library directory in the configuration file. */
 #define CONFIG_FILE	"timidity.cfg"
+#define CONFIG_FILE_ETC "/etc/timidity.cfg"
+
 #ifdef __WIN32__
 #define DEFAULT_PATH	"\\TIMIDITY"
 #else

diff --git a/timidity/timidity.c b/timidity/timidity.c
@@ -295,7 +295,9 @@ static int read_config_file(char *name)
 int Timidity_Init(int rate, int format, int channels, int samples)
 {
   if (read_config_file(CONFIG_FILE)<0) {
-    return(-1);
+    if (read_config_file(CONFIG_FILE_ETC)<0) {
+      return(-1);
+    }
   }
 
   if (channels < 1 || channels == 3 || channels == 5 || channels > 6) return(-1);