diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/timidity/gstwildmidi.c | 18 | ||||
| -rw-r--r-- | ext/timidity/gstwildmidi.h | 2 |
3 files changed, 27 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2007-08-15 Stefan Kost <ensonic@users.sf.net> + + reviewed by: <delete if not using a buddy> + patch by: <delete if not someone else's patch> + + * ext/timidity/gstwildmidi.c: + * ext/timidity/gstwildmidi.h: + 2007-08-14 Wim Taymans <wim.taymans@gmail.com> * gst-libs/gst/app/gstappsink.c: (gst_app_sink_flush_unlocked): diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c index 8da7a5f4..16b9f172 100644 --- a/ext/timidity/gstwildmidi.c +++ b/ext/timidity/gstwildmidi.c @@ -159,6 +159,24 @@ wildmidi_open_config () } if (path == NULL) { + path = g_strdup (TIMIDITY_CFG); + GST_DEBUG ("trying %s", path); + if (path && (g_access (path, R_OK) == -1)) { + g_free (path); + path = NULL; + } + } + + if (path == NULL) { + path = g_build_path (G_DIR_SEPARATOR_S, "/etc", "timidity.cfg", NULL); + GST_DEBUG ("trying %s", path); + if (path && (g_access (path, R_OK) == -1)) { + g_free (path); + path = NULL; + } + } + + 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 diff --git a/ext/timidity/gstwildmidi.h b/ext/timidity/gstwildmidi.h index 54189572..ff9320a8 100644 --- a/ext/timidity/gstwildmidi.h +++ b/ext/timidity/gstwildmidi.h @@ -52,7 +52,7 @@ struct _GstWildmidi GstPad *sinkpad, *srcpad; gboolean initialized; - + /* input stream properties */ gint64 mididata_size, mididata_offset; gchar *mididata; |