ext/timidity/gstwildmidi.c: If WILDMIDI_CFG is not defined, define it to the default timidity configure file.

Original commit message from CVS:
* ext/timidity/gstwildmidi.c:
If WILDMIDI_CFG is not defined, define it to the default
timidity configure file.
This commit is contained in:
Sebastian Dröge 2008-02-22 06:31:44 +00:00
parent b750dbd5ef
commit 9ab72bf599
3 changed files with 13 additions and 3 deletions

View file

@ -1,3 +1,9 @@
2008-02-22 Sebastian Dröge <slomo@circular-chaos.org>
* ext/timidity/gstwildmidi.c:
If WILDMIDI_CFG is not defined, define it to the default
timidity configure file.
2008-02-22 Sebastian Dröge <slomo@circular-chaos.org>
Based on a patch by:

2
common

@ -1 +1 @@
Subproject commit 2a19465fdb43a75f4d32950fd2beb1beb950eec2
Subproject commit 84c6d3efac27669ad45856ebe84a17d33359dc36

View file

@ -58,6 +58,10 @@
#include "gstwildmidi.h"
#ifndef WILDMIDI_CFG
#define WILDMIDI_CFG "/etc/timidity.cfg"
#endif
GST_DEBUG_CATEGORY_STATIC (gst_wildmidi_debug);
#define GST_CAT_DEFAULT gst_wildmidi_debug
@ -159,7 +163,7 @@ wildmidi_open_config ()
}
if (path == NULL) {
path = g_strdup (TIMIDITY_CFG);
path = g_strdup (WILDMIDI_CFG);
GST_DEBUG ("trying %s", path);
if (path && (g_access (path, R_OK) == -1)) {
g_free (path);
@ -179,7 +183,7 @@ wildmidi_open_config ()
if (path == NULL) {
/* I've created a symlink to get it playing
* ln -s /usr/share/timidity/timidity.cfg /etc/wildmidi.cfg
* we could make it use : TIMIDITY_CFG
* we could make it use : WILDMIDI_CFG
* but unfortunately it fails to create a proper filename if the config
* has a redirect
* http://sourceforge.net/tracker/index.php?func=detail&aid=1657358&group_id=42635&atid=433744