diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | docs/plugins/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-good-plugins-docs.sgml | 2 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-good-plugins-sections.txt | 14 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-good-plugins.args | 170 | ||||
| -rw-r--r-- | docs/plugins/inspect/plugin-soup.xml | 28 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/check/Makefile.am | 10 |
9 files changed, 253 insertions, 5 deletions
@@ -1,3 +1,15 @@ +2008-04-13 Jan Schmidt <jan.schmidt@sun.com> + + * 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 <Jan.Schmidt@sun.com> * ext/speex/gstspeexdec.c: (speex_dec_chain_parse_header): diff --git a/configure.ac b/configure.ac index dbb1a8c6..c7cdf433 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 35b85a9f..f9fde20d 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 ef6e43d6..7c37e7d5 100644 --- a/docs/plugins/gst-plugins-good-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml @@ -71,6 +71,7 @@ <xi:include href="xml/element-rtspsrc.xml" /> <xi:include href="xml/element-smokedec.xml" /> <xi:include href="xml/element-smokeenc.xml" /> + <xi:include href="xml/element-souphttpsrc.xml" /> <xi:include href="xml/element-spectrum.xml" /> <xi:include href="xml/element-udpsrc.xml" /> <xi:include href="xml/element-v4l2src.xml" /> @@ -138,6 +139,7 @@ <xi:include href="xml/plugin-rtsp.xml" /> <xi:include href="xml/plugin-shout2send.xml" /> <xi:include href="xml/plugin-smpte.xml" /> + <xi:include href="xml/plugin-soup.xml" /> <xi:include href="xml/plugin-spectrum.xml" /> <xi:include href="xml/plugin-speex.xml" /> <xi:include href="xml/plugin-taglib.xml" /> diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index 2fff3ae5..f873451e 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 </SECTION> <SECTION> +<FILE>element-souphttpsrc</FILE> +<TITLE>souphttpsrc</TITLE> +GstSoupHTTPSrc +<SUBSECTION Standard> +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 +</SECTION> + +<SECTION> <FILE>element-smokedec</FILE> <TITLE>smokedec</TITLE> GstSmokeDec diff --git a/docs/plugins/gst-plugins-good-plugins.args b/docs/plugins/gst-plugins-good-plugins.args index d9d33805..4bfc061e 100644 --- a/docs/plugins/gst-plugins-good-plugins.args +++ b/docs/plugins/gst-plugins-good-plugins.args @@ -214,7 +214,7 @@ <RANGE></RANGE> <FLAGS>rw</FLAGS> <NICK>Bands</NICK> -<BLURB>number of frequency bands.</BLURB> +<BLURB>Number of frequency bands.</BLURB> <DEFAULT>128</DEFAULT> </ARG> @@ -234,7 +234,7 @@ <RANGE></RANGE> <FLAGS>rw</FLAGS> <NICK>Message</NICK> -<BLURB>Post a level message for each passed interval.</BLURB> +<BLURB>Whether to post a 'spectrum' element message on the bus for each passed interval.</BLURB> <DEFAULT>TRUE</DEFAULT> </ARG> @@ -254,7 +254,7 @@ <RANGE></RANGE> <FLAGS>rw</FLAGS> <NICK>Magnitude</NICK> -<BLURB>Post the magnitude of the spectrum.</BLURB> +<BLURB>Whether to add a 'magnitude' field to the structure of any 'spectrum' element messages posted on the bus.</BLURB> <DEFAULT>TRUE</DEFAULT> </ARG> @@ -264,7 +264,7 @@ <RANGE></RANGE> <FLAGS>rw</FLAGS> <NICK>Phase</NICK> -<BLURB>Post the phase of the spectrum.</BLURB> +<BLURB>Whether to add a 'phase' field to the structure of any 'spectrum' element messages posted on the bus.</BLURB> <DEFAULT>FALSE</DEFAULT> </ARG> @@ -1195,7 +1195,7 @@ <FLAGS>rw</FLAGS> <NICK>driver</NICK> <BLURB>driver.</BLURB> -<DEFAULT>X11 driver 1.1</DEFAULT> +<DEFAULT>Curses driver 1.0</DEFAULT> </ARG> <ARG> @@ -17928,3 +17928,163 @@ <DEFAULT></DEFAULT> </ARG> +<ARG> +<NAME>GstOsxAudioSink::device</NAME> +<TYPE>gint</TYPE> +<RANGE>>= 0</RANGE> +<FLAGS>rw</FLAGS> +<NICK>Device ID</NICK> +<BLURB>Device ID of output device.</BLURB> +<DEFAULT>0</DEFAULT> +</ARG> + +<ARG> +<NAME>GstOsxAudioSrc::device</NAME> +<TYPE>gint</TYPE> +<RANGE>>= 0</RANGE> +<FLAGS>rw</FLAGS> +<NICK>Device ID</NICK> +<BLURB>Device ID of input device.</BLURB> +<DEFAULT>0</DEFAULT> +</ARG> + +<ARG> +<NAME>GstOSXVideoSink::embed</NAME> +<TYPE>gboolean</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>embed</NICK> +<BLURB>When enabled, it can be embedded.</BLURB> +<DEFAULT>FALSE</DEFAULT> +</ARG> + +<ARG> +<NAME>GstOSXVideoSink::fullscreen</NAME> +<TYPE>gboolean</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>fullscreen</NICK> +<BLURB>When enabled, the view is fullscreen.</BLURB> +<DEFAULT>FALSE</DEFAULT> +</ARG> + +<ARG> +<NAME>GstGdkPixbufSink::last-pixbuf</NAME> +<TYPE>GdkPixbuf*</TYPE> +<RANGE></RANGE> +<FLAGS>r</FLAGS> +<NICK>Last Pixbuf</NICK> +<BLURB>Last GdkPixbuf object rendered.</BLURB> +<DEFAULT></DEFAULT> +</ARG> + +<ARG> +<NAME>GstGdkPixbufSink::send-messages</NAME> +<TYPE>gboolean</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>Send Messages</NICK> +<BLURB>Whether to post messages containing pixbufs on the bus.</BLURB> +<DEFAULT>TRUE</DEFAULT> +</ARG> + +<ARG> +<NAME>GstSoupHTTPSrc::automatic-redirect</NAME> +<TYPE>gboolean</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>automatic-redirect</NICK> +<BLURB>Automatically follow HTTP redirects (HTTP Status Code 3xx).</BLURB> +<DEFAULT>TRUE</DEFAULT> +</ARG> + +<ARG> +<NAME>GstSoupHTTPSrc::cookies</NAME> +<TYPE>GStrv*</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>Cookies</NICK> +<BLURB>HTTP request cookies.</BLURB> +<DEFAULT></DEFAULT> +</ARG> + +<ARG> +<NAME>GstSoupHTTPSrc::iradio-genre</NAME> +<TYPE>gchar*</TYPE> +<RANGE></RANGE> +<FLAGS>r</FLAGS> +<NICK>iradio-genre</NICK> +<BLURB>Genre of the stream.</BLURB> +<DEFAULT>NULL</DEFAULT> +</ARG> + +<ARG> +<NAME>GstSoupHTTPSrc::iradio-mode</NAME> +<TYPE>gboolean</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>iradio-mode</NICK> +<BLURB>Enable internet radio mode (extraction of shoutcast/icecast metadata).</BLURB> +<DEFAULT>FALSE</DEFAULT> +</ARG> + +<ARG> +<NAME>GstSoupHTTPSrc::iradio-name</NAME> +<TYPE>gchar*</TYPE> +<RANGE></RANGE> +<FLAGS>r</FLAGS> +<NICK>iradio-name</NICK> +<BLURB>Name of the stream.</BLURB> +<DEFAULT>NULL</DEFAULT> +</ARG> + +<ARG> +<NAME>GstSoupHTTPSrc::iradio-title</NAME> +<TYPE>gchar*</TYPE> +<RANGE></RANGE> +<FLAGS>r</FLAGS> +<NICK>iradio-title</NICK> +<BLURB>Name of currently playing song.</BLURB> +<DEFAULT>NULL</DEFAULT> +</ARG> + +<ARG> +<NAME>GstSoupHTTPSrc::iradio-url</NAME> +<TYPE>gchar*</TYPE> +<RANGE></RANGE> +<FLAGS>r</FLAGS> +<NICK>iradio-url</NICK> +<BLURB>Homepage URL for radio stream.</BLURB> +<DEFAULT>NULL</DEFAULT> +</ARG> + +<ARG> +<NAME>GstSoupHTTPSrc::location</NAME> +<TYPE>gchar*</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>Location</NICK> +<BLURB>Location to read from.</BLURB> +<DEFAULT>""</DEFAULT> +</ARG> + +<ARG> +<NAME>GstSoupHTTPSrc::proxy</NAME> +<TYPE>gchar*</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>Proxy</NICK> +<BLURB>HTTP proxy server URI.</BLURB> +<DEFAULT>""</DEFAULT> +</ARG> + +<ARG> +<NAME>GstSoupHTTPSrc::user-agent</NAME> +<TYPE>gchar*</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>User-Agent</NICK> +<BLURB>Value of the User-Agent HTTP request header field.</BLURB> +<DEFAULT>"GStreamer souphttpsrc "</DEFAULT> +</ARG> + diff --git a/docs/plugins/inspect/plugin-soup.xml b/docs/plugins/inspect/plugin-soup.xml new file mode 100644 index 00000000..4dfa52dc --- /dev/null +++ b/docs/plugins/inspect/plugin-soup.xml @@ -0,0 +1,28 @@ +<plugin> + <name>soup</name> + <description>libsoup HTTP client src</description> + <filename>../../ext/soup/.libs/libgstsouphttpsrc.so</filename> + <basename>libgstsouphttpsrc.so</basename> + <version>0.10.7.1</version> + <license>LGPL</license> + <source>gst-plugins-good</source> + <package>GStreamer Good Plug-ins CVS/prerelease</package> + <origin>Unknown package origin</origin> + <elements> + <element> + <name>souphttpsrc</name> + <longname>HTTP client source</longname> + <class>Source/Network</class> + <description>Receive data as a client over the network via HTTP using SOUP</description> + <author>Wouter Cloetens <wouter@mind.be></author> + <pads> + <caps> + <name>src</name> + <direction>source</direction> + <presence>always</presence> + <details>ANY</details> + </caps> + </pads> + </element> + </elements> +</plugin>
\ No newline at end of file diff --git a/ext/Makefile.am b/ext/Makefile.am index 8629fbcd..77b1cc53 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 2e687569..2d8a220e 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) |