search for: have_gst

...(default=no)])], + enable_gstreamer=$enableval, + enable_gstreamer="no") + +if test "$enable_gstreamer" = "yes"; then + dnl I used my own version here, it might work with lower versions + GST_REQUIRED=0.10.10 + PKG_CHECK_MODULES(GST, gstreamer-0.10 >= $GST_REQUIRED, HAVE_GST=yes, HAVE_GST=no) + if test "x$HAVE_GST" = xyes; then + AC_DEFINE(HAVE_GST, 1, [Define if GStreamer is enabled]) + else + AC_MSG_ERROR([Couldn't find GStreamer $GST_REQUIRED.]) + fi +else + AC_MSG_WARN([*** GStreamer support was not enabled. ***]) +fi +AM_CONDITIONAL(HAVE_GST, [te...

...C_ARG_ENABLE(gstreamer, enable_gstreamer="yes") if test "$enable_gstreamer" = "yes"; then - dnl I used my own version here, it might work with lower versions - GST_REQUIRED=0.10.10 + GST_REQUIRED=0.10.11 PKG_CHECK_MODULES(GST, gstreamer-0.10 >= $GST_REQUIRED, HAVE_GST=yes, HAVE_GST=no) if test "x$HAVE_GST" = xyes; then AC_DEFINE(HAVE_GST, 1, [Define if GStreamer is enabled]) diff-tree 3b51123d377a1157fb2780e0e4282eb55240ded5 (from 783b6d178d9fe4a6f50fbc55031fb9cd5e139708) Author: Benjamin Otte <otte@gnome.org> Date: Tue Apr 17 15:22:48 20...

...; + + return ret; +} + +struct { + const char * name; + SwfdecAudioDecoder * (* func) (SwfdecAudioCodec, SwfdecAudioFormat); +} audio_codecs[] = { + { "builtin", swfdec_audio_decoder_builtin_new }, +#ifdef HAVE_MAD + { "mad", swfdec_audio_decoder_mad_new }, +#endif +#ifdef HAVE_GST + { "gst", swfdec_audio_decoder_gst_new }, +#endif +#ifdef HAVE_FFMPEG + { "ffmpeg", swfdec_audio_decoder_ffmpeg_new }, +#endif + { NULL, } +}; + /** * swfdec_audio_decoder_new: * @format: #SwfdecAudioCodec to decode @@ -122,24 +151,37 @@ SwfdecAudioDecoder * swfdec_aud...

...fdec/swfdec_codec_audio.c @@ -126,12 +126,12 @@ struct { SwfdecAudioDecoder * (* func) (SwfdecAudioCodec, SwfdecAudioFormat); } audio_codecs[] = { { "builtin", swfdec_audio_decoder_builtin_new }, -#ifdef HAVE_MAD - { "mad", swfdec_audio_decoder_mad_new }, -#endif #ifdef HAVE_GST { "gst", swfdec_audio_decoder_gst_new }, #endif +#ifdef HAVE_MAD + { "mad", swfdec_audio_decoder_mad_new }, +#endif #ifdef HAVE_FFMPEG { "ffmpeg", swfdec_audio_decoder_ffmpeg_new }, #endif diff --git a/libswfdec/swfdec_codec_video.c b/libswfdec/swfdec_codec_v...

...udioCodec codec, SwfdecAudioFormat form struct { const char * name; - SwfdecAudioDecoder * (* func) (SwfdecAudioCodec, SwfdecAudioFormat); + SwfdecAudioDecoder * (* func) (guint, SwfdecAudioFormat); } audio_codecs[] = { { "builtin", swfdec_audio_decoder_builtin_new }, #ifdef HAVE_GST @@ -148,7 +148,7 @@ struct { * Returns: a new decoder or %NULL **/ SwfdecAudioDecoder * -swfdec_audio_decoder_new (SwfdecAudioCodec codec, SwfdecAudioFormat format) +swfdec_audio_decoder_new (guint codec, SwfdecAudioFormat format) { SwfdecAudioDecoder *ret; const char *list; diff --git...

...switch (format) { - case SWFDEC_VIDEO_FORMAT_SCREEN: - return &swfdec_codec_screen; -#ifdef HAVE_FFMPEG - return &swfdec_codec_ffmpeg_video; -#endif - SWFDEC_ERROR ("Screen video requires ffmpeg"); - return NULL; - case SWFDEC_VIDEO_FORMAT_H263: -#ifdef HAVE_GST - return &swfdec_codec_gst_video; -#else -#ifdef HAVE_FFMPEG - return &swfdec_codec_ffmpeg_video; -#else - SWFDEC_ERROR ("H263 video requires ffmpeg or GStreamer"); - return NULL; -#endif -#endif - case SWFDEC_VIDEO_FORMAT_VP6: -#ifdef HAVE_GST - return...

...AT_SCREEN: return &swfdec_codec_screen; #ifdef HAVE_FFMPEG - return &swfdec_codec_ffmpeg_screen; + return &swfdec_codec_ffmpeg_video; #endif SWFDEC_ERROR ("Screen video requires ffmpeg"); return NULL; case SWFDEC_VIDEO_FORMAT_H263: #ifdef HAVE_GST - return &swfdec_codec_gst_h263; + return &swfdec_codec_gst_video; #else #ifdef HAVE_FFMPEG - return &swfdec_codec_ffmpeg_h263; + return &swfdec_codec_ffmpeg_video; #else SWFDEC_ERROR ("H263 video requires ffmpeg or GStreamer"); return...

...streamer, @@ -243,7 +243,7 @@ if test "$enable_gstreamer" = "yes"; then AC_MSG_ERROR([Couldn't find GStreamer $GST_REQUIRED.]) fi else - AC_MSG_WARN([*** GStreamer support was not enabled. ***]) + AC_MSG_NOTICE([GStreamer support was not enabled.]) fi AM_CONDITIONAL(HAVE_GST, [test "x$HAVE_GST" = xyes]) @@ -262,7 +262,7 @@ if test "$enable_libsoup" = "yes"; then AC_MSG_ERROR([Couldn't find libsoup-2.2.]) fi else - AC_MSG_WARN([*** libsoup HTTP support was not enabled. ***]) + AC_MSG_NOTICE([libsoup HTTP support was not enabled...

...der; } -/*** DECODER LIST ***/ - -extern SwfdecAudioDecoderNewFunc swfdec_audio_decoder_adpcm_new; - -#ifdef HAVE_MAD -extern SwfdecAudioDecoderNewFunc swfdec_audio_decoder_mad_new; -#endif - -#ifdef HAVE_FFMPEG -extern SwfdecAudioDecoderNewFunc swfdec_audio_decoder_ffmpeg_new; -#endif - -#ifdef HAVE_GST -extern SwfdecAudioDecoderNewFunc swfdec_audio_decoder_gst_new; -#endif - /*** PUBLIC API ***/ /** diff --git a/libswfdec/swfdec_codec_ffmpeg.c b/libswfdec/swfdec_codec_ffmpeg.c index c80f117..3f9e387 100644 --- a/libswfdec/swfdec_codec_ffmpeg.c +++ b/libswfdec/swfdec_codec_ffmpeg.c @@ -27,6 +2...

...#if 0 #ifdef HAVE_MAD if (ret == NULL) ret = swfdec_audio_decoder_mad_new (format, width, data_format); @@ -145,12 +150,11 @@ swfdec_audio_decoder_new (SwfdecAudioFor if (ret == NULL) ret = swfdec_audio_decoder_ffmpeg_new (format, width, data_format); #endif -#if 0 +#endif #ifdef HAVE_GST if (ret == NULL) ret = swfdec_audio_decoder_gst_new (format, width, data_format); #endif -#endif if (ret) { ret->format = format; g_return_val_if_fail (ret->out_format != 0, NULL); diff --git a/libswfdec/swfdec_codec_gst.c b/libswfdec/swfdec_codec_gst.c index cd4f517..64...

...Author: Benjamin Otte <otte at gnome.org> Date: Thu Aug 2 09:26:14 2007 +0200 Change the gtk loader to use libsoup instead of gnome-vfs diff --git a/configure.ac b/configure.ac index e2336c5..9abfa49 100644 --- a/configure.ac +++ b/configure.ac @@ -246,21 +246,21 @@ fi AM_CONDITIONAL(HAVE_GST, [test "x$HAVE_GST" = xyes]) -AC_ARG_ENABLE(gnome-vfs, - AS_HELP_STRING([--enable-gnome-vfs], - [enable gnome-vfs support for swfdec-gtk (default=yes)])], - enable_gnomevfs=$enableval, - enable_gnomevfs="yes") +AC_ARG_ENABLE(soup, + AS_HELP_STRING([--enable-soup], + [ena...

...dc353 (from f6c05239c8677f0e1675e8eb685e5590178ecbdf) Author: Benjamin Otte <otte at gnome.org> Date: Thu Oct 11 16:21:43 2007 +0200 fix typo diff --git a/configure.ac b/configure.ac index 6abc3ff..f33c09b 100644 --- a/configure.ac +++ b/configure.ac @@ -249,7 +249,7 @@ AM_CONDITIONAL(HAVE_GST, [test "x$HAVE_G AC_ARG_ENABLE(soup, AS_HELP_STRING([--enable-soup], - [enable libaoup HTTP support for swfdec-gtk (default=yes)])], + [enable libsoup HTTP support for swfdec-gtk (default=yes)])], enable_libsoup=$enableval, enable_libsoup="yes") diff-tree f6c05239c8677...

...a/libswfdec/Makefile.am b/libswfdec/Makefile.am index fa1abb6..352d46b 100644 --- a/libswfdec/Makefile.am +++ b/libswfdec/Makefile.am @@ -4,15 +4,15 @@ DIST_SUBDIRS = jpeg js CODECS = -if HAVE_MAD -CODECS += swfdec_codec_mad.c -endif if HAVE_FFMPEG CODECS += swfdec_codec_ffmpeg.c endif if HAVE_GST CODECS += swfdec_codec_gst.c endif +if HAVE_MAD +CODECS += swfdec_codec_mad.c +endif lib_LTLIBRARIES = libswfdec-@SWFDEC_MAJORMINOR@.la @@ -31,8 +31,8 @@ libswfdec_@SWFDEC_MAJORMINOR@_la_SOURCES swfdec_cache.c \ swfdec_cached.c \ swfdec_character.c \ - swfdec_codec.c \ swfdec_codec_a...

...table Gtk version. You need at least version $GTK_VER]) - fi + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_VER libsoup-2.2 >= 2.2.0, HAVE_GTK=yes) + AC_DEFINE(HAVE_GTK, 1, [Define if Gtk is enabled]) else AC_MSG_NOTICE([Gtk support was not enabled.]) fi @@ -266,24 +262,6 @@ fi AM_CONDITIONAL(HAVE_GST, [test "x$HAVE_GST" = xyes]) -AC_ARG_ENABLE(soup, - AS_HELP_STRING([--enable-soup], - [enable libsoup HTTP support for swfdec-gtk (default=yes)])], - enable_libsoup=$enableval, - enable_libsoup="yes") - -if test "$enable_libsoup" = "yes"; then - PKG_CHE...