ext/timidity/gstwildmidi.*:

Original commit message from CVS:
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:
This commit is contained in:
Stefan Kost 2007-08-15 13:26:57 +00:00
parent acf2b8fb5b
commit 924229d902
3 changed files with 27 additions and 1 deletions

View file

@ -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):

View file

@ -158,6 +158,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

View file

@ -52,7 +52,7 @@ struct _GstWildmidi
GstPad *sinkpad, *srcpad;
gboolean initialized;
/* input stream properties */
gint64 mididata_size, mididata_offset;
gchar *mididata;