diff options
| author | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2005-05-09 20:09:44 +0000 |
|---|---|---|
| committer | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2005-05-09 20:09:44 +0000 |
| commit | 9a629cf2240d415c86eb529cb5ddaf6630d494a7 (patch) | |
| tree | 78478236ad4911ef87c4fdaec23b47b14f773cc0 | |
| parent | 943bb6034d04128af2d0990b2fceef6715363292 (diff) | |
| download | gst-plugins-bad-9a629cf2240d415c86eb529cb5ddaf6630d494a7.tar.gz gst-plugins-bad-9a629cf2240d415c86eb529cb5ddaf6630d494a7.tar.bz2 gst-plugins-bad-9a629cf2240d415c86eb529cb5ddaf6630d494a7.zip | |
Port shout2 plugin
Original commit message from CVS:
2005-05-09 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* PORTED_09:
* configure.ac:
* ext/Makefile.am:
* ext/shout2/Makefile.am:
* ext/shout2/gstshout2.c: (gst_shout2send_get_type),
(gst_shout2send_base_init), (gst_shout2send_class_init),
(gst_shout2send_init), (gst_shout2send_event),
(gst_shout2send_render), (gst_shout2send_set_property),
(gst_shout2send_get_property), (gst_shout2send_setcaps),
(gst_shout2send_change_state):
* ext/shout2/gstshout2.h:
Port shout2 plugin
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | PORTED_09 | 1 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | ext/Makefile.am | 11 |
4 files changed, 38 insertions, 5 deletions
@@ -1,3 +1,19 @@ +2005-05-09 Zaheer Abbas Merali <zaheerabbas at merali dot org> + + * PORTED_09: + * configure.ac: + * ext/Makefile.am: + * ext/shout2/Makefile.am: + * ext/shout2/gstshout2.c: (gst_shout2send_get_type), + (gst_shout2send_base_init), (gst_shout2send_class_init), + (gst_shout2send_init), (gst_shout2send_event), + (gst_shout2send_render), (gst_shout2send_set_property), + (gst_shout2send_get_property), (gst_shout2send_setcaps), + (gst_shout2send_change_state): + * ext/shout2/gstshout2.h: + + Port shout2 plugin + 2005-05-08 Zeeshan Ali <zeenix@gmail.com> * configure.ac: @@ -7,6 +7,7 @@ videofilter (wim) aalib (wim) libcaca (zeeshan) law (wim) +shout2 (zaheer) - not fully tested osssink is partially done in the threaded branch (wim) diff --git a/configure.ac b/configure.ac index 0616b1b0..81efea0b 100644 --- a/configure.ac +++ b/configure.ac @@ -380,6 +380,20 @@ GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [ AC_SUBST(LIBCACA_LIBS) ]) +dnl *** shout2 *** +translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true) +GST_CHECK_FEATURE(SHOUT2, [shout2 plug-in], shout2send, [ + PKG_CHECK_MODULES(SHOUT2, shout >= 2.0, [ + HAVE_SHOUT2="yes" + AC_SUBST(SHOUT2_CFLAGS) + AC_SUBST(SHOUT2_LIBS) + ], [ + AM_PATH_SHOUT2(HAVE_SHOUT2="yes", HAVE_SHOUT2="no") + AC_SUBST(SHOUT2_CFLAGS) + AC_SUBST(SHOUT2_LIBS) + ]) +]) + dnl *** sidplay : works with libsidplay 1.36.x (not 2.x.x) *** translit(dnm, m, l) AM_CONDITIONAL(USE_SIDPLAY, true) GST_CHECK_FEATURE(SIDPLAY, [sidplay plug-in], sidplay, [ @@ -468,6 +482,7 @@ ext/Makefile ext/aalib/Makefile ext/libcaca/Makefile ext/mad/Makefile +ext/shout2/Makefile ext/sidplay/Makefile common/Makefile common/m4/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index cf98aff5..4dcefb2d 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -310,11 +310,11 @@ endif # SHOUT_DIR= # endif -# if USE_SHOUT2 -# SHOUT2_DIR=shout2 -# else -# SHOUT2_DIR= -# endif +if USE_SHOUT2 +SHOUT2_DIR=shout2 +else +SHOUT2_DIR= +endif if USE_SIDPLAY SIDPLAY_DIR=sidplay @@ -444,6 +444,7 @@ SUBDIRS=\ DIST_SUBDIRS=\ mad \ + shout2 \ sidplay \ aalib \ libcaca |