From: <tho...@fr...> - 2005-12-09 19:51:26
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: thomasvs Date: Fri Dec 09 2005 11:51:15 PST Log message: borgify and fix up documentation Modified files: . : ChangeLog docs/plugins : gst-plugins-good-plugins-sections.txt gst-plugins-good-plugins.hierarchy docs/plugins/inspect: plugin-1394.xml plugin-aasink.xml plugin-alaw.xml plugin-alpha.xml plugin-alphacolor.xml plugin-auparse.xml plugin-autodetect.xml plugin-avi.xml plugin-cacasink.xml plugin-cairo.xml plugin-cutter.xml plugin-debug.xml plugin-dv.xml plugin-efence.xml plugin-effectv.xml plugin-esdsink.xml plugin-flac.xml plugin-flxdec.xml plugin-gconfelements.xml plugin-goom.xml plugin-jpeg.xml plugin-level.xml plugin-matroska.xml plugin-mulaw.xml plugin-multipart.xml plugin-navigationtest.xml plugin-ossaudio.xml plugin-png.xml plugin-rtp.xml plugin-rtsp.xml plugin-shout2send.xml plugin-smpte.xml plugin-speex.xml plugin-udp.xml plugin-videobox.xml plugin-videoflip.xml plugin-videomixer.xml plugin-wavenc.xml plugin-wavparse.xml ext/flac : gstflac.c gstflacdec.c gstflacdec.h gstflacenc.c gstflacenc.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2042&r2=1.2043 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/gst-plugins-good-plugins-sections.txt.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/gst-plugins-good-plugins.hierarchy.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-1394.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-aasink.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-alaw.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-alpha.xml.diff?r1=1.9&r2=1.10 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-alphacolor.xml.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-auparse.xml.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-autodetect.xml.diff?r1=1.9&r2=1.10 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-avi.xml.diff?r1=1.7&r2=1.8 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-cacasink.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-cairo.xml.diff?r1=1.4&r2=1.5 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-cutter.xml.diff?r1=1.4&r2=1.5 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-debug.xml.diff?r1=1.5&r2=1.6 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-dv.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-efence.xml.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-effectv.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-esdsink.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-flac.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-flxdec.xml.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-gconfelements.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-goom.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-jpeg.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-level.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-matroska.xml.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-mulaw.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-multipart.xml.diff?r1=1.3&r2=1.4 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-navigationtest.xml.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-ossaudio.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-png.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-rtp.xml.diff?r1=1.10&r2=1.11 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-rtsp.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-shout2send.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-smpte.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-speex.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-udp.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-videobox.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-videoflip.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-videomixer.xml.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-wavenc.xml.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-wavparse.xml.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/flac/gstflac.c.diff?r1=1.27&r2=1.28 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/flac/gstflacdec.c.diff?r1=1.64&r2=1.65 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/flac/gstflacdec.h.diff?r1=1.15&r2=1.16 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/flac/gstflacenc.c.diff?r1=1.60&r2=1.61 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/flac/gstflacenc.h.diff?r1=1.14&r2=1.15 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.2042 retrieving revision 1.2043 diff -u -d -r1.2042 -r1.2043 --- ChangeLog 9 Dec 2005 11:12:48 -0000 1.2042 +++ ChangeLog 9 Dec 2005 19:51:02 -0000 1.2043 @@ -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 <ms...@fl...> * ext/flac/gstflacdec.c: (raw_caps_factory), (gst_flacdec_write): Index: gst-plugins-good-plugins-sections.txt RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/gst-plugins-good-plugins-sections.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- gst-plugins-good-plugins-sections.txt 8 Dec 2005 16:27:11 -0000 1.6 +++ gst-plugins-good-plugins-sections.txt 9 Dec 2005 19:51:02 -0000 1.7 @@ -24,10 +24,10 @@ <SECTION> <FILE>element-flacdec</FILE> -FlacDec +GstFlacDec <TITLE>flacdec</TITLE> <SUBSECTION Standard> -FlacDecClass +GstFlacDecClass </SECTION> Index: gst-plugins-good-plugins.hierarchy RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/gst-plugins-good-plugins.hierarchy,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gst-plugins-good-plugins.hierarchy 8 Dec 2005 16:27:11 -0000 1.2 +++ gst-plugins-good-plugins.hierarchy 9 Dec 2005 19:51:02 -0000 1.3 @@ -267,7 +267,7 @@ GstJpegEnc GstJpegDec GstSmokeEnc - FlacDec + GstFlacDec GstDVDemux GstDVDec GstVorbisTag Index: gstflac.c RCS file: /cvs/gstreamer/gst-plugins-good/ext/flac/gstflac.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- gstflac.c 14 Nov 2005 02:13:26 -0000 1.27 +++ gstflac.c 9 Dec 2005 19:51:03 -0000 1.28 @@ -31,10 +31,10 @@ 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)) #if 0 if (!gst_element_register (plugin, "flactag", GST_RANK_PRIMARY, Index: gstflacdec.c RCS file: /cvs/gstreamer/gst-plugins-good/ext/flac/gstflacdec.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- gstflacdec.c 9 Dec 2005 11:12:48 -0000 1.64 +++ gstflacdec.c 9 Dec 2005 19:51:03 -0000 1.65 @@ -66,44 +66,44 @@ "Wim Taymans <wim...@ch...>", }; -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 @@ 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, - 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 @@ } 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_class_init (FlacDecClass * klass) +gst_flac_dec_class_init (GstFlacDecClass * klass) GstElementClass *gstelement_class; GObjectClass *gobject_class; @@ -182,25 +183,25 @@ 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; -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 @@ 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__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); -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 @@ 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_metadata_callback (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_metadata_callback (const FLAC__SeekableStreamDecoder * decoder, const FLAC__StreamMetadata * metadata, void *client_data) - 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); default: @@ -315,13 +316,13 @@ -gst_flacdec_error_callback (const FLAC__SeekableStreamDecoder * decoder, +gst_flac_dec_error_callback (const FLAC__SeekableStreamDecoder * decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) gchar *error; switch (status) { case FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC: @@ -342,12 +343,12 @@ FLAC__uint64 position, void *client_data) GST_DEBUG ("seek %" G_GINT64_FORMAT, position); flacdec->offset = position; @@ -356,12 +357,12 @@ FLAC__uint64 * position, void *client_data) *position = flacdec->offset; @@ -371,15 +372,15 @@ FLAC__uint64 * length, void *client_data) GstFormat fmt = GST_FORMAT_BYTES; gint64 len; GstPad *peer; if (!(peer = gst_pad_get_peer (flacdec->sinkpad))) return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR; @@ -396,24 +397,25 @@ static FLAC__bool -gst_flacdec_eof (const FLAC__SeekableStreamDecoder * decoder, void *client_data) +gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * decoder, + void *client_data) GST_DEBUG ("eof %d", flacdec->eos); return flacdec->eos; FLAC__byte buffer[], unsigned *bytes, void *client_data) GstBuffer *buf; if (gst_pad_pull_range (flacdec->sinkpad, flacdec->offset, *bytes, &buf) != GST_FLOW_OK) @@ -430,11 +432,11 @@ const FLAC__int32 * const buffer[], void *client_data) GstBuffer *outbuf; guint depth = frame->header.bits_per_sample; guint width; @@ -460,7 +462,7 @@ return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; if (flacdec->need_discont) { gint64 time = 0; @@ -476,7 +478,7 @@ 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_loop (GstPad * sinkpad) +gst_flac_dec_loop (GstPad * sinkpad) 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 @@ 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_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 @@ 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_src_query (GstPad * pad, GstQuery * query) +gst_flac_dec_src_query (GstPad * pad, GstQuery * query) switch (GST_QUERY_TYPE (query)) { case GST_QUERY_POSITION:{ @@ -746,7 +748,7 @@ 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 @@ len = flacdec->stream_samples; GST_FORMAT_DEFAULT, len, &fmt, &len)) gst_query_set_duration (query, GST_FORMAT_TIME, len); @@ -778,10 +780,10 @@ -gst_flacdec_src_event (GstPad * pad, GstEvent * event) +gst_flac_dec_src_event (GstPad * pad, GstEvent * event) switch (GST_EVENT_TYPE (event)) { case GST_EVENT_SEEK:{ @@ -795,7 +797,7 @@ 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 @@ 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_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_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 @@ 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: Index: gstflacdec.h RCS file: /cvs/gstreamer/gst-plugins-good/ext/flac/gstflacdec.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- gstflacdec.h 6 Dec 2005 19:44:48 -0000 1.15 +++ gstflacdec.h 9 Dec 2005 19:51:03 -0000 1.16 @@ -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 @@ #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 @@ gboolean eos; -struct _FlacDecClass { +struct _GstFlacDecClass { GstElementClass parent_class; -GType flacdec_get_type(void); +GType flacdec_get_type (void); #ifdef __cplusplus -#endif /* __FLACDEC_H__ */ +#endif /* __GST_FLAC_DEC_H__ */ Index: gstflacenc.c RCS file: /cvs/gstreamer/gst-plugins-good/ext/flac/gstflacenc.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- gstflacenc.c 5 Dec 2005 13:02:57 -0000 1.60 +++ gstflacenc.c 9 Dec 2005 19:51:03 -0000 1.61 @@ -92,32 +92,33 @@ &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, 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 @@ #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_base_init (gpointer g_class) +gst_flac_enc_base_init (gpointer g_class) @@ -194,7 +195,7 @@ -gst_flacenc_class_init (GstFlacEncClass * klass) +gst_flac_enc_class_init (GstFlacEncClass * klass) @@ -202,15 +203,15 @@ 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 @@ 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; -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_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 = @@ -307,14 +308,14 @@ 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 (); -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 @@ 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 @@ -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_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 @@ 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 @@ -gst_flacenc_update_quality (GstFlacEnc * flacenc, gint quality) +gst_flac_enc_update_quality (GstFlacEnc * flacenc, gint quality) flacenc->quality = quality; @@ -492,14 +493,14 @@ FLAC__uint64 absolute_byte_offset, void *client_data) 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 @@ unsigned samples, unsigned current_frame, void *client_data) @@ -533,7 +534,7 @@ return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; @@ -574,10 +575,10 @@ 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_sink_event (GstPad * pad, GstEvent * event) +gst_flac_enc_sink_event (GstPad * pad, GstEvent * event) GstTagList *taglist; gboolean ret = TRUE; GST_DEBUG ("Received %s event on sinkpad", GST_EVENT_TYPE_NAME (event)); @@ -648,7 +649,7 @@ static GstFlowReturn -gst_flacenc_chain (GstPad * pad, GstBuffer * buffer) +gst_flac_enc_chain (GstPad * pad, GstBuffer * buffer) FLAC__int32 *data; @@ -657,7 +658,7 @@ gulong i; FLAC__bool res; depth = flacenc->depth; @@ -696,16 +697,16 @@ -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)); case PROP_STREAMABLE_SUBSET: FLAC__seekable_stream_encoder_set_streamable_subset (this->encoder, @@ -764,10 +765,10 @@ -gst_flacenc_get_property (GObject * object, guint prop_id, +gst_flac_enc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) @@ -839,10 +840,10 @@ -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); case GST_STATE_CHANGE_NULL_TO_READY: Index: gstflacenc.h RCS file: /cvs/gstreamer/gst-plugins-good/ext/flac/gstflacenc.h,v retrieving revision 1.14 diff -u -d -r1.14 -r1.15 --- gstflacenc.h 6 Dec 2005 19:44:48 -0000 1.14 +++ gstflacenc.h 9 Dec 2005 19:51:03 -0000 1.15 @@ -18,23 +18,21 @@ -#ifndef __FLACENC_H__ -#define __FLACENC_H__ - +#ifndef __GST_FLAC_ENC_H__ +#define __GST_FLAC_ENC_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 @@ -GType gst_flacenc_get_type(void); +GType gst_flac_enc_get_type(void); G_END_DECLS -#endif /* __FLACENC_H__ */ +#endif /* __GST_FLAC_ENC_H__ */ Index: plugin-1394.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-1394.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- plugin-1394.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-1394.xml 9 Dec 2005 19:51:03 -0000 1.9 @@ -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> Index: plugin-aasink.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-aasink.xml,v --- plugin-aasink.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-aasink.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>ASCII Art video sink</description> <filename>../../ext/aalib/.libs/libgstaasink.so</filename> <basename>libgstaasink.so</basename> Index: plugin-alaw.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-alaw.xml,v --- plugin-alaw.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-alaw.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>ALaw audio conversion routines</description> <filename>../../gst/law/.libs/libgstalaw.so</filename> <basename>libgstalaw.so</basename> Index: plugin-alpha.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-alpha.xml,v retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- plugin-alpha.xml 5 Dec 2005 18:03:23 -0000 1.9 +++ plugin-alpha.xml 9 Dec 2005 19:51:03 -0000 1.10 <description>adds an alpha channel to video</description> <filename>../../gst/alpha/.libs/libgstalpha.so</filename> <basename>libgstalpha.so</basename> Index: plugin-alphacolor.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-alphacolor.xml,v --- plugin-alphacolor.xml 5 Dec 2005 18:03:23 -0000 1.6 +++ plugin-alphacolor.xml 9 Dec 2005 19:51:03 -0000 1.7 <description>RGB->YUV colorspace conversion preserving the alpha channels</description> <filename>../../gst/alpha/.libs/libgstalphacolor.so</filename> <basename>libgstalphacolor.so</basename> Index: plugin-auparse.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-auparse.xml,v --- plugin-auparse.xml 5 Dec 2005 18:03:23 -0000 1.6 +++ plugin-auparse.xml 9 Dec 2005 19:51:03 -0000 1.7 <description>parses au streams</description> <filename>../../gst/auparse/.libs/libgstauparse.so</filename> <basename>libgstauparse.so</basename> Index: plugin-autodetect.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-autodetect.xml,v --- plugin-autodetect.xml 5 Dec 2005 18:03:23 -0000 1.9 +++ plugin-autodetect.xml 9 Dec 2005 19:51:03 -0000 1.10 <description>Plugin contains auto-detection plugins for video/audio outputs</description> <filename>../../gst/autodetect/.libs/libgstautodetect.so</filename> <basename>libgstautodetect.so</basename> Index: plugin-avi.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-avi.xml,v diff -u -d -r1.7 -r1.8 --- plugin-avi.xml 5 Dec 2005 18:03:23 -0000 1.7 +++ plugin-avi.xml 9 Dec 2005 19:51:03 -0000 1.8 <description>AVI stream handling</description> <filename>../../gst/avi/.libs/libgstavi.so</filename> <basename>libgstavi.so</basename> Index: plugin-cacasink.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-cacasink.xml,v --- plugin-cacasink.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-cacasink.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>Colored ASCII Art video sink</description> <filename>../../ext/libcaca/.libs/libgstcacasink.so</filename> <basename>libgstcacasink.so</basename> Index: plugin-cairo.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-cairo.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- plugin-cairo.xml 25 Nov 2005 21:02:14 -0000 1.4 +++ plugin-cairo.xml 9 Dec 2005 19:51:03 -0000 1.5 @@ -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> <package>GStreamer Good Plug-ins CVS/prerelease</package> Index: plugin-cutter.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-cutter.xml,v --- plugin-cutter.xml 5 Dec 2005 18:03:23 -0000 1.4 +++ plugin-cutter.xml 9 Dec 2005 19:51:03 -0000 1.5 <description>Audio Cutter to split audio into non-silent bits</description> <filename>../../gst/cutter/.libs/libgstcutter.so</filename> <basename>libgstcutter.so</basename> Index: plugin-debug.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-debug.xml,v diff -u -d -r1.5 -r1.6 --- plugin-debug.xml 5 Dec 2005 18:03:23 -0000 1.5 +++ plugin-debug.xml 9 Dec 2005 19:51:03 -0000 1.6 <description>elements for testing and debugging</description> <filename>../../gst/debug/.libs/libgstdebug.so</filename> <basename>libgstdebug.so</basename> Index: plugin-dv.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-dv.xml,v --- plugin-dv.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-dv.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>DV demuxer and decoder based on libdv (libdv.sf.net)</description> <filename>../../ext/dv/.libs/libgstdv.so</filename> <basename>libgstdv.so</basename> Index: plugin-efence.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-efence.xml,v --- plugin-efence.xml 5 Dec 2005 18:03:23 -0000 1.6 +++ plugin-efence.xml 9 Dec 2005 19:51:03 -0000 1.7 <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> Index: plugin-effectv.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-effectv.xml,v --- plugin-effectv.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-effectv.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>effect plugins from the effectv project</description> <filename>../../gst/effectv/.libs/libgsteffectv.so</filename> <basename>libgsteffectv.so</basename> Index: plugin-esdsink.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-esdsink.xml,v --- plugin-esdsink.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-esdsink.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>ESD Element Plugins</description> <filename>../../ext/esd/.libs/libgstesd.so</filename> <basename>libgstesd.so</basename> Index: plugin-flac.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-flac.xml,v --- plugin-flac.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-flac.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>The FLAC Lossless compressor Codec</description> <filename>../../ext/flac/.libs/libgstflac.so</filename> <basename>libgstflac.so</basename> Index: plugin-flxdec.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-flxdec.xml,v --- plugin-flxdec.xml 5 Dec 2005 18:03:23 -0000 1.6 +++ plugin-flxdec.xml 9 Dec 2005 19:51:03 -0000 1.7 <description>FLX video decoder</description> <filename>../../gst/flx/.libs/libgstflxdec.so</filename> <basename>libgstflxdec.so</basename> Index: plugin-gconfelements.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-gconfelements.xml,v --- plugin-gconfelements.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-gconfelements.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>elements wrapping the GStreamer/GConf audio/video output settings</description> <filename>../../ext/gconf/.libs/libgstgconfelements.so</filename> <basename>libgstgconfelements.so</basename> Index: plugin-goom.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-goom.xml,v --- plugin-goom.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-goom.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>GOOM visualization filter</description> <filename>../../gst/goom/.libs/libgstgoom.so</filename> <basename>libgstgoom.so</basename> Index: plugin-jpeg.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-jpeg.xml,v --- plugin-jpeg.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-jpeg.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>JPeg plugin library</description> <filename>../../ext/jpeg/.libs/libgstjpeg.so</filename> <basename>libgstjpeg.so</basename> Index: plugin-level.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-level.xml,v --- plugin-level.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-level.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>Audio level plugin</description> <filename>../../gst/level/.libs/libgstlevel.so</filename> <basename>libgstlevel.so</basename> Index: plugin-matroska.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-matroska.xml,v --- plugin-matroska.xml 5 Dec 2005 18:03:23 -0000 1.6 +++ plugin-matroska.xml 9 Dec 2005 19:51:03 -0000 1.7 <description>Matroska stream handling</description> <filename>../../gst/matroska/.libs/libgstmatroska.so</filename> <basename>libgstmatroska.so</basename> Index: plugin-mulaw.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-mulaw.xml,v --- plugin-mulaw.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-mulaw.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>MuLaw audio conversion routines</description> <filename>../../gst/law/.libs/libgstmulaw.so</filename> <basename>libgstmulaw.so</basename> Index: plugin-multipart.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-multipart.xml,v diff -u -d -r1.3 -r1.4 --- plugin-multipart.xml 5 Dec 2005 18:03:23 -0000 1.3 +++ plugin-multipart.xml 9 Dec 2005 19:51:03 -0000 1.4 <description>multipart stream manipulation</description> <filename>../../gst/multipart/.libs/libgstmultipart.so</filename> <basename>libgstmultipart.so</basename> Index: plugin-navigationtest.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-navigationtest.xml,v --- plugin-navigationtest.xml 5 Dec 2005 18:03:23 -0000 1.6 +++ plugin-navigationtest.xml 9 Dec 2005 19:51:03 -0000 1.7 <description>Template for a video filter</description> <filename>../../gst/debug/.libs/libgstnavigationtest.so</filename> <basename>libgstnavigationtest.so</basename> Index: plugin-ossaudio.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-ossaudio.xml,v --- plugin-ossaudio.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-ossaudio.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>OSS (Open Sound System) support for GStreamer</description> <filename>../../sys/oss/.libs/libgstossaudio.so</filename> <basename>libgstossaudio.so</basename> Index: plugin-png.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-png.xml,v --- plugin-png.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-png.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>PNG plugin library</description> <filename>../../ext/libpng/.libs/libgstpng.so</filename> <basename>libgstpng.so</basename> Index: plugin-rtp.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-rtp.xml,v retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- plugin-rtp.xml 5 Dec 2005 18:03:23 -0000 1.10 +++ plugin-rtp.xml 9 Dec 2005 19:51:03 -0000 1.11 <description>Real-time protocol plugins</description> <filename>../../gst/rtp/.libs/libgstrtp.so</filename> <basename>libgstrtp.so</basename> Index: plugin-rtsp.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-rtsp.xml,v --- plugin-rtsp.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-rtsp.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>transfer data via RTSP</description> <filename>../../gst/rtsp/.libs/libgstrtsp.so</filename> <basename>libgstrtsp.so</basename> Index: plugin-shout2send.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-shout2send.xml,v --- plugin-shout2send.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-shout2send.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>Sends data to an icecast server using libshout2</description> <filename>../../ext/shout2/.libs/libgstshout2.so</filename> <basename>libgstshout2.so</basename> <package>libshout2</package> Index: plugin-smpte.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-smpte.xml,v --- plugin-smpte.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-smpte.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>Apply the standard SMPTE transitions on video images</description> <filename>../../gst/smpte/.libs/libgstsmpte.so</filename> <basename>libgstsmpte.so</basename> Index: plugin-speex.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-speex.xml,v --- plugin-speex.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-speex.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>Speex plugin library</description> <filename>../../ext/speex/.libs/libgstspeex.so</filename> <basename>libgstspeex.so</basename> Index: plugin-udp.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-udp.xml,v --- plugin-udp.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-udp.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>transfer data via UDP</description> <filename>../../gst/udp/.libs/libgstudp.so</filename> <basename>libgstudp.so</basename> Index: plugin-videobox.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-videobox.xml,v --- plugin-videobox.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-videobox.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>resizes a video by adding borders or cropping</description> <filename>../../gst/videobox/.libs/libgstvideobox.so</filename> <basename>libgstvideobox.so</basename> Index: plugin-videoflip.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-videoflip.xml,v --- plugin-videoflip.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-videoflip.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>Flips and rotates video</description> <filename>../../gst/videofilter/.libs/libgstvideoflip.so</filename> <basename>libgstvideoflip.so</basename> Index: plugin-videomixer.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-videomixer.xml,v --- plugin-videomixer.xml 5 Dec 2005 18:03:23 -0000 1.6 +++ plugin-videomixer.xml 9 Dec 2005 19:51:03 -0000 1.7 <description>Video mixer</description> <filename>../../gst/videomixer/.libs/libgstvideomixer.so</filename> <basename>libgstvideomixer.so</basename> Index: plugin-wavenc.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-wavenc.xml,v --- plugin-wavenc.xml 5 Dec 2005 18:03:23 -0000 1.6 +++ plugin-wavenc.xml 9 Dec 2005 19:51:03 -0000 1.7 <description>Encode raw audio into WAV</description> <filename>../../gst/wavenc/.libs/libgstwavenc.so</filename> <basename>libgstwavenc.so</basename> Index: plugin-wavparse.xml RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/inspect/plugin-wavparse.xml,v --- plugin-wavparse.xml 5 Dec 2005 18:03:23 -0000 1.8 +++ plugin-wavparse.xml 9 Dec 2005 19:51:03 -0000 1.9 <description>Parse a .wav file into raw audio</description> <filename>../../gst/wavparse/.libs/libgstwavparse.so</filename> <basename>libgstwavparse.so</basename> |