diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | docs/plugins/Makefile.am | 7 | ||||
| -rw-r--r-- | ext/timidity/gsttimidity.c | 11 |
4 files changed, 34 insertions, 8 deletions
@@ -1,3 +1,13 @@ +2007-02-13 Stefan Kost <ensonic@users.sf.net> + + * 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. + 2007-02-11 Stefan Kost <ensonic@users.sf.net> * configure.ac: diff --git a/configure.ac b/configure.ac index 42181694..24a844f1 100644 --- a/configure.ac +++ b/configure.ac @@ -156,7 +156,7 @@ dnl *** checks for compiler characteristics *** dnl *** checks for library functions *** -dnl *** checks for dependancy libraries *** +dnl *** checks for dependency libraries *** dnl GLib is required GST_GLIB_CHECK([2.6]) @@ -184,6 +184,14 @@ dnl check for "check", unit testing library/header AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no) AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") +dnl Check for documentation xrefs +GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" +GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`" +GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_MAJORMINOR`" +AC_SUBST(GLIB_PREFIX) +AC_SUBST(GST_PREFIX) +AC_SUBST(GSTPB_PREFIX) + dnl GTK is optional and used in examples HAVE_GTK=NO PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no) @@ -762,8 +770,8 @@ GST_CHECK_FEATURE(TIMIDITY, [timidity midi soft synth plugin], timidity, [ timidity_cfg="" if test -r /etc/timidity.cfg; then timidity_cfg=/etc/timidity.cfg - elif test -r /etc/timidify/timidity.cfg; then - timidity_cfg=/etc/timidify/timidity.cfg + elif test -r /etc/timidity/timidity.cfg; then + timidity_cfg=/etc/timidity/timidity.cfg elif test -r /usr/share/timidity/timidity.cfg; then timidity_cfg=/usr/share/timidity/timidity.cfg elif test -r /usr/local/share/timidity/timidity.cfg; then diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 8a9c55d6..68e2c23e 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -53,8 +53,11 @@ SCAN_OPTIONS= MKDB_OPTIONS=--sgml-mode --source-suffixes=c,h,cc # Extra options to supply to gtkdoc-fixref. -# FIXME get the location of the installed gstreamer docs -#FIXXREF_OPTIONS=--extra-dir=../gst/html +FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \ + --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \ + --extra-dir=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-@GST_MAJORMINOR@ \ + --extra-dir=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-libs-@GST_MAJORMINOR@ \ + --extra-dir=$(GSTPB_PREFIX)/share/gtk-doc/html/gst-plugins-base-libs-@GST_MAJORMINOR@ # Used for dependencies. HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.h 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, |