ext/xine/: add first version of xine plugin wrapper. Currently only wraps the

Original commit message from CVS:
2004-02-20  Benjamin Otte  <otte@gnome.org>

* ext/xine/Makefile.am:
* ext/xine/gstxine.h:
* ext/xine/xine.c:
* ext/xine/xineaudiodec.c:
* ext/xine/xinecaps.c:
add first version of xine plugin wrapper. Currently only wraps the
QDM2 win32 DLL, and even that only in proof-of-concept quality.
* configure.ac:
* ext/Makefile.am:
add xine plugin wrapper, disabled by default. Use --enable-xine to
build. Note that it'll segfault on gst-register if you don't remove
the goom and tvtime post plugins from xine.
* gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_sink_event),
(qtdemux_parse), (qtdemux_parse_trak), (qtdemux_audio_caps):
add extradata parsing for QDM2.
change around debugging prints.

diff --git a/ChangeLog b/ChangeLog
index 3fae7f2..76a1f9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2004-02-20  Benjamin Otte  <otte@gnome.org>
+
+       * ext/xine/Makefile.am:
+       * ext/xine/gstxine.h:
+       * ext/xine/xine.c: 
+       * ext/xine/xineaudiodec.c: 
+       * ext/xine/xinecaps.c: 
+         add first version of xine plugin wrapper. Currently only wraps the
+         QDM2 win32 DLL, and even that only in proof-of-concept quality.
+       * configure.ac:
+       * ext/Makefile.am:
+         add xine plugin wrapper, disabled by default. Use --enable-xine to
+         build. Note that it'll segfault on gst-register if you don't remove
+         the goom and tvtime post plugins from xine.
+       * gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_sink_event),
+       (qtdemux_parse), (qtdemux_parse_trak), (qtdemux_audio_caps):
+         add extradata parsing for QDM2.
+         change around debugging prints.
+
 2004-02-19  Benjamin Otte  <otte@gnome.org>
 
        * ext/lame/gstlame.c: (gst_lame_chain):

diff --git a/configure.ac b/configure.ac
index 3626b82..4631797 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1320,6 +1320,14 @@ vorbis_synthesis_restart (v);
   CFLAGS="$ac_cflags_save"
 fi
 
+dnl *** xine ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_XINE, true)
+GST_CHECK_FEATURE(XINE, [xine wrapper], xine, [
+  PKG_CHECK_MODULES(XINE, libxine >= 1.0.0, HAVE_XINE=yes, HAVE_XINE=no)
+  AC_SUBST(XINE_CFLAGS)
+  AC_SUBST(XINE_LIBS)
+],disabled)
+
 dnl *** XVID ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true)
 GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
@@ -1664,6 +1672,7 @@ ext/swfdec/Makefile
 ext/tarkin/Makefile
 ext/theora/Makefile
 ext/vorbis/Makefile
+ext/xine/Makefile
 ext/xvid/Makefile
 gst-libs/Makefile
 gst-libs/gst/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 4865588..2f51a46 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -310,6 +310,12 @@ else
 SPEEX_DIR=
 endif
 
+if USE_XINE
+XINE_DIR=xine
+else
+XINE_DIR=
+endif
+
 SUBDIRS=\
        $(A52DEC_DIR) \
        $(AALIB_DIR) \
@@ -361,6 +367,7 @@ SUBDIRS=\
        $(THEORA_DIR) \
        $(IVORBIS_DIR) \
        $(VORBIS_DIR) \
+       $(XINE_DIR) \
        $(XVID_DIR)
 
 DIST_SUBDIRS=\
@@ -415,4 +422,5 @@ DIST_SUBDIRS=\
        tarkin \
        theora \
        vorbis \
+       xine \
        xvid