From 5725e7b3099b5dd12462095da16ec50529936448 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 13 Feb 2007 09:44:20 +0000 Subject: 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. --- ext/timidity/gsttimidity.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'ext') 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, -- cgit v1.2.1