diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2005-12-09 19:51:03 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2005-12-09 19:51:03 +0000 |
| commit | c28f84c0c60188a97f1fe888e7a169e3ce086d68 (patch) | |
| tree | a43943d97f98da5c89cac7268b439826c0c9bb78 | |
| parent | 85dfaeb2cee528079abe1fb680d20c5c168fe071 (diff) | |
borgify and fix up documentation
Original commit message from CVS:
borgify and fix up documentation
47 files changed, 324 insertions, 255 deletions
@@ -1,3 +1,71 @@ +2005-12-09 Thomas Vander Stichele <thomas at apestaart dot org> + + * docs/plugins/gst-plugins-good-plugins-sections.txt: + * docs/plugins/gst-plugins-good-plugins.hierarchy: + * docs/plugins/inspect/plugin-1394.xml: + * docs/plugins/inspect/plugin-aasink.xml: + * docs/plugins/inspect/plugin-alaw.xml: + * docs/plugins/inspect/plugin-alpha.xml: + * docs/plugins/inspect/plugin-alphacolor.xml: + * docs/plugins/inspect/plugin-auparse.xml: + * docs/plugins/inspect/plugin-autodetect.xml: + * docs/plugins/inspect/plugin-avi.xml: + * docs/plugins/inspect/plugin-cacasink.xml: + * docs/plugins/inspect/plugin-cairo.xml: + * docs/plugins/inspect/plugin-cutter.xml: + * docs/plugins/inspect/plugin-debug.xml: + * docs/plugins/inspect/plugin-dv.xml: + * docs/plugins/inspect/plugin-efence.xml: + * docs/plugins/inspect/plugin-effectv.xml: + * docs/plugins/inspect/plugin-esdsink.xml: + * docs/plugins/inspect/plugin-flac.xml: + * docs/plugins/inspect/plugin-flxdec.xml: + * docs/plugins/inspect/plugin-gconfelements.xml: + * docs/plugins/inspect/plugin-goom.xml: + * docs/plugins/inspect/plugin-jpeg.xml: + * docs/plugins/inspect/plugin-level.xml: + * docs/plugins/inspect/plugin-matroska.xml: + * docs/plugins/inspect/plugin-mulaw.xml: + * docs/plugins/inspect/plugin-multipart.xml: + * docs/plugins/inspect/plugin-navigationtest.xml: + * docs/plugins/inspect/plugin-ossaudio.xml: + * docs/plugins/inspect/plugin-png.xml: + * docs/plugins/inspect/plugin-rtp.xml: + * docs/plugins/inspect/plugin-rtsp.xml: + * docs/plugins/inspect/plugin-shout2send.xml: + * docs/plugins/inspect/plugin-smpte.xml: + * docs/plugins/inspect/plugin-speex.xml: + * docs/plugins/inspect/plugin-udp.xml: + * docs/plugins/inspect/plugin-videobox.xml: + * docs/plugins/inspect/plugin-videoflip.xml: + * docs/plugins/inspect/plugin-videomixer.xml: + * docs/plugins/inspect/plugin-wavenc.xml: + * docs/plugins/inspect/plugin-wavparse.xml: + * ext/flac/gstflac.c: (plugin_init): + * ext/flac/gstflacdec.c: (flacdec_get_type), + (gst_flac_dec_base_init), (gst_flac_dec_class_init), + (gst_flac_dec_init), (gst_flac_dec_finalize), + (gst_flac_dec_update_metadata), (gst_flac_dec_metadata_callback), + (gst_flac_dec_error_callback), (gst_flac_dec_seek), + (gst_flac_dec_tell), (gst_flac_dec_length), (gst_flac_dec_eof), + (gst_flac_dec_read), (gst_flac_dec_write), (gst_flac_dec_loop), + (gst_flac_dec_get_src_formats), (gst_flac_dec_convert_src), + (gst_flac_dec_get_src_query_types), (gst_flac_dec_src_query), + (gst_flac_dec_src_event), (gst_flac_dec_sink_activate), + (gst_flac_dec_sink_activate_pull), (gst_flac_dec_change_state): + * ext/flac/gstflacdec.h: + * ext/flac/gstflacenc.c: (gst_flac_enc_quality_get_type), + (gst_flac_enc_base_init), (gst_flac_enc_class_init), + (gst_flac_enc_init), (gst_flac_enc_finalize), (add_one_tag), + (gst_flac_enc_set_metadata), (gst_flac_enc_sink_setcaps), + (gst_flac_enc_update_quality), (gst_flac_enc_seek_callback), + (gst_flac_enc_write_callback), (gst_flac_enc_tell_callback), + (gst_flac_enc_sink_event), (gst_flac_enc_chain), + (gst_flac_enc_set_property), (gst_flac_enc_get_property), + (gst_flac_enc_change_state): + * ext/flac/gstflacenc.h: + borgify and fix up documentation + 2005-12-09 Michael Smith <msmith@fluendo.com> * ext/flac/gstflacdec.c: (raw_caps_factory), (gst_flacdec_write): diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index 6924967d..70a431c0 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -24,10 +24,10 @@ GstCairoTimeOverlayClass <SECTION> <FILE>element-flacdec</FILE> -FlacDec +GstFlacDec <TITLE>flacdec</TITLE> <SUBSECTION Standard> -FlacDecClass +GstFlacDecClass </SECTION> <SECTION> diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy index fb9b8ced..e3db900e 100644 --- a/docs/plugins/gst-plugins-good-plugins.hierarchy +++ b/docs/plugins/gst-plugins-good-plugins.hierarchy @@ -267,7 +267,7 @@ GObject GstJpegEnc GstJpegDec GstSmokeEnc - FlacDec + GstFlacDec GstDVDemux GstDVDec GstVorbisTag diff --git a/docs/plugins/inspect/plugin-1394.xml b/docs/plugins/inspect/plugin-1394.xml index 92911813..ae28a068 100644 --- a/docs/plugins/inspect/plugin-1394.xml +++ b/docs/plugins/inspect/plugin-1394.xml @@ -3,10 +3,10 @@ <description>Source for DV data via IEEE1394 interface</description> <filename>../../ext/raw1394/.libs/libgst1394.so</filename> <basename>libgst1394.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-aasink.xml b/docs/plugins/inspect/plugin-aasink.xml index 27120d6f..3435a3b7 100644 --- a/docs/plugins/inspect/plugin-aasink.xml +++ b/docs/plugins/inspect/plugin-aasink.xml @@ -3,10 +3,10 @@ <description>ASCII Art video sink</description> <filename>../../ext/aalib/.libs/libgstaasink.so</filename> <basename>libgstaasink.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-alaw.xml b/docs/plugins/inspect/plugin-alaw.xml index 8ac371ea..3f75b12e 100644 --- a/docs/plugins/inspect/plugin-alaw.xml +++ b/docs/plugins/inspect/plugin-alaw.xml @@ -3,10 +3,10 @@ <description>ALaw audio conversion routines</description> <filename>../../gst/law/.libs/libgstalaw.so</filename> <basename>libgstalaw.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-alpha.xml b/docs/plugins/inspect/plugin-alpha.xml index 7e0d8a12..b8a5a56a 100644 --- a/docs/plugins/inspect/plugin-alpha.xml +++ b/docs/plugins/inspect/plugin-alpha.xml @@ -3,10 +3,10 @@ <description>adds an alpha channel to video</description> <filename>../../gst/alpha/.libs/libgstalpha.so</filename> <basename>libgstalpha.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-alphacolor.xml b/docs/plugins/inspect/plugin-alphacolor.xml index b546ccff..23069c96 100644 --- a/docs/plugins/inspect/plugin-alphacolor.xml +++ b/docs/plugins/inspect/plugin-alphacolor.xml @@ -3,10 +3,10 @@ <description>RGB->YUV colorspace conversion preserving the alpha channels</description> <filename>../../gst/alpha/.libs/libgstalphacolor.so</filename> <basename>libgstalphacolor.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-auparse.xml b/docs/plugins/inspect/plugin-auparse.xml index 78cd0a2b..cd25a929 100644 --- a/docs/plugins/inspect/plugin-auparse.xml +++ b/docs/plugins/inspect/plugin-auparse.xml @@ -3,10 +3,10 @@ <description>parses au streams</description> <filename>../../gst/auparse/.libs/libgstauparse.so</filename> <basename>libgstauparse.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-autodetect.xml b/docs/plugins/inspect/plugin-autodetect.xml index 130689f8..0b6968b9 100644 --- a/docs/plugins/inspect/plugin-autodetect.xml +++ b/docs/plugins/inspect/plugin-autodetect.xml @@ -3,10 +3,10 @@ <description>Plugin contains auto-detection plugins for video/audio outputs</description> <filename>../../gst/autodetect/.libs/libgstautodetect.so</filename> <basename>libgstautodetect.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-avi.xml b/docs/plugins/inspect/plugin-avi.xml index 4771d119..8af7bea2 100644 --- a/docs/plugins/inspect/plugin-avi.xml +++ b/docs/plugins/inspect/plugin-avi.xml @@ -3,10 +3,10 @@ <description>AVI stream handling</description> <filename>../../gst/avi/.libs/libgstavi.so</filename> <basename>libgstavi.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-cacasink.xml b/docs/plugins/inspect/plugin-cacasink.xml index c013e842..b912be2c 100644 --- a/docs/plugins/inspect/plugin-cacasink.xml +++ b/docs/plugins/inspect/plugin-cacasink.xml @@ -3,10 +3,10 @@ <description>Colored ASCII Art video sink</description> <filename>../../ext/libcaca/.libs/libgstcacasink.so</filename> <basename>libgstcacasink.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-cairo.xml b/docs/plugins/inspect/plugin-cairo.xml index b382ef65..ca097848 100644 --- a/docs/plugins/inspect/plugin-cairo.xml +++ b/docs/plugins/inspect/plugin-cairo.xml @@ -3,7 +3,7 @@ <description>Cairo-based overlaying</description> <filename>../../ext/cairo/.libs/libgstcairo.so</filename> <basename>libgstcairo.so</basename> - <version>0.9.6.1</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> <package>GStreamer Good Plug-ins CVS/prerelease</package> diff --git a/docs/plugins/inspect/plugin-cutter.xml b/docs/plugins/inspect/plugin-cutter.xml index 68227b0e..4db77b56 100644 --- a/docs/plugins/inspect/plugin-cutter.xml +++ b/docs/plugins/inspect/plugin-cutter.xml @@ -3,10 +3,10 @@ <description>Audio Cutter to split audio into non-silent bits</description> <filename>../../gst/cutter/.libs/libgstcutter.so</filename> <basename>libgstcutter.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-debug.xml b/docs/plugins/inspect/plugin-debug.xml index 29553ce7..5d80cab5 100644 --- a/docs/plugins/inspect/plugin-debug.xml +++ b/docs/plugins/inspect/plugin-debug.xml @@ -3,10 +3,10 @@ <description>elements for testing and debugging</description> <filename>../../gst/debug/.libs/libgstdebug.so</filename> <basename>libgstdebug.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-dv.xml b/docs/plugins/inspect/plugin-dv.xml index d8a7983c..8596b53e 100644 --- a/docs/plugins/inspect/plugin-dv.xml +++ b/docs/plugins/inspect/plugin-dv.xml @@ -3,10 +3,10 @@ <description>DV demuxer and decoder based on libdv (libdv.sf.net)</description> <filename>../../ext/dv/.libs/libgstdv.so</filename> <basename>libgstdv.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-efence.xml b/docs/plugins/inspect/plugin-efence.xml index 943f4460..f2d3daec 100644 --- a/docs/plugins/inspect/plugin-efence.xml +++ b/docs/plugins/inspect/plugin-efence.xml @@ -3,10 +3,10 @@ <description>This element converts a stream of normal GStreamer buffers into a stream of buffers that are allocated in such a way that out-of-bounds access to data in the buffer is more likely to cause segmentation faults. This allocation method is very similar to the debugging tool "Electric Fence".</description> <filename>../../gst/debug/.libs/libgstefence.so</filename> <basename>libgstefence.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-effectv.xml b/docs/plugins/inspect/plugin-effectv.xml index dfc814b9..57b64822 100644 --- a/docs/plugins/inspect/plugin-effectv.xml +++ b/docs/plugins/inspect/plugin-effectv.xml @@ -3,10 +3,10 @@ <description>effect plugins from the effectv project</description> <filename>../../gst/effectv/.libs/libgsteffectv.so</filename> <basename>libgsteffectv.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-esdsink.xml b/docs/plugins/inspect/plugin-esdsink.xml index 543dfe2c..486fd6f1 100644 --- a/docs/plugins/inspect/plugin-esdsink.xml +++ b/docs/plugins/inspect/plugin-esdsink.xml @@ -3,10 +3,10 @@ <description>ESD Element Plugins</description> <filename>../../ext/esd/.libs/libgstesd.so</filename> <basename>libgstesd.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-flac.xml b/docs/plugins/inspect/plugin-flac.xml index e043f050..78072673 100644 --- a/docs/plugins/inspect/plugin-flac.xml +++ b/docs/plugins/inspect/plugin-flac.xml @@ -3,10 +3,10 @@ <description>The FLAC Lossless compressor Codec</description> <filename>../../ext/flac/.libs/libgstflac.so</filename> <basename>libgstflac.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-flxdec.xml b/docs/plugins/inspect/plugin-flxdec.xml index 29ef1925..62cbbec4 100644 --- a/docs/plugins/inspect/plugin-flxdec.xml +++ b/docs/plugins/inspect/plugin-flxdec.xml @@ -3,10 +3,10 @@ <description>FLX video decoder</description> <filename>../../gst/flx/.libs/libgstflxdec.so</filename> <basename>libgstflxdec.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-gconfelements.xml b/docs/plugins/inspect/plugin-gconfelements.xml index a9a8a24a..f16770d4 100644 --- a/docs/plugins/inspect/plugin-gconfelements.xml +++ b/docs/plugins/inspect/plugin-gconfelements.xml @@ -3,10 +3,10 @@ <description>elements wrapping the GStreamer/GConf audio/video output settings</description> <filename>../../ext/gconf/.libs/libgstgconfelements.so</filename> <basename>libgstgconfelements.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-goom.xml b/docs/plugins/inspect/plugin-goom.xml index b6e1ede0..de93b81b 100644 --- a/docs/plugins/inspect/plugin-goom.xml +++ b/docs/plugins/inspect/plugin-goom.xml @@ -3,10 +3,10 @@ <description>GOOM visualization filter</description> <filename>../../gst/goom/.libs/libgstgoom.so</filename> <basename>libgstgoom.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-jpeg.xml b/docs/plugins/inspect/plugin-jpeg.xml index 445e48c3..cc6e98ea 100644 --- a/docs/plugins/inspect/plugin-jpeg.xml +++ b/docs/plugins/inspect/plugin-jpeg.xml @@ -3,10 +3,10 @@ <description>JPeg plugin library</description> <filename>../../ext/jpeg/.libs/libgstjpeg.so</filename> <basename>libgstjpeg.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-level.xml b/docs/plugins/inspect/plugin-level.xml index b919927c..719c1009 100644 --- a/docs/plugins/inspect/plugin-level.xml +++ b/docs/plugins/inspect/plugin-level.xml @@ -3,10 +3,10 @@ <description>Audio level plugin</description> <filename>../../gst/level/.libs/libgstlevel.so</filename> <basename>libgstlevel.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-matroska.xml b/docs/plugins/inspect/plugin-matroska.xml index e8bc78c4..10b2dc32 100644 --- a/docs/plugins/inspect/plugin-matroska.xml +++ b/docs/plugins/inspect/plugin-matroska.xml @@ -3,10 +3,10 @@ <description>Matroska stream handling</description> <filename>../../gst/matroska/.libs/libgstmatroska.so</filename> <basename>libgstmatroska.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-mulaw.xml b/docs/plugins/inspect/plugin-mulaw.xml index 0a39875d..2f501ce8 100644 --- a/docs/plugins/inspect/plugin-mulaw.xml +++ b/docs/plugins/inspect/plugin-mulaw.xml @@ -3,10 +3,10 @@ <description>MuLaw audio conversion routines</description> <filename>../../gst/law/.libs/libgstmulaw.so</filename> <basename>libgstmulaw.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-multipart.xml b/docs/plugins/inspect/plugin-multipart.xml index 7aade4ad..26a20eed 100644 --- a/docs/plugins/inspect/plugin-multipart.xml +++ b/docs/plugins/inspect/plugin-multipart.xml @@ -3,10 +3,10 @@ <description>multipart stream manipulation</description> <filename>../../gst/multipart/.libs/libgstmultipart.so</filename> <basename>libgstmultipart.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-navigationtest.xml b/docs/plugins/inspect/plugin-navigationtest.xml index a8d8c462..136bf899 100644 --- a/docs/plugins/inspect/plugin-navigationtest.xml +++ b/docs/plugins/inspect/plugin-navigationtest.xml @@ -3,10 +3,10 @@ <description>Template for a video filter</description> <filename>../../gst/debug/.libs/libgstnavigationtest.so</filename> <basename>libgstnavigationtest.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-ossaudio.xml b/docs/plugins/inspect/plugin-ossaudio.xml index 6f91159b..2a9f8360 100644 --- a/docs/plugins/inspect/plugin-ossaudio.xml +++ b/docs/plugins/inspect/plugin-ossaudio.xml @@ -3,10 +3,10 @@ <description>OSS (Open Sound System) support for GStreamer</description> <filename>../../sys/oss/.libs/libgstossaudio.so</filename> <basename>libgstossaudio.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-png.xml b/docs/plugins/inspect/plugin-png.xml index 51a27167..f11f4a21 100644 --- a/docs/plugins/inspect/plugin-png.xml +++ b/docs/plugins/inspect/plugin-png.xml @@ -3,10 +3,10 @@ <description>PNG plugin library</description> <filename>../../ext/libpng/.libs/libgstpng.so</filename> <basename>libgstpng.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-rtp.xml b/docs/plugins/inspect/plugin-rtp.xml index 2296362b..a0e3e124 100644 --- a/docs/plugins/inspect/plugin-rtp.xml +++ b/docs/plugins/inspect/plugin-rtp.xml @@ -3,10 +3,10 @@ <description>Real-time protocol plugins</description> <filename>../../gst/rtp/.libs/libgstrtp.so</filename> <basename>libgstrtp.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-rtsp.xml b/docs/plugins/inspect/plugin-rtsp.xml index d47e04e2..65e070cd 100644 --- a/docs/plugins/inspect/plugin-rtsp.xml +++ b/docs/plugins/inspect/plugin-rtsp.xml @@ -3,10 +3,10 @@ <description>transfer data via RTSP</description> <filename>../../gst/rtsp/.libs/libgstrtsp.so</filename> <basename>libgstrtsp.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-shout2send.xml b/docs/plugins/inspect/plugin-shout2send.xml index f67b414f..96e39c26 100644 --- a/docs/plugins/inspect/plugin-shout2send.xml +++ b/docs/plugins/inspect/plugin-shout2send.xml @@ -3,7 +3,7 @@ <description>Sends data to an icecast server using libshout2</description> <filename>../../ext/shout2/.libs/libgstshout2.so</filename> <basename>libgstshout2.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> <package>libshout2</package> diff --git a/docs/plugins/inspect/plugin-smpte.xml b/docs/plugins/inspect/plugin-smpte.xml index aef9c25e..3b47651a 100644 --- a/docs/plugins/inspect/plugin-smpte.xml +++ b/docs/plugins/inspect/plugin-smpte.xml @@ -3,10 +3,10 @@ <description>Apply the standard SMPTE transitions on video images</description> <filename>../../gst/smpte/.libs/libgstsmpte.so</filename> <basename>libgstsmpte.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-speex.xml b/docs/plugins/inspect/plugin-speex.xml index 95940f0e..d51a9010 100644 --- a/docs/plugins/inspect/plugin-speex.xml +++ b/docs/plugins/inspect/plugin-speex.xml @@ -3,10 +3,10 @@ <description>Speex plugin library</description> <filename>../../ext/speex/.libs/libgstspeex.so</filename> <basename>libgstspeex.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-udp.xml b/docs/plugins/inspect/plugin-udp.xml index 4bb07b99..1c379228 100644 --- a/docs/plugins/inspect/plugin-udp.xml +++ b/docs/plugins/inspect/plugin-udp.xml @@ -3,10 +3,10 @@ <description>transfer data via UDP</description> <filename>../../gst/udp/.libs/libgstudp.so</filename> <basename>libgstudp.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-videobox.xml b/docs/plugins/inspect/plugin-videobox.xml index dc51e33c..cd198fd0 100644 --- a/docs/plugins/inspect/plugin-videobox.xml +++ b/docs/plugins/inspect/plugin-videobox.xml @@ -3,10 +3,10 @@ <description>resizes a video by adding borders or cropping</description> <filename>../../gst/videobox/.libs/libgstvideobox.so</filename> <basename>libgstvideobox.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-videoflip.xml b/docs/plugins/inspect/plugin-videoflip.xml index c597944d..8d355955 100644 --- a/docs/plugins/inspect/plugin-videoflip.xml +++ b/docs/plugins/inspect/plugin-videoflip.xml @@ -3,10 +3,10 @@ <description>Flips and rotates video</description> <filename>../../gst/videofilter/.libs/libgstvideoflip.so</filename> <basename>libgstvideoflip.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-videomixer.xml b/docs/plugins/inspect/plugin-videomixer.xml index ed4e51d6..84d183b4 100644 --- a/docs/plugins/inspect/plugin-videomixer.xml +++ b/docs/plugins/inspect/plugin-videomixer.xml @@ -3,10 +3,10 @@ <description>Video mixer</description> <filename>../../gst/videomixer/.libs/libgstvideomixer.so</filename> <basename>libgstvideomixer.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-wavenc.xml b/docs/plugins/inspect/plugin-wavenc.xml index 07516bcf..1abbfa9b 100644 --- a/docs/plugins/inspect/plugin-wavenc.xml +++ b/docs/plugins/inspect/plugin-wavenc.xml @@ -3,10 +3,10 @@ <description>Encode raw audio into WAV</description> <filename>../../gst/wavenc/.libs/libgstwavenc.so</filename> <basename>libgstwavenc.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/docs/plugins/inspect/plugin-wavparse.xml b/docs/plugins/inspect/plugin-wavparse.xml index a34a232b..bbf4a674 100644 --- a/docs/plugins/inspect/plugin-wavparse.xml +++ b/docs/plugins/inspect/plugin-wavparse.xml @@ -3,10 +3,10 @@ <description>Parse a .wav file into raw audio</description> <filename>../../gst/wavparse/.libs/libgstwavparse.so</filename> <basename>libgstwavparse.so</basename> - <version>0.10.0</version> + <version>0.10.0.1</version> <license>LGPL</license> <source>gst-plugins-good</source> - <package>GStreamer Good Plug-ins source release</package> + <package>GStreamer Good Plug-ins CVS/prerelease</package> <origin>Unknown package origin</origin> <elements> <element> diff --git a/ext/flac/gstflac.c b/ext/flac/gstflac.c index 6f853d59..5f13a158 100644 --- a/ext/flac/gstflac.c +++ b/ext/flac/gstflac.c @@ -31,10 +31,10 @@ static gboolean plugin_init (GstPlugin * plugin) { if (!gst_element_register (plugin, "flacenc", GST_RANK_NONE, - GST_TYPE_FLACENC)) + GST_TYPE_FLAC_ENC)) return FALSE; if (!gst_element_register (plugin, "flacdec", GST_RANK_PRIMARY, - GST_TYPE_FLACDEC)) + GST_TYPE_FLAC_DEC)) return FALSE; #if 0 if (!gst_element_register (plugin, "flactag", GST_RANK_PRIMARY, diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c index 67725e20..6354583f 100644 --- a/ext/flac/gstflacdec.c +++ b/ext/flac/gstflacdec.c @@ -66,44 +66,44 @@ GstElementDetails flacdec_details = { "Wim Taymans <wim.taymans@chello.be>", }; -static void gst_flacdec_base_init (gpointer g_class); -static void gst_flacdec_class_init (FlacDecClass * klass); -static void gst_flacdec_init (FlacDec * flacdec); -static void gst_flacdec_finalize (GObject * object); +static void gst_flac_dec_base_init (gpointer g_class); +static void gst_flac_dec_class_init (GstFlacDecClass * klass); +static void gst_flac_dec_init (GstFlacDec * flacdec); +static void gst_flac_dec_finalize (GObject * object); -static void gst_flacdec_loop (GstPad * pad); -static GstStateChangeReturn gst_flacdec_change_state (GstElement * element, +static void gst_flac_dec_loop (GstPad * pad); +static GstStateChangeReturn gst_flac_dec_change_state (GstElement * element, GstStateChange transition); -static const GstQueryType *gst_flacdec_get_src_query_types (GstPad * pad); -static gboolean gst_flacdec_src_query (GstPad * pad, GstQuery * query); -static gboolean gst_flacdec_convert_src (GstPad * pad, GstFormat src_format, +static const GstQueryType *gst_flac_dec_get_src_query_types (GstPad * pad); +static gboolean gst_flac_dec_src_query (GstPad * pad, GstQuery * query); +static gboolean gst_flac_dec_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value, GstFormat * dest_format, gint64 * dest_value); -static gboolean gst_flacdec_src_event (GstPad * pad, GstEvent * event); -static gboolean gst_flacdec_sink_activate (GstPad * sinkpad); -static gboolean gst_flacdec_sink_activate_pull (GstPad * sinkpad, +static gboolean gst_flac_dec_src_event (GstPad * pad, GstEvent * event); +static gboolean gst_flac_dec_sink_activate (GstPad * sinkpad); +static gboolean gst_flac_dec_sink_activate_pull (GstPad * sinkpad, gboolean active); static FLAC__SeekableStreamDecoderReadStatus -gst_flacdec_read (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_read (const FLAC__SeekableStreamDecoder * decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); static FLAC__SeekableStreamDecoderSeekStatus -gst_flacdec_seek (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * decoder, FLAC__uint64 position, void *client_data); static FLAC__SeekableStreamDecoderTellStatus -gst_flacdec_tell (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_tell (const FLAC__SeekableStreamDecoder * decoder, FLAC__uint64 * position, void *client_data); static FLAC__SeekableStreamDecoderLengthStatus -gst_flacdec_length (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_length (const FLAC__SeekableStreamDecoder * decoder, FLAC__uint64 * length, void *client_data); -static FLAC__bool gst_flacdec_eof (const FLAC__SeekableStreamDecoder * decoder, +static FLAC__bool gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * decoder, void *client_data); static FLAC__StreamDecoderWriteStatus -gst_flacdec_write (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_write (const FLAC__SeekableStreamDecoder * decoder, const FLAC__Frame * frame, const FLAC__int32 * const buffer[], void *client_data); -static void gst_flacdec_metadata_callback (const FLAC__SeekableStreamDecoder * +static void gst_flac_dec_metadata_callback (const FLAC__SeekableStreamDecoder * decoder, const FLAC__StreamMetadata * metadata, void *client_data); -static void gst_flacdec_error_callback (const FLAC__SeekableStreamDecoder * +static void gst_flac_dec_error_callback (const FLAC__SeekableStreamDecoder * decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); static GstElementClass *parent_class = NULL; @@ -115,19 +115,20 @@ flacdec_get_type (void) if (!flacdec_type) { static const GTypeInfo flacdec_info = { - sizeof (FlacDecClass), - gst_flacdec_base_init, + sizeof (GstFlacDecClass), + gst_flac_dec_base_init, NULL, - (GClassInitFunc) gst_flacdec_class_init, + (GClassInitFunc) gst_flac_dec_class_init, NULL, NULL, - sizeof (FlacDec), + sizeof (GstFlacDec), 0, - (GInstanceInitFunc) gst_flacdec_init, + (GInstanceInitFunc) gst_flac_dec_init, }; flacdec_type = - g_type_register_static (GST_TYPE_ELEMENT, "FlacDec", &flacdec_info, 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstFlacDec", &flacdec_info, + 0); GST_DEBUG_CATEGORY_INIT (flacdec_debug, "flacdec", 0, "flac decoder"); } @@ -154,7 +155,7 @@ raw_caps_factory (void) } static void -gst_flacdec_base_init (gpointer g_class) +gst_flac_dec_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); GstCaps *raw_caps, *flac_caps; @@ -172,7 +173,7 @@ gst_flacdec_base_init (gpointer g_class) } static void -gst_flacdec_class_init (FlacDecClass * klass) +gst_flac_dec_class_init (GstFlacDecClass * klass) { GstElementClass *gstelement_class; GObjectClass *gobject_class; @@ -182,25 +183,25 @@ gst_flacdec_class_init (FlacDecClass * klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); - gobject_class->finalize = gst_flacdec_finalize; + gobject_class->finalize = gst_flac_dec_finalize; - gstelement_class->change_state = gst_flacdec_change_state; + gstelement_class->change_state = gst_flac_dec_change_state; } static void -gst_flacdec_init (FlacDec * flacdec) +gst_flac_dec_init (GstFlacDec * flacdec) { flacdec->sinkpad = gst_pad_new_from_template (sink_template, "sink"); - gst_pad_set_activate_function (flacdec->sinkpad, gst_flacdec_sink_activate); + gst_pad_set_activate_function (flacdec->sinkpad, gst_flac_dec_sink_activate); gst_pad_set_activatepull_function (flacdec->sinkpad, - gst_flacdec_sink_activate_pull); + gst_flac_dec_sink_activate_pull); gst_element_add_pad (GST_ELEMENT (flacdec), flacdec->sinkpad); flacdec->srcpad = gst_pad_new_from_template (src_template, "src"); gst_pad_set_query_type_function (flacdec->srcpad, - gst_flacdec_get_src_query_types); - gst_pad_set_query_function (flacdec->srcpad, gst_flacdec_src_query); - gst_pad_set_event_function (flacdec->srcpad, gst_flacdec_src_event); + gst_flac_dec_get_src_query_types); + gst_pad_set_query_function (flacdec->srcpad, gst_flac_dec_src_query); + gst_pad_set_event_function (flacdec->srcpad, gst_flac_dec_src_event); gst_pad_use_fixed_caps (flacdec->srcpad); gst_element_add_pad (GST_ELEMENT (flacdec), flacdec->srcpad); @@ -211,41 +212,41 @@ gst_flacdec_init (FlacDec * flacdec) flacdec->seek_pending = FALSE; FLAC__seekable_stream_decoder_set_read_callback (flacdec->decoder, - gst_flacdec_read); + gst_flac_dec_read); FLAC__seekable_stream_decoder_set_seek_callback (flacdec->decoder, - gst_flacdec_seek); + gst_flac_dec_seek); FLAC__seekable_stream_decoder_set_tell_callback (flacdec->decoder, - gst_flacdec_tell); + gst_flac_dec_tell); FLAC__seekable_stream_decoder_set_length_callback (flacdec->decoder, - gst_flacdec_length); + gst_flac_dec_length); FLAC__seekable_stream_decoder_set_eof_callback (flacdec->decoder, - gst_flacdec_eof); + gst_flac_dec_eof); #if FLAC_VERSION >= 0x010003 FLAC__seekable_stream_decoder_set_write_callback (flacdec->decoder, - gst_flacdec_write); + gst_flac_dec_write); #else FLAC__seekable_stream_decoder_set_write_callback (flacdec->decoder, (FLAC__StreamDecoderWriteStatus (*) (const FLAC__SeekableStreamDecoder * decoder, const FLAC__Frame * frame, const FLAC__int32 * buffer[], void *client_data)) - (gst_flacdec_write)); + (gst_flac_dec_write)); #endif FLAC__seekable_stream_decoder_set_metadata_respond (flacdec->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); FLAC__seekable_stream_decoder_set_metadata_callback (flacdec->decoder, - gst_flacdec_metadata_callback); + gst_flac_dec_metadata_callback); FLAC__seekable_stream_decoder_set_error_callback (flacdec->decoder, - gst_flacdec_error_callback); + gst_flac_dec_error_callback); FLAC__seekable_stream_decoder_set_client_data (flacdec->decoder, flacdec); } static void -gst_flacdec_finalize (GObject * object) +gst_flac_dec_finalize (GObject * object) { - FlacDec *flacdec; + GstFlacDec *flacdec; - flacdec = GST_FLACDEC (object); + flacdec = GST_FLAC_DEC (object); if (flacdec->decoder) FLAC__seekable_stream_decoder_delete (flacdec->decoder); @@ -256,7 +257,7 @@ gst_flacdec_finalize (GObject * object) static gboolean -gst_flacdec_update_metadata (FlacDec * flacdec, +gst_flac_dec_update_metadata (GstFlacDec * flacdec, const FLAC__StreamMetadata * metadata) { GstTagList *list; @@ -295,19 +296,19 @@ gst_flacdec_update_metadata (FlacDec * flacdec, static void -gst_flacdec_metadata_callback (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_metadata_callback (const FLAC__SeekableStreamDecoder * decoder, const FLAC__StreamMetadata * metadata, void *client_data) { - FlacDec *flacdec; + GstFlacDec *flacdec; - flacdec = GST_FLACDEC (client_data); + flacdec = GST_FLAC_DEC (client_data); switch (metadata->type) { case FLAC__METADATA_TYPE_STREAMINFO: flacdec->stream_samples = metadata->data.stream_info.total_samples; break; case FLAC__METADATA_TYPE_VORBIS_COMMENT: - gst_flacdec_update_metadata (flacdec, metadata); + gst_flac_dec_update_metadata (flacdec, metadata); break; default: break; @@ -315,13 +316,13 @@ gst_flacdec_metadata_callback (const FLAC__SeekableStreamDecoder * decoder, } static void -gst_flacdec_error_callback (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_error_callback (const FLAC__SeekableStreamDecoder * decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) { - FlacDec *flacdec; + GstFlacDec *flacdec; gchar *error; - flacdec = GST_FLACDEC (client_data); + flacdec = GST_FLAC_DEC (client_data); switch (status) { case FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC: @@ -342,12 +343,12 @@ gst_flacdec_error_callback (const FLAC__SeekableStreamDecoder * decoder, } static FLAC__SeekableStreamDecoderSeekStatus -gst_flacdec_seek (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * decoder, FLAC__uint64 position, void *client_data) { - FlacDec *flacdec; + GstFlacDec *flacdec; - flacdec = GST_FLACDEC (client_data); + flacdec = GST_FLAC_DEC (client_data); GST_DEBUG ("seek %" G_GINT64_FORMAT, position); flacdec->offset = position; @@ -356,12 +357,12 @@ gst_flacdec_seek (const FLAC__SeekableStreamDecoder * decoder, } static FLAC__SeekableStreamDecoderTellStatus -gst_flacdec_tell (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_tell (const FLAC__SeekableStreamDecoder * decoder, FLAC__uint64 * position, void *client_data) { - FlacDec *flacdec; + GstFlacDec *flacdec; - flacdec = GST_FLACDEC (client_data); + flacdec = GST_FLAC_DEC (client_data); *position = flacdec->offset; @@ -371,15 +372,15 @@ gst_flacdec_tell (const FLAC__SeekableStreamDecoder * decoder, } static FLAC__SeekableStreamDecoderLengthStatus -gst_flacdec_length (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_length (const FLAC__SeekableStreamDecoder * decoder, FLAC__uint64 * length, void *client_data) { - FlacDec *flacdec; + GstFlacDec *flacdec; GstFormat fmt = GST_FORMAT_BYTES; gint64 len; GstPad *peer; - flacdec = GST_FLACDEC (client_data); + flacdec = GST_FLAC_DEC (client_data); if (!(peer = gst_pad_get_peer (flacdec->sinkpad))) return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR; @@ -396,24 +397,25 @@ gst_flacdec_length (const FLAC__SeekableStreamDecoder * decoder, } static FLAC__bool -gst_flacdec_eof (const FLAC__SeekableStreamDecoder * decoder, void *client_data) +gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * decoder, + void *client_data) { - FlacDec *flacdec; + GstFlacDec *flacdec; - flacdec = GST_FLACDEC (client_data); + flacdec = GST_FLAC_DEC (client_data); GST_DEBUG ("eof %d", flacdec->eos); return flacdec->eos; } static FLAC__SeekableStreamDecoderReadStatus -gst_flacdec_read (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_read (const FLAC__SeekableStreamDecoder * decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) { - FlacDec *flacdec; + GstFlacDec *flacdec; GstBuffer *buf; - flacdec = GST_FLACDEC (client_data); + flacdec = GST_FLAC_DEC (client_data); if (gst_pad_pull_range (flacdec->sinkpad, flacdec->offset, *bytes, &buf) != GST_FLOW_OK) @@ -430,11 +432,11 @@ gst_flacdec_read (const FLAC__SeekableStreamDecoder * decoder, } static FLAC__StreamDecoderWriteStatus -gst_flacdec_write (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_write (const FLAC__SeekableStreamDecoder * decoder, const FLAC__Frame * frame, const FLAC__int32 * const buffer[], void *client_data) { - FlacDec *flacdec; + GstFlacDec *flacdec; GstBuffer *outbuf; guint depth = frame->header.bits_per_sample; guint width; @@ -460,7 +462,7 @@ gst_flacdec_write (const FLAC__SeekableStreamDecoder * decoder, return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; } - flacdec = GST_FLACDEC (client_data); + flacdec = GST_FLAC_DEC (client_data); if (flacdec->need_discont) { gint64 time = 0; @@ -476,7 +478,7 @@ gst_flacdec_write (const FLAC__SeekableStreamDecoder * decoder, GST_DEBUG ("newsegment from %" G_GUINT64_FORMAT, flacdec->seek_value); format = GST_FORMAT_TIME; - gst_flacdec_convert_src (flacdec->srcpad, GST_FORMAT_DEFAULT, + gst_flac_dec_convert_src (flacdec->srcpad, GST_FORMAT_DEFAULT, flacdec->total_samples, &format, &time); newsegment = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, time, GST_CLOCK_TIME_NONE, 0); @@ -562,12 +564,12 @@ gst_flacdec_write (const FLAC__SeekableStreamDecoder * decoder, } static void -gst_flacdec_loop (GstPad * sinkpad) +gst_flac_dec_loop (GstPad * sinkpad) { - FlacDec *flacdec; + GstFlacDec *flacdec; FLAC__SeekableStreamDecoderState s; - flacdec = GST_FLACDEC (GST_OBJECT_PARENT (sinkpad)); + flacdec = GST_FLAC_DEC (GST_OBJECT_PARENT (sinkpad)); GST_DEBUG ("flacdec: entering loop"); if (flacdec->init) { @@ -646,7 +648,7 @@ analyze_state: #if 0 static const GstFormat * -gst_flacdec_get_src_formats (GstPad * pad) +gst_flac_dec_get_src_formats (GstPad * pad) { static const GstFormat formats[] = { GST_FORMAT_DEFAULT, @@ -660,11 +662,11 @@ gst_flacdec_get_src_formats (GstPad * pad) #endif static gboolean -gst_flacdec_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value, +gst_flac_dec_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value, GstFormat * dest_format, gint64 * dest_value) { gboolean res = TRUE; - FlacDec *flacdec = GST_FLACDEC (gst_pad_get_parent (pad)); + GstFlacDec *flacdec = GST_FLAC_DEC (gst_pad_get_parent (pad)); guint scale = 1; gint bytes_per_sample; @@ -723,7 +725,7 @@ gst_flacdec_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value, } static const GstQueryType * -gst_flacdec_get_src_query_types (GstPad * pad) +gst_flac_dec_get_src_query_types (GstPad * pad) { static const GstQueryType types[] = { GST_QUERY_POSITION, @@ -734,10 +736,10 @@ gst_flacdec_get_src_query_types (GstPad * pad) } static gboolean -gst_flacdec_src_query (GstPad * pad, GstQuery * query) +gst_flac_dec_src_query (GstPad * pad, GstQuery * query) { gboolean res = TRUE; - FlacDec *flacdec = GST_FLACDEC (gst_pad_get_parent (pad)); + GstFlacDec *flacdec = GST_FLAC_DEC (gst_pad_get_parent (pad)); switch (GST_QUERY_TYPE (query)) { case GST_QUERY_POSITION:{ @@ -746,7 +748,7 @@ gst_flacdec_src_query (GstPad * pad, GstQuery * query) pos = flacdec->total_samples; - if (gst_flacdec_convert_src (flacdec->srcpad, + if (gst_flac_dec_convert_src (flacdec->srcpad, GST_FORMAT_DEFAULT, pos, &fmt, &pos)) gst_query_set_position (query, GST_FORMAT_TIME, pos); else @@ -762,7 +764,7 @@ gst_flacdec_src_query (GstPad * pad, GstQuery * query) else len = flacdec->stream_samples; - if (gst_flacdec_convert_src (flacdec->srcpad, + if (gst_flac_dec_convert_src (flacdec->srcpad, GST_FORMAT_DEFAULT, len, &fmt, &len)) gst_query_set_duration (query, GST_FORMAT_TIME, len); else @@ -778,10 +780,10 @@ gst_flacdec_src_query (GstPad * pad, GstQuery * query) } static gboolean -gst_flacdec_src_event (GstPad * pad, GstEvent * event) +gst_flac_dec_src_event (GstPad * pad, GstEvent * event) { gboolean res = TRUE; - FlacDec *flacdec = GST_FLACDEC (gst_pad_get_parent (pad)); + GstFlacDec *flacdec = GST_FLAC_DEC (gst_pad_get_parent (pad)); switch (GST_EVENT_TYPE (event)) { case GST_EVENT_SEEK:{ @@ -795,7 +797,7 @@ gst_flacdec_src_event (GstPad * pad, GstEvent * event) format = GST_FORMAT_DEFAULT; if (type == GST_SEEK_TYPE_SET && - gst_flacdec_convert_src (flacdec->srcpad, seek_fmt, pos, + gst_flac_dec_convert_src (flacdec->srcpad, seek_fmt, pos, &format, &pos)) { GST_DEBUG ("Initializing seek"); g_print ("Grab seek lock\n"); @@ -807,7 +809,7 @@ gst_flacdec_src_event (GstPad * pad, GstEvent * event) flacdec->seek_pending = TRUE; flacdec->seek_value = pos; gst_pad_start_task (flacdec->sinkpad, - (GstTaskFunction) gst_flacdec_loop, flacdec->sinkpad); + (GstTaskFunction) gst_flac_dec_loop, flacdec->sinkpad); GST_PAD_STREAM_UNLOCK (flacdec->sinkpad); } else res = FALSE; @@ -822,7 +824,7 @@ gst_flacdec_src_event (GstPad * pad, GstEvent * event) } static gboolean -gst_flacdec_sink_activate (GstPad * sinkpad) +gst_flac_dec_sink_activate (GstPad * sinkpad) { if (gst_pad_check_pull_range (sinkpad)) return gst_pad_activate_pull (sinkpad, TRUE); @@ -831,12 +833,12 @@ gst_flacdec_sink_activate (GstPad * sinkpad) } static gboolean -gst_flacdec_sink_activate_pull (GstPad * sinkpad, gboolean active) +gst_flac_dec_sink_activate_pull (GstPad * sinkpad, gboolean active) { if (active) { /* if we have a scheduler we can start the task */ - GST_FLACDEC (GST_OBJECT_PARENT (sinkpad))->offset = 0; - return gst_pad_start_task (sinkpad, (GstTaskFunction) gst_flacdec_loop, + GST_FLAC_DEC (GST_OBJECT_PARENT (sinkpad))->offset = 0; + return gst_pad_start_task (sinkpad, (GstTaskFunction) gst_flac_dec_loop, sinkpad); } else { return gst_pad_stop_task (sinkpad); @@ -844,9 +846,9 @@ gst_flacdec_sink_activate_pull (GstPad * sinkpad, gboolean active) } static GstStateChangeReturn -gst_flacdec_change_state (GstElement * element, GstStateChange transition) +gst_flac_dec_change_state (GstElement * element, GstStateChange transition) { - FlacDec *flacdec = GST_FLACDEC (element); + GstFlacDec *flacdec = GST_FLAC_DEC (element); switch (transition) { case GST_STATE_CHANGE_READY_TO_PAUSED: diff --git a/ext/flac/gstflacdec.h b/ext/flac/gstflacdec.h index 2280b3f5..0280370c 100644 --- a/ext/flac/gstflacdec.h +++ b/ext/flac/gstflacdec.h @@ -18,8 +18,8 @@ */ -#ifndef __FLACDEC_H__ -#define __FLACDEC_H__ +#ifndef __GST_FLAC_DEC_H__ +#define __GST_FLAC_DEC_H__ #include <gst/gst.h> @@ -31,16 +31,16 @@ extern "C" { #endif /* __cplusplus */ -#define GST_TYPE_FLACDEC flacdec_get_type() -#define GST_FLACDEC(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_FLACDEC, FlacDec) -#define GST_FLACDEC_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_FLACDEC, FlacDec) -#define GST_IS_FLACDEC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLACDEC) -#define GST_IS_FLACDEC_CLASS(obj) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLACDEC) +#define GST_TYPE_FLAC_DEC flacdec_get_type() +#define GST_FLAC_DEC(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_FLAC_DEC, GstFlacDec) +#define GST_FLAC_DEC_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_FLAC_DEC, GstFlacDec) +#define GST_IS_FLAC_DEC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLAC_DEC) +#define GST_IS_FLAC_DEC_CLASS(obj) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLAC_DEC) -typedef struct _FlacDec FlacDec; -typedef struct _FlacDecClass FlacDecClass; +typedef struct _GstFlacDec GstFlacDec; +typedef struct _GstFlacDecClass GstFlacDecClass; -struct _FlacDec { +struct _GstFlacDec { GstElement element; GstPad *sinkpad,*srcpad; @@ -63,15 +63,15 @@ struct _FlacDec { gboolean eos; }; -struct _FlacDecClass { +struct _GstFlacDecClass { GstElementClass parent_class; }; -GType flacdec_get_type(void); +GType flacdec_get_type (void); #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __FLACDEC_H__ */ +#endif /* __GST_FLAC_DEC_H__ */ diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index 75c83796..9a33104d 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -92,32 +92,33 @@ GST_DEBUG_CATEGORY_STATIC (flacenc_debug); &tag_setter_info); \ }G_STMT_END -GST_BOILERPLATE_FULL (GstFlacEnc, gst_flacenc, GstElement, GST_TYPE_ELEMENT, +GST_BOILERPLATE_FULL (GstFlacEnc, gst_flac_enc, GstElement, GST_TYPE_ELEMENT, _do_init); -static void gst_flacenc_finalize (GObject * object); +static void gst_flac_enc_finalize (GObject * object); -static gboolean gst_flacenc_sink_setcaps (GstPad * pad, GstCaps * caps); -static gboolean gst_flacenc_sink_event (GstPad * pad, GstEvent * event); -static GstFlowReturn gst_flacenc_chain (GstPad * pad, GstBuffer * buffer); +static gboolean gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * caps); +static gboolean gst_flac_enc_sink_event (GstPad * pad, GstEvent * event); +static GstFlowReturn gst_flac_enc_chain (GstPad * pad, GstBuffer * buffer); -static gboolean gst_flacenc_update_quality (GstFlacEnc * flacenc, gint quality); -static void gst_flacenc_set_property (GObject * object, guint prop_id, +static gboolean gst_flac_enc_update_quality (GstFlacEnc * flacenc, + gint quality); +static void gst_flac_enc_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); -static void gst_flacenc_get_property (GObject * object, guint prop_id, +static void gst_flac_enc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static GstStateChangeReturn gst_flacenc_change_state (GstElement * element, +static GstStateChangeReturn gst_flac_enc_change_state (GstElement * element, GstStateChange transition); static FLAC__StreamEncoderWriteStatus -gst_flacenc_write_callback (const FLAC__SeekableStreamEncoder * encoder, +gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data); static FLAC__SeekableStreamEncoderSeekStatus -gst_flacenc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, +gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, FLAC__uint64 absolute_byte_offset, void *client_data); static FLAC__SeekableStreamEncoderTellStatus -gst_flacenc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, +gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, FLAC__uint64 * absolute_byte_offset, void *client_data); typedef struct @@ -151,9 +152,9 @@ static const GstFlacEncParams flacenc_params[] = { #define DEFAULT_QUALITY 5 -#define GST_TYPE_FLACENC_QUALITY (gst_flacenc_quality_get_type ()) +#define GST_TYPE_FLAC_ENC_QUALITY (gst_flac_enc_quality_get_type ()) GType -gst_flacenc_quality_get_type (void) +gst_flac_enc_quality_get_type (void) { static GType qtype = 0; @@ -178,7 +179,7 @@ gst_flacenc_quality_get_type (void) } static void -gst_flacenc_base_init (gpointer g_class) +gst_flac_enc_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); @@ -194,7 +195,7 @@ gst_flacenc_base_init (gpointer g_class) } static void -gst_flacenc_class_init (GstFlacEncClass * klass) +gst_flac_enc_class_init (GstFlacEncClass * klass) { GObjectClass *gobject_class; GstElementClass *gstelement_class; @@ -202,15 +203,15 @@ gst_flacenc_class_init (GstFlacEncClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - gobject_class->set_property = gst_flacenc_set_property; - gobject_class->get_property = gst_flacenc_get_property; - gobject_class->finalize = gst_flacenc_finalize; + gobject_class->set_property = gst_flac_enc_set_property; + gobject_class->get_property = gst_flac_enc_get_property; + gobject_class->finalize = gst_flac_enc_finalize; g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_QUALITY, g_param_spec_enum ("quality", "Quality", "Speed versus compression tradeoff", - GST_TYPE_FLACENC_QUALITY, DEFAULT_QUALITY, G_PARAM_READWRITE)); + GST_TYPE_FLAC_ENC_QUALITY, DEFAULT_QUALITY, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_STREAMABLE_SUBSET, g_param_spec_boolean ("streamable_subset", "Streamable subset", @@ -281,11 +282,11 @@ gst_flacenc_class_init (GstFlacEncClass * klass) flacenc_params[DEFAULT_QUALITY].rice_parameter_search_dist, G_PARAM_READWRITE)); - gstelement_class->change_state = gst_flacenc_change_state; + gstelement_class->change_state = gst_flac_enc_change_state; } static void -gst_flacenc_init (GstFlacEnc * flacenc, GstFlacEncClass * klass) +gst_flac_enc_init (GstFlacEnc * flacenc, GstFlacEncClass * klass) { GstElementClass *eclass = GST_ELEMENT_CLASS (klass); @@ -293,9 +294,9 @@ gst_flacenc_init (GstFlacEnc * flacenc, GstFlacEncClass * klass) gst_pad_new_from_template (gst_element_class_get_pad_template (eclass, "sink"), "sink"); gst_element_add_pad (GST_ELEMENT (flacenc), flacenc->sinkpad); - gst_pad_set_chain_function (flacenc->sinkpad, gst_flacenc_chain); - gst_pad_set_event_function (flacenc->sinkpad, gst_flacenc_sink_event); - gst_pad_set_setcaps_function (flacenc->sinkpad, gst_flacenc_sink_setcaps); + gst_pad_set_chain_function (flacenc->sinkpad, gst_flac_enc_chain); + gst_pad_set_event_function (flacenc->sinkpad, gst_flac_enc_sink_event); + gst_pad_set_setcaps_function (flacenc->sinkpad, gst_flac_enc_sink_setcaps); flacenc->srcpad = gst_pad_new_from_template (gst_element_class_get_pad_template (eclass, @@ -307,14 +308,14 @@ gst_flacenc_init (GstFlacEnc * flacenc, GstFlacEncClass * klass) flacenc->offset = 0; flacenc->samples_written = 0; - gst_flacenc_update_quality (flacenc, DEFAULT_QUALITY); + gst_flac_enc_update_quality (flacenc, DEFAULT_QUALITY); flacenc->tags = gst_tag_list_new (); } static void -gst_flacenc_finalize (GObject * object) +gst_flac_enc_finalize (GObject * object) { - GstFlacEnc *flacenc = GST_FLACENC (object); + GstFlacEnc *flacenc = GST_FLAC_ENC (object); FLAC__seekable_stream_encoder_delete (flacenc->encoder); @@ -326,7 +327,7 @@ add_one_tag (const GstTagList * list, const gchar * tag, gpointer user_data) { GList *comments; GList *it; - GstFlacEnc *flacenc = GST_FLACENC (user_data); + GstFlacEnc *flacenc = GST_FLAC_ENC (user_data); comments = gst_tag_to_vorbis_comments (list, tag); for (it = comments; it != NULL; it = it->next) { @@ -343,7 +344,7 @@ add_one_tag (const GstTagList * list, const gchar * tag, gpointer user_data) } static void -gst_flacenc_set_metadata (GstFlacEnc * flacenc) +gst_flac_enc_set_metadata (GstFlacEnc * flacenc) { const GstTagList *user_tags; GstTagList *copy; @@ -368,14 +369,14 @@ gst_flacenc_set_metadata (GstFlacEnc * flacenc) } static gboolean -gst_flacenc_sink_setcaps (GstPad * pad, GstCaps * caps) +gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * caps) { GstFlacEnc *flacenc; GstStructure *structure; FLAC__SeekableStreamEncoderState state; /* takes a ref on flacenc */ - flacenc = GST_FLACENC (gst_pad_get_parent (pad)); + flacenc = GST_FLAC_ENC (gst_pad_get_parent (pad)); if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) != FLAC__SEEKABLE_STREAM_ENCODER_UNINITIALIZED) @@ -406,15 +407,15 @@ gst_flacenc_sink_setcaps (GstPad * pad, GstCaps * caps) flacenc->channels); FLAC__seekable_stream_encoder_set_write_callback (flacenc->encoder, - gst_flacenc_write_callback); + gst_flac_enc_write_callback); FLAC__seekable_stream_encoder_set_seek_callback (flacenc->encoder, - gst_flacenc_seek_callback); + gst_flac_enc_seek_callback); FLAC__seekable_stream_encoder_set_tell_callback (flacenc->encoder, - gst_flacenc_tell_callback); + gst_flac_enc_tell_callback); FLAC__seekable_stream_encoder_set_client_data (flacenc->encoder, flacenc); - gst_flacenc_set_metadata (flacenc); + gst_flac_enc_set_metadata (flacenc); state = FLAC__seekable_stream_encoder_init (flacenc->encoder); if (state != FLAC__STREAM_ENCODER_OK) @@ -448,7 +449,7 @@ failed_to_initialize: } static gboolean -gst_flacenc_update_quality (GstFlacEnc * flacenc, gint quality) +gst_flac_enc_update_quality (GstFlacEnc * flacenc, gint quality) { flacenc->quality = quality; @@ -492,14 +493,14 @@ gst_flacenc_update_quality (GstFlacEnc * flacenc, gint quality) } static FLAC__SeekableStreamEncoderSeekStatus -gst_flacenc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, +gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, FLAC__uint64 absolute_byte_offset, void *client_data) { GstFlacEnc *flacenc; GstEvent *event; GstPad *peerpad; - flacenc = GST_FLACENC (client_data); + flacenc = GST_FLAC_ENC (client_data); if (flacenc->stopped) return FLAC__STREAM_ENCODER_OK; @@ -525,7 +526,7 @@ gst_flacenc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, } static FLAC__StreamEncoderWriteStatus -gst_flacenc_write_callback (const FLAC__SeekableStreamEncoder * encoder, +gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) { @@ -533,7 +534,7 @@ gst_flacenc_write_callback (const FLAC__SeekableStreamEncoder * encoder, GstFlacEnc *flacenc; GstBuffer *outbuf; - flacenc = GST_FLACENC (client_data); + flacenc = GST_FLAC_ENC (client_data); if (flacenc->stopped) return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; @@ -574,10 +575,10 @@ gst_flacenc_write_callback (const FLAC__SeekableStreamEncoder * encoder, } static FLAC__SeekableStreamEncoderTellStatus -gst_flacenc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, +gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, FLAC__uint64 * absolute_byte_offset, void *client_data) { - GstFlacEnc *flacenc = GST_FLACENC (client_data); + GstFlacEnc *flacenc = GST_FLAC_ENC (client_data); *absolute_byte_offset = flacenc->offset; @@ -585,13 +586,13 @@ gst_flacenc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, } static gboolean -gst_flacenc_sink_event (GstPad * pad, GstEvent * event) +gst_flac_enc_sink_event (GstPad * pad, GstEvent * event) { GstFlacEnc *flacenc; GstTagList *taglist; gboolean ret = TRUE; - flacenc = GST_FLACENC (gst_pad_get_parent (pad)); + flacenc = GST_FLAC_ENC (gst_pad_get_parent (pad)); GST_DEBUG ("Received %s event on sinkpad", GST_EVENT_TYPE_NAME (event)); @@ -648,7 +649,7 @@ gst_flacenc_sink_event (GstPad * pad, GstEvent * event) } static GstFlowReturn -gst_flacenc_chain (GstPad * pad, GstBuffer * buffer) +gst_flac_enc_chain (GstPad * pad, GstBuffer * buffer) { GstFlacEnc *flacenc; FLAC__int32 *data; @@ -657,7 +658,7 @@ gst_flacenc_chain (GstPad * pad, GstBuffer * buffer) gulong i; FLAC__bool res; - flacenc = GST_FLACENC (gst_pad_get_parent (pad)); + flacenc = GST_FLAC_ENC (gst_pad_get_parent (pad)); depth = flacenc->depth; @@ -696,16 +697,16 @@ gst_flacenc_chain (GstPad * pad, GstBuffer * buffer) } static void -gst_flacenc_set_property (GObject * object, guint prop_id, +gst_flac_enc_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) { - GstFlacEnc *this = GST_FLACENC (object); + GstFlacEnc *this = GST_FLAC_ENC (object); GST_OBJECT_LOCK (this); switch (prop_id) { case PROP_QUALITY: - gst_flacenc_update_quality (this, g_value_get_enum (value)); + gst_flac_enc_update_quality (this, g_value_get_enum (value)); break; case PROP_STREAMABLE_SUBSET: FLAC__seekable_stream_encoder_set_streamable_subset (this->encoder, @@ -764,10 +765,10 @@ gst_flacenc_set_property (GObject * object, guint prop_id, } static void -gst_flacenc_get_property (GObject * object, guint prop_id, +gst_flac_enc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { - GstFlacEnc *this = GST_FLACENC (object); + GstFlacEnc *this = GST_FLAC_ENC (object); GST_OBJECT_LOCK (this); @@ -839,10 +840,10 @@ gst_flacenc_get_property (GObject * object, guint prop_id, } static GstStateChangeReturn -gst_flacenc_change_state (GstElement * element, GstStateChange transition) +gst_flac_enc_change_state (GstElement * element, GstStateChange transition) { GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; - GstFlacEnc *flacenc = GST_FLACENC (element); + GstFlacEnc *flacenc = GST_FLAC_ENC (element); switch (transition) { case GST_STATE_CHANGE_NULL_TO_READY: diff --git a/ext/flac/gstflacenc.h b/ext/flac/gstflacenc.h index dd3ad40c..9a68386d 100644 --- a/ext/flac/gstflacenc.h +++ b/ext/flac/gstflacenc.h @@ -18,23 +18,21 @@ */ -#ifndef __FLACENC_H__ -#define __FLACENC_H__ - +#ifndef __GST_FLAC_ENC_H__ +#define __GST_FLAC_ENC_H__ #include <gst/gst.h> #include <FLAC/all.h> - G_BEGIN_DECLS -#define GST_TYPE_FLACENC (gst_flacenc_get_type()) -#define GST_FLACENC(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_FLACENC, GstFlacEnc) -#define GST_FLACENC_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_FLACENC, GstFlacEnc) -#define GST_IS_FLACENC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLACENC) -#define GST_IS_FLACENC_CLASS(obj) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLACENC) +#define GST_TYPE_FLAC_ENC (gst_flac_enc_get_type()) +#define GST_FLAC_ENC(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_FLAC_ENC, GstFlacEnc) +#define GST_FLAC_ENC_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_FLAC_ENC, GstFlacEnc) +#define GST_IS_FLAC_ENC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLAC_ENC) +#define GST_IS_FLAC_ENC_CLASS(obj) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLAC_ENC) typedef struct _GstFlacEnc GstFlacEnc; typedef struct _GstFlacEncClass GstFlacEncClass; @@ -67,10 +65,10 @@ struct _GstFlacEncClass { GstElementClass parent_class; }; -GType gst_flacenc_get_type(void); +GType gst_flac_enc_get_type(void); G_END_DECLS -#endif /* __FLACENC_H__ */ +#endif /* __GST_FLAC_ENC_H__ */ |