Applied Debian patch 05_fallback_to_freepats.patch

libsdl-org · Feb 15, 2013 · 8056b75 · 8056b75
1 parent a510dd9
commit 8056b75
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
@@ -162,6 +162,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_FREEPATS "/etc/timidity/freepats.cfg"
 
 #if defined(__WIN32__) || defined(__OS2__)
 #define DEFAULT_PATH	"C:\\TIMIDITY"

diff --git a/timidity/timidity.c b/timidity/timidity.c
@@ -286,7 +286,9 @@ int Timidity_Init(int rate, int format, int channels, int samples)
   if (!env || read_config_file(env)<0) {
     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_FREEPATS)<0) {
+          return(-1);
+        }
       }
     }
   }