Added /usr/share/timidity to the default path
authorSam Lantinga <slouken@libsdl.org>
Sat, 10 Oct 2009 11:07:15 +0000
changeset 437cd21b80e524f
parent 436 8ec227cabdd4
child 438 d04df25b764c
Added /usr/share/timidity to the default path
timidity/common.c
timidity/config.h
timidity/timidity.c
     1.1 --- a/timidity/common.c	Sat Oct 10 10:23:03 2009 +0000
     1.2 +++ b/timidity/common.c	Sat Oct 10 11:07:15 2009 +0000
     1.3 @@ -112,12 +112,18 @@
     1.4        return 0;
     1.5      }
     1.6  
     1.7 -#ifdef DEFAULT_PATH
     1.8    if (pathlist==NULL) {
     1.9      /* Generate path list */
    1.10 +#ifdef DEFAULT_PATH
    1.11      add_to_pathlist(DEFAULT_PATH);
    1.12 +#endif
    1.13 +#ifdef DEFAULT_PATH1
    1.14 +    add_to_pathlist(DEFAULT_PATH1);
    1.15 +#endif
    1.16 +#ifdef DEFAULT_PATH2
    1.17 +    add_to_pathlist(DEFAULT_PATH2);
    1.18 +#endif
    1.19    }
    1.20 -#endif
    1.21  
    1.22    /* First try the given name */
    1.23  
     2.1 --- a/timidity/config.h	Sat Oct 10 10:23:03 2009 +0000
     2.2 +++ b/timidity/config.h	Sat Oct 10 11:07:15 2009 +0000
     2.3 @@ -171,12 +171,13 @@
     2.4     then specify the library directory in the configuration file. */
     2.5  #define CONFIG_FILE	"timidity.cfg"
     2.6  #define CONFIG_FILE_ETC "/etc/timidity.cfg"
     2.7 -#define CONFIG_FILE_ETC_TIMIDITY "/etc/timidity/timidity.cfg"
     2.8  
     2.9  #if defined(__WIN32__) || defined(__OS2__)
    2.10  #define DEFAULT_PATH	"C:\\TIMIDITY"
    2.11  #else
    2.12 -#define DEFAULT_PATH	"/usr/local/lib/timidity"
    2.13 +#define DEFAULT_PATH	"/etc/timidity"
    2.14 +#define DEFAULT_PATH1	"/usr/share/timidity"
    2.15 +#define DEFAULT_PATH2	"/usr/local/lib/timidity"
    2.16  #endif
    2.17  
    2.18  /* These affect general volume */
     3.1 --- a/timidity/timidity.c	Sat Oct 10 10:23:03 2009 +0000
     3.2 +++ b/timidity/timidity.c	Sat Oct 10 11:07:15 2009 +0000
     3.3 @@ -298,9 +298,7 @@
     3.4    if (!env || read_config_file(env)<0) {
     3.5      if (read_config_file(CONFIG_FILE)<0) {
     3.6        if (read_config_file(CONFIG_FILE_ETC)<0) {
     3.7 -        if (read_config_file(CONFIG_FILE_ETC_TIMIDITY)<0) {
     3.8 -          return(-1);
     3.9 -        }
    3.10 +        return(-1);
    3.11        }
    3.12      }
    3.13    }