Attachment 3063 Details for Bug 17846 – SDL_mixer-1.2.8-alt-timidity.patch

[patch] SDL_mixer-1.2.8-alt-timidity.patch

SDL_mixer-1.2.8-alt-timidity.patch (text/plain), 1.38 KB, created by Valery Inozemtsev on 2008-11-10 21:00:14 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Valery Inozemtsev

Created: 2008-11-10 21:00:14 MSK

Size: 1.38 KB

patch

obsolete

>--- SDL_mixer-1.2.8/timidity/config.h.alt	2007-07-02 06:03:51 +0400
>+++ SDL_mixer-1.2.8/timidity/config.h	2008-11-10 20:57:14 +0300
>@@ -167,16 +167,10 @@ typedef char int8;
> 
> #define MAX_AMPLIFICATION 800
> 
>-/* 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"
>-#define CONFIG_FILE_ETC_TIMIDITY "/etc/timidity/timidity.cfg"
>-
> #if defined(__WIN32__) || defined(__OS2__)
> #define DEFAULT_PATH	"\\TIMIDITY"
> #else
>-#define DEFAULT_PATH	"/usr/local/lib/timidity"
>+#define DEFAULT_PATH	"/usr/share/timidity"
> #endif
> 
> /* These affect general volume */
>--- SDL_mixer-1.2.8/timidity/timidity.c.alt	2007-07-02 06:03:52 +0400
>+++ SDL_mixer-1.2.8/timidity/timidity.c	2008-11-10 20:56:21 +0300
>@@ -294,12 +294,13 @@ 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) {
>-    if (read_config_file(CONFIG_FILE_ETC)<0) {
>-      if (read_config_file(CONFIG_FILE_ETC_TIMIDITY)<0) {
>-        return(-1);
>-      }
>-    }
>+  char cfgfile[PATH_MAX];
>+
>+  strcpy(cfgfile, DEFAULT_PATH);
>+  strcat(cfgfile, "/midia.cfg");
>+
>+  if (read_config_file(cfgfile) < 0) {
>+    return(-1);
>   }
> 
>   if (channels < 1 || channels == 3 || channels == 5 || channels > 6) return(-1);

Actions: View | Diff

Attachments on bug 17846: 3063