diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2007-02-11 15:46:24 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2007-02-11 15:46:24 +0000 |
| commit | ba820cdc34f397f6afd2b1b1181672ba7b66bc0b (patch) | |
| tree | de04db9a2af94089f5fc93ae2160e169e75cc22b /configure.ac | |
| parent | 711f00bb8870d86762b3735cb5aef727eee6e7c1 (diff) | |
| download | gst-plugins-bad-ba820cdc34f397f6afd2b1b1181672ba7b66bc0b.tar.gz gst-plugins-bad-ba820cdc34f397f6afd2b1b1181672ba7b66bc0b.tar.bz2 gst-plugins-bad-ba820cdc34f397f6afd2b1b1181672ba7b66bc0b.zip | |
Add second midi renderer. Fix some double frees and leaks. Clean up logging.
Original commit message from CVS:
* configure.ac:
* ext/timidity/Makefile.am:
* ext/timidity/gsttimidity.c: (plugin_init):
* ext/timidity/gstwildmidi.c: (gst_wildmidi_base_init),
(gst_wildmidi_class_init), (gst_wildmidi_init),
(gst_wildmidi_src_convert), (gst_wildmidi_src_query),
(gst_wildmidi_get_upstream_size), (gst_wildmidi_get_segment),
(gst_wildmidi_get_new_segment_event), (gst_wildmidi_src_event),
(gst_wildmidi_activate), (gst_wildmidi_activatepull),
(gst_wildmidi_allocate_buffer), (gst_wildmidi_clip_buffer),
(gst_wildmidi_fill_buffer), (gst_wildmidi_get_buffer),
(gst_wildmidi_loop), (gst_wildmidi_change_state),
(gst_wildmidi_set_property), (gst_wildmidi_get_property),
(gst_wildmidi_typefind), (wildmidi_open_config), (plugin_init):
* ext/timidity/gstwildmidi.h:
Add second midi renderer. Fix some double frees and leaks. Clean up
logging.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 64c16278..42181694 100644 --- a/configure.ac +++ b/configure.ac @@ -755,8 +755,27 @@ GST_CHECK_FEATURE(NEON, [neon http client plugins], neonhttpsrc, [ dnl *** timidity *** translit(dnm, m, l) AM_CONDITIONAL(USE_TIMIDITY, true) -GST_CHECK_FEATURE(TIMIDITY, [timidity midie soft synth plugin], timidity, [ - PKG_CHECK_MODULES(TIMIDITY, libtimidity, HAVE_TIMIDITY="yes", [ +GST_CHECK_FEATURE(TIMIDITY, [timidity midi soft synth plugin], timidity, [ + PKG_CHECK_MODULES(TIMIDITY, libtimidity, [ + HAVE_TIMIDITY="yes", + AC_MSG_CHECKING([for timidity.cfg]) + 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 /usr/share/timidity/timidity.cfg; then + timidity_cfg=/usr/share/timidity/timidity.cfg + elif test -r /usr/local/share/timidity/timidity.cfg; then + timidity_cfg=/usr/local/share/timidity/timidity.cfg + fi + if test "x$timidity_cfg" != "x"; then + AC_MSG_RESULT($timidity_cfg) + AC_DEFINE_UNQUOTED(TIMIDITY_CFG, "$timidity_cfg", [Define location of timidity.cfg]) + else + AC_MSG_RESULT([not found]) + fi + ], [ HAVE_TIMIDITY="no" AC_MSG_RESULT(no) ]) @@ -764,6 +783,23 @@ GST_CHECK_FEATURE(TIMIDITY, [timidity midie soft synth plugin], timidity, [ AC_SUBST(TIMIDITY_LIBS) ]) +dnl *** wildmidi *** +translit(dnm, m, l) AM_CONDITIONAL(USE_WILDMIDI, true) +GST_CHECK_FEATURE(WILDMIDI, [wildmidi midi soft synth plugin], wildmidi, [ + AC_CHECK_HEADER([wildmidi_lib.h],HAVE_WILDMIDI=yes, HAVE_WILDMIDI=no) + if test "x$HAVE_WILDMIDI" = "xyes"; then + WILDMIDI_CFLAGS= + WILDMIDI_LIBS=-lWildMidi + AC_MSG_NOTICE(compiling gstWildMidi) + else + WILDMIDI_CFLAGS= + WILDMIDI_LIBS= + AC_MSG_WARN(no WildMidi library found (libWildMidi)) + fi + AC_SUBST(WILDMIDI_CFLAGS) + AC_SUBST(WILDMIDI_LIBS) +]) + dnl *** SDL *** translit(dnm, m, l) AM_CONDITIONAL(USE_SDL, true) GST_CHECK_FEATURE(SDL, [SDL plug-in], sdlvideosink sdlaudiosink, [ |