summaryrefslogtreecommitdiffstats
path: root/ext/timidity
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2007-02-13 09:44:20 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2007-02-13 09:44:20 +0000
commit5725e7b3099b5dd12462095da16ec50529936448 (patch)
treedcbef9eb68bfa31b8b173d61488690b661a06e04 /ext/timidity
parentba820cdc34f397f6afd2b1b1181672ba7b66bc0b (diff)
downloadgst-plugins-bad-5725e7b3099b5dd12462095da16ec50529936448.tar.gz
gst-plugins-bad-5725e7b3099b5dd12462095da16ec50529936448.tar.bz2
gst-plugins-bad-5725e7b3099b5dd12462095da16ec50529936448.zip
Add crossreferences to glib/gobject/gstream docs. Also fix typo in timidity.cfg check.
Original commit message from CVS: * configure.ac: * docs/plugins/Makefile.am: Add crossreferences to glib/gobject/gstream docs. Also fix typo in timidity.cfg check. * ext/timidity/gsttimidity.c: (plugin_init): Also build if no config was detected at configure time.
Diffstat (limited to 'ext/timidity')
-rw-r--r--ext/timidity/gsttimidity.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/ext/timidity/gsttimidity.c b/ext/timidity/gsttimidity.c
index 16e7de98..8b8ed316 100644
--- a/ext/timidity/gsttimidity.c
+++ b/ext/timidity/gsttimidity.c
@@ -781,13 +781,18 @@ plugin_init (GstPlugin * plugin)
GST_DEBUG_CATEGORY_INIT (gst_timidity_debug, "timidity",
0, "Timidity plugin");
- /* initialise timidity library, fail loading the plugin if this fails
- * FIXME: check for config location during configure
- */
+ /* initialise timidity library, fail loading the plugin if this fails */
+#ifdef TIMIDITY_CFG
if (mid_init (TIMIDITY_CFG) != 0) {
GST_WARNING ("can't initialize timidity with config: " TIMIDITY_CFG);
return FALSE;
}
+#else
+ if (mid_init ("/etc/timidity.cfg") != 0) {
+ GST_WARNING ("can't initialize timidity with config: /etc/timidity.cfg");
+ return FALSE;
+ }
+#endif
if (!gst_type_find_register (plugin, "audio/midi", GST_RANK_PRIMARY,
gst_timidity_typefind, exts,