Damn, each Linux distrib put timidity.cfg at a different place

libsdl-org · Jul 13, 2005 · e3d1f5d · e3d1f5d
1 parent dc05630
commit e3d1f5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/timidity/config.h b/timidity/config.h
@@ -219,6 +219,7 @@ typedef char int8;
    then specify the library directory in the configuration file. */
 #define CONFIG_FILE	"timidity.cfg"
 #define CONFIG_FILE_ETC "/etc/timidity.cfg"
+#define CONFIG_FILE_ETC_TIMIDITY "/etc/timidity/timidity.cfg"
 
 #ifdef __WIN32__
 #define DEFAULT_PATH	"\\TIMIDITY"

diff --git a/timidity/timidity.c b/timidity/timidity.c
@@ -296,7 +296,9 @@ int Timidity_Init(int rate, int format, int channels, int samples)
 {
   if (read_config_file(CONFIG_FILE)<0) {
     if (read_config_file(CONFIG_FILE_ETC)<0) {
-      return(-1);
+      if (read_config_file(CONFIG_FILE_ETC_TIMIDITY)<0) {
+        return(-1);
+      }
     }
   }