From 8bc076ee6e45285d1c4908e2355dc1d51fc55b2b Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Sat, 12 Apr 2008 23:30:54 +0000 Subject: [PATCH] Move soup plugin from -bad (Fixes: #523124) Original commit message from CVS: * configure.ac: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-good-plugins-docs.sgml: * docs/plugins/gst-plugins-good-plugins-sections.txt: * docs/plugins/gst-plugins-good-plugins.args: * docs/plugins/inspect/plugin-soup.xml: * ext/Makefile.am: * tests/check/Makefile.am: Move soup plugin from -bad (Fixes: #523124) --- ChangeLog | 12 ++ configure.ac | 13 ++ docs/plugins/Makefile.am | 1 + docs/plugins/gst-plugins-good-plugins-docs.sgml | 2 + docs/plugins/gst-plugins-good-plugins-sections.txt | 14 ++ docs/plugins/gst-plugins-good-plugins.args | 170 ++++++++++++++++++++- docs/plugins/inspect/plugin-soup.xml | 28 ++++ ext/Makefile.am | 8 + tests/check/Makefile.am | 10 ++ 9 files changed, 253 insertions(+), 5 deletions(-) create mode 100644 docs/plugins/inspect/plugin-soup.xml diff --git a/ChangeLog b/ChangeLog index 8cd7d48..a88fd45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-04-13 Jan Schmidt + + * configure.ac: + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-good-plugins-docs.sgml: + * docs/plugins/gst-plugins-good-plugins-sections.txt: + * docs/plugins/gst-plugins-good-plugins.args: + * docs/plugins/inspect/plugin-soup.xml: + * ext/Makefile.am: + * tests/check/Makefile.am: + Move soup plugin from -bad (Fixes: #523124) + 2008-04-11 Jan Schmidt * ext/speex/gstspeexdec.c: (speex_dec_chain_parse_header): diff --git a/configure.ac b/configure.ac index dbb1a8c..c7cdf43 100644 --- a/configure.ac +++ b/configure.ac @@ -848,6 +848,17 @@ AG_GST_CHECK_FEATURE(SHOUT2, [Shoutcast/Icecast client library], shout2, [ fi ]) +dnl *** soup *** +translit(dnm, m, l) AM_CONDITIONAL(USE_SOUP, true) +AG_GST_CHECK_FEATURE(SOUP, [soup http client plugin (2.4)], souphttpsrc, [ + PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.3.2, HAVE_SOUP="yes", [ + HAVE_SOUP="no" + AC_MSG_RESULT(no) + ]) + AC_SUBST(SOUP_CFLAGS) + AC_SUBST(SOUP_LIBS) +]) + dnl *** speex >= 1.0.4 or >= 1.1.5 *** dnl 1.1.4 and earlier were not API/ABI compatible with 1.0 dnl 1.1.6 is the first to use a .pc/pkg-config file *** @@ -957,6 +968,7 @@ AM_CONDITIONAL(USE_LIBDV, false) AM_CONDITIONAL(USE_LIBPNG, false) AM_CONDITIONAL(USE_DV1394, false) AM_CONDITIONAL(USE_SHOUT2, false) +AM_CONDITIONAL(USE_SOUP, false) AM_CONDITIONAL(USE_SPEEX, false) AM_CONDITIONAL(USE_TAGLIB, false) AM_CONDITIONAL(USE_WAVPACK, false) @@ -1074,6 +1086,7 @@ ext/libcaca/Makefile ext/libpng/Makefile ext/raw1394/Makefile ext/shout2/Makefile +ext/soup/Makefile ext/speex/Makefile ext/taglib/Makefile ext/wavpack/Makefile diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 35b85a9..f9fde20 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -95,6 +95,7 @@ EXTRA_HFILES = \ $(top_srcdir)/ext/jpeg/gstsmokeenc.h \ $(top_srcdir)/ext/libpng/gstpngdec.h \ $(top_srcdir)/ext/libpng/gstpngenc.h \ + $(top_srcdir)/ext/soup/gstsouphttpsrc.h \ $(top_srcdir)/ext/taglib/gstapev2mux.h \ $(top_srcdir)/ext/taglib/gstid3v2mux.h \ $(top_srcdir)/ext/taglib/gsttaglibmux.h \ diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml index ef6e43d..7c37e7d 100644 --- a/docs/plugins/gst-plugins-good-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml @@ -71,6 +71,7 @@ + @@ -138,6 +139,7 @@ + diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index 2fff3ae..f873451 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -881,6 +881,20 @@ GST_IS_RTP_DEC_CLASS
+element-souphttpsrc +souphttpsrc +GstSoupHTTPSrc + +GstSoupHTTPSrcClass +GST_SOUP_HTTP_SRC +GST_SOUP_HTTP_SRC_CLASS +GST_IS_SOUP_HTTP_SRC +GST_IS_SOUP_HTTP_SRC_CLASS +GST_TYPE_SOUP_HTTP_SRC +gst_soup_http_src_get_type +
+ +
element-smokedec smokedec GstSmokeDec diff --git a/docs/plugins/gst-plugins-good-plugins.args b/docs/plugins/gst-plugins-good-plugins.args index d9d3380..4bfc061 100644 --- a/docs/plugins/gst-plugins-good-plugins.args +++ b/docs/plugins/gst-plugins-good-plugins.args @@ -214,7 +214,7 @@ rw Bands -number of frequency bands. +Number of frequency bands. 128 @@ -234,7 +234,7 @@ rw Message -Post a level message for each passed interval. +Whether to post a 'spectrum' element message on the bus for each passed interval. TRUE @@ -254,7 +254,7 @@ rw Magnitude -Post the magnitude of the spectrum. +Whether to add a 'magnitude' field to the structure of any 'spectrum' element messages posted on the bus. TRUE @@ -264,7 +264,7 @@ rw Phase -Post the phase of the spectrum. +Whether to add a 'phase' field to the structure of any 'spectrum' element messages posted on the bus. FALSE @@ -1195,7 +1195,7 @@ rw driver driver. -X11 driver 1.1 +Curses driver 1.0 @@ -17928,3 +17928,163 @@ + +GstOsxAudioSink::device +gint +>= 0 +rw +Device ID +Device ID of output device. +0 + + + +GstOsxAudioSrc::device +gint +>= 0 +rw +Device ID +Device ID of input device. +0 + + + +GstOSXVideoSink::embed +gboolean + +rw +embed +When enabled, it can be embedded. +FALSE + + + +GstOSXVideoSink::fullscreen +gboolean + +rw +fullscreen +When enabled, the view is fullscreen. +FALSE + + + +GstGdkPixbufSink::last-pixbuf +GdkPixbuf* + +r +Last Pixbuf +Last GdkPixbuf object rendered. + + + + +GstGdkPixbufSink::send-messages +gboolean + +rw +Send Messages +Whether to post messages containing pixbufs on the bus. +TRUE + + + +GstSoupHTTPSrc::automatic-redirect +gboolean + +rw +automatic-redirect +Automatically follow HTTP redirects (HTTP Status Code 3xx). +TRUE + + + +GstSoupHTTPSrc::cookies +GStrv* + +rw +Cookies +HTTP request cookies. + + + + +GstSoupHTTPSrc::iradio-genre +gchar* + +r +iradio-genre +Genre of the stream. +NULL + + + +GstSoupHTTPSrc::iradio-mode +gboolean + +rw +iradio-mode +Enable internet radio mode (extraction of shoutcast/icecast metadata). +FALSE + + + +GstSoupHTTPSrc::iradio-name +gchar* + +r +iradio-name +Name of the stream. +NULL + + + +GstSoupHTTPSrc::iradio-title +gchar* + +r +iradio-title +Name of currently playing song. +NULL + + + +GstSoupHTTPSrc::iradio-url +gchar* + +r +iradio-url +Homepage URL for radio stream. +NULL + + + +GstSoupHTTPSrc::location +gchar* + +rw +Location +Location to read from. +"" + + + +GstSoupHTTPSrc::proxy +gchar* + +rw +Proxy +HTTP proxy server URI. +"" + + + +GstSoupHTTPSrc::user-agent +gchar* + +rw +User-Agent +Value of the User-Agent HTTP request header field. +"GStreamer souphttpsrc " + + diff --git a/docs/plugins/inspect/plugin-soup.xml b/docs/plugins/inspect/plugin-soup.xml new file mode 100644 index 0000000..4dfa52d --- /dev/null +++ b/docs/plugins/inspect/plugin-soup.xml @@ -0,0 +1,28 @@ + + soup + libsoup HTTP client src + ../../ext/soup/.libs/libgstsouphttpsrc.so + libgstsouphttpsrc.so + 0.10.7.1 + LGPL + gst-plugins-good + GStreamer Good Plug-ins CVS/prerelease + Unknown package origin + + + souphttpsrc + HTTP client source + Source/Network + Receive data as a client over the network via HTTP using SOUP + Wouter Cloetens <wouter@mind.be> + + + src + source + always +
ANY
+ + + + + \ No newline at end of file diff --git a/ext/Makefile.am b/ext/Makefile.am index 8629fbc..77b1cc5 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -106,6 +106,12 @@ else SHOUT2_DIR = endif +if USE_SOUP +SOUP_DIR=soup +else +SOUP_DIR= +endif + if USE_SPEEX SPEEX_DIR = speex else @@ -143,6 +149,7 @@ SUBDIRS = \ $(LIBPNG_DIR) \ $(MIKMOD_DIR) \ $(SHOUT2_DIR) \ + $(SOUP_DIR) \ $(SPEEX_DIR) \ $(TAGLIB_DIR) \ $(WAVPACK_DIR) @@ -164,6 +171,7 @@ DIST_SUBDIRS = \ libpng \ raw1394 \ shout2 \ + soup \ speex \ taglib \ wavpack diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 2e68756..2d8a220 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -32,6 +32,12 @@ else check_gdkpixbuf = endif +if USE_SOUP +check_soup = elements/souphttpsrc +else +check_soup = +endif + if USE_SUNAUDIO check_sunaudio = elements/sunaudio else @@ -82,6 +88,7 @@ check_PROGRAMS = \ elements/videofilter \ pipelines/simple-launch-lines \ $(check_gdkpixbuf) \ + $(check_soup) \ $(check_sunaudio) \ $(check_taglib) \ $(check_wavpack) @@ -120,6 +127,9 @@ elements_cmmlenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS) elements_alphacolor_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS) +elements_souphttpsrc_CFLAGS = $(SOUP_CFLAGS) $(AM_CFLAGS) +elements_souphttpsrc_LDADD = $(SOUP_LIBS) $(LDADD) + elements_sunaudio_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) \ $(AM_CFLAGS) -- 2.7.4