ext/timidity/gstwildmidi.c: Check some more common locations for a valid configuration file.
Original commit message from CVS: * ext/timidity/gstwildmidi.c: (wildmidi_open_config): Check some more common locations for a valid configuration file. Fixes bug #533435. Packagers should still #define WILDMIDI_CFG to the distributions default location.
This commit is contained in:
parent
5a00cae46f
commit
67515f39fc
@ -1,3 +1,10 @@
|
|||||||
|
2008-05-16 Sebastian Dröge <slomo@circular-chaos.org>
|
||||||
|
|
||||||
|
* ext/timidity/gstwildmidi.c: (wildmidi_open_config):
|
||||||
|
Check some more common locations for a valid configuration file.
|
||||||
|
Fixes bug #533435. Packagers should still #define WILDMIDI_CFG
|
||||||
|
to the distributions default location.
|
||||||
|
|
||||||
2008-05-16 Sebastian Dröge <slomo@circular-chaos.org>
|
2008-05-16 Sebastian Dröge <slomo@circular-chaos.org>
|
||||||
|
|
||||||
* gst/interleave/Makefile.am:
|
* gst/interleave/Makefile.am:
|
||||||
|
@ -162,6 +162,17 @@ wildmidi_open_config ()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (path == NULL) {
|
||||||
|
path =
|
||||||
|
g_build_path (G_DIR_SEPARATOR_S, "/etc", "wildmidi", "wildmidi.cfg",
|
||||||
|
NULL);
|
||||||
|
GST_DEBUG ("trying %s", path);
|
||||||
|
if (path && (g_access (path, R_OK) == -1)) {
|
||||||
|
g_free (path);
|
||||||
|
path = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (path == NULL) {
|
if (path == NULL) {
|
||||||
path = g_strdup (WILDMIDI_CFG);
|
path = g_strdup (WILDMIDI_CFG);
|
||||||
GST_DEBUG ("trying %s", path);
|
GST_DEBUG ("trying %s", path);
|
||||||
@ -180,6 +191,17 @@ wildmidi_open_config ()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (path == NULL) {
|
||||||
|
path =
|
||||||
|
g_build_path (G_DIR_SEPARATOR_S, "/etc", "timidity", "timidity.cfg",
|
||||||
|
NULL);
|
||||||
|
GST_DEBUG ("trying %s", path);
|
||||||
|
if (path && (g_access (path, R_OK) == -1)) {
|
||||||
|
g_free (path);
|
||||||
|
path = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (path == NULL) {
|
if (path == NULL) {
|
||||||
/* I've created a symlink to get it playing
|
/* I've created a symlink to get it playing
|
||||||
* ln -s /usr/share/timidity/timidity.cfg /etc/wildmidi.cfg
|
* ln -s /usr/share/timidity/timidity.cfg /etc/wildmidi.cfg
|
||||||
|
Loading…
x
Reference in New Issue
Block a user