From c32721723bb497ef7039a9f39a61d31c2bbda01a Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 28 Aug 2005 17:52:45 +0000 Subject: [PATCH] Updates for two-arg init from GST_BOILERPLATE_FULL. Original commit message from CVS: 2005-08-28 Andy Wingo * Updates for two-arg init from GST_BOILERPLATE_FULL. --- ChangeLog | 4 ++++ ext/alsa/gstalsamixerelement.c | 3 ++- ext/alsa/gstalsasrc.c | 3 ++- ext/ogg/gstoggdemux.c | 2 +- ext/theora/theoradec.c | 2 +- ext/theora/theoraenc.c | 2 +- ext/vorbis/vorbisdec.c | 2 +- ext/vorbis/vorbisparse.c | 2 +- gst-libs/gst/audio/gstaudiosink.c | 8 +++++--- gst-libs/gst/audio/gstaudiosrc.c | 8 +++++--- gst-libs/gst/audio/gstbaseaudiosink.c | 3 ++- gst-libs/gst/audio/gstbaseaudiosrc.c | 3 ++- gst/audioconvert/gstaudioconvert.c | 5 +---- gst/audioresample/gstaudioresample.c | 6 ++---- gst/videotestsrc/gstvideotestsrc.c | 3 ++- gst/volume/gstvolume.c | 2 +- sys/v4l/gstv4lelement.c | 2 +- sys/v4l/gstv4lsrc.c | 2 +- 18 files changed, 35 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1e7170e71..c5d6e0499a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-08-28 Andy Wingo + + * Updates for two-arg init from GST_BOILERPLATE_FULL. + 2005-08-26 Wim Taymans * gst/audioconvert/audioconvert.c: (if), (float), diff --git a/ext/alsa/gstalsamixerelement.c b/ext/alsa/gstalsamixerelement.c index 869815f01d..6bbe6c313c 100644 --- a/ext/alsa/gstalsamixerelement.c +++ b/ext/alsa/gstalsamixerelement.c @@ -59,7 +59,8 @@ gst_alsa_mixer_element_class_init (GstAlsaMixerElementClass * klass) } static void -gst_alsa_mixer_element_init (GstAlsaMixerElement * this) +gst_alsa_mixer_element_init (GstAlsaMixerElement * this, + GstAlsaMixerElementClass * klass) { this->mixer = NULL; } diff --git a/ext/alsa/gstalsasrc.c b/ext/alsa/gstalsasrc.c index 8bfa258aba..3641fff29a 100644 --- a/ext/alsa/gstalsasrc.c +++ b/ext/alsa/gstalsasrc.c @@ -108,6 +108,7 @@ gst_alsasrc_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&alsasrc_src_factory)); } + static void gst_alsasrc_class_init (GstAlsaSrcClass * klass) { @@ -198,7 +199,7 @@ gst_alsasrc_get_property (GObject * object, guint prop_id, } static void -gst_alsasrc_init (GstAlsaSrc * alsasrc) +gst_alsasrc_init (GstAlsaSrc * alsasrc, GstAlsaSrcClass * g_class) { GST_DEBUG ("initializing alsasrc"); diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index 6e1a2b0fa6..9d8bbab6a5 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -1082,7 +1082,7 @@ gst_ogg_demux_class_init (GstOggDemuxClass * klass) } static void -gst_ogg_demux_init (GstOggDemux * ogg) +gst_ogg_demux_init (GstOggDemux * ogg, GstOggDemuxClass * g_class) { /* create the sink pad */ ogg->sinkpad = diff --git a/ext/theora/theoradec.c b/ext/theora/theoradec.c index 8baf00de80..0bf49c833c 100644 --- a/ext/theora/theoradec.c +++ b/ext/theora/theoradec.c @@ -172,7 +172,7 @@ gst_theora_dec_class_init (GstTheoraDecClass * klass) } static void -gst_theora_dec_init (GstTheoraDec * dec) +gst_theora_dec_init (GstTheoraDec * dec, GstTheoraDecClass * g_class) { dec->sinkpad = gst_pad_new_from_template (gst_static_pad_template_get diff --git a/ext/theora/theoraenc.c b/ext/theora/theoraenc.c index 94d1792b17..6733772a3c 100644 --- a/ext/theora/theoraenc.c +++ b/ext/theora/theoraenc.c @@ -256,7 +256,7 @@ gst_theora_enc_class_init (GstTheoraEncClass * klass) } static void -gst_theora_enc_init (GstTheoraEnc * enc) +gst_theora_enc_init (GstTheoraEnc * enc, GstTheoraEncClass * g_class) { enc->sinkpad = gst_pad_new_from_template (gst_static_pad_template_get diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c index 75f9d0a5ab..95a4197fc7 100644 --- a/ext/vorbis/vorbisdec.c +++ b/ext/vorbis/vorbisdec.c @@ -158,7 +158,7 @@ vorbis_get_query_types (GstPad * pad) } static void -gst_vorbis_dec_init (GstVorbisDec * dec) +gst_vorbis_dec_init (GstVorbisDec * dec, GstVorbisDecClass * g_class) { dec->sinkpad = gst_pad_new_from_template (gst_static_pad_template_get diff --git a/ext/vorbis/vorbisparse.c b/ext/vorbis/vorbisparse.c index 17d4b0768e..af25a94bf7 100644 --- a/ext/vorbis/vorbisparse.c +++ b/ext/vorbis/vorbisparse.c @@ -86,7 +86,7 @@ gst_vorbis_parse_class_init (GstVorbisParseClass * klass) } static void -gst_vorbis_parse_init (GstVorbisParse * parse) +gst_vorbis_parse_init (GstVorbisParse * parse, GstVorbisParseClass * g_class) { parse->sinkpad = gst_pad_new_from_template (gst_static_pad_template_get diff --git a/gst-libs/gst/audio/gstaudiosink.c b/gst-libs/gst/audio/gstaudiosink.c index 8c8e87cd74..74ae5652eb 100644 --- a/gst-libs/gst/audio/gstaudiosink.c +++ b/gst-libs/gst/audio/gstaudiosink.c @@ -64,7 +64,8 @@ struct _GstAudioRingBufferClass }; static void gst_audioringbuffer_class_init (GstAudioRingBufferClass * klass); -static void gst_audioringbuffer_init (GstAudioRingBuffer * ringbuffer); +static void gst_audioringbuffer_init (GstAudioRingBuffer * ringbuffer, + GstAudioRingBufferClass * klass); static void gst_audioringbuffer_dispose (GObject * object); static void gst_audioringbuffer_finalize (GObject * object); @@ -221,7 +222,8 @@ stop_running: } static void -gst_audioringbuffer_init (GstAudioRingBuffer * ringbuffer) +gst_audioringbuffer_init (GstAudioRingBuffer * ringbuffer, + GstAudioRingBufferClass * g_class) { ringbuffer->running = FALSE; ringbuffer->queuedseg = 0; @@ -456,7 +458,7 @@ gst_audio_sink_class_init (GstAudioSinkClass * klass) } static void -gst_audio_sink_init (GstAudioSink * audiosink) +gst_audio_sink_init (GstAudioSink * audiosink, GstAudioSinkClass * g_class) { } diff --git a/gst-libs/gst/audio/gstaudiosrc.c b/gst-libs/gst/audio/gstaudiosrc.c index 305e9ad7d6..7e06aa80d2 100644 --- a/gst-libs/gst/audio/gstaudiosrc.c +++ b/gst-libs/gst/audio/gstaudiosrc.c @@ -64,7 +64,8 @@ struct _GstAudioRingBufferClass }; static void gst_audioringbuffer_class_init (GstAudioRingBufferClass * klass); -static void gst_audioringbuffer_init (GstAudioRingBuffer * ringbuffer); +static void gst_audioringbuffer_init (GstAudioRingBuffer * ringbuffer, + GstAudioRingBufferClass * klass); static void gst_audioringbuffer_dispose (GObject * object); static void gst_audioringbuffer_finalize (GObject * object); @@ -218,7 +219,8 @@ stop_running: } static void -gst_audioringbuffer_init (GstAudioRingBuffer * ringbuffer) +gst_audioringbuffer_init (GstAudioRingBuffer * ringbuffer, + GstAudioRingBufferClass * g_class) { ringbuffer->running = FALSE; ringbuffer->queuedseg = 0; @@ -454,7 +456,7 @@ gst_audio_src_class_init (GstAudioSrcClass * klass) } static void -gst_audio_src_init (GstAudioSrc * audiosrc) +gst_audio_src_init (GstAudioSrc * audiosrc, GstAudioSrcClass * g_class) { gst_base_src_set_live (GST_BASE_SRC (audiosrc), TRUE); } diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c index 1eb1a33f85..46813f5679 100644 --- a/gst-libs/gst/audio/gstbaseaudiosink.c +++ b/gst-libs/gst/audio/gstbaseaudiosink.c @@ -123,7 +123,8 @@ gst_base_audio_sink_class_init (GstBaseAudioSinkClass * klass) } static void -gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink) +gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink, + GstBaseAudioSinkClass * g_class) { baseaudiosink->buffer_time = DEFAULT_BUFFER_TIME; baseaudiosink->latency_time = DEFAULT_LATENCY_TIME; diff --git a/gst-libs/gst/audio/gstbaseaudiosrc.c b/gst-libs/gst/audio/gstbaseaudiosrc.c index 7240742bb0..735f8f0187 100644 --- a/gst-libs/gst/audio/gstbaseaudiosrc.c +++ b/gst-libs/gst/audio/gstbaseaudiosrc.c @@ -119,7 +119,8 @@ gst_base_audio_src_class_init (GstBaseAudioSrcClass * klass) } static void -gst_base_audio_src_init (GstBaseAudioSrc * baseaudiosrc) +gst_base_audio_src_init (GstBaseAudioSrc * baseaudiosrc, + GstBaseAudioSrcClass * g_class) { baseaudiosrc->buffer_time = DEFAULT_BUFFER_TIME; baseaudiosrc->latency_time = DEFAULT_LATENCY_TIME; diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c index f2864b3f2b..5713915889 100644 --- a/gst/audioconvert/gstaudioconvert.c +++ b/gst/audioconvert/gstaudioconvert.c @@ -59,9 +59,6 @@ static GstElementDetails audio_convert_details = { }; /* type functions */ -static void gst_audio_convert_base_init (gpointer g_class); -static void gst_audio_convert_class_init (GstAudioConvertClass * klass); -static void gst_audio_convert_init (GstAudioConvert * audio_convert); static void gst_audio_convert_dispose (GObject * obj); /* gstreamer functions */ @@ -195,7 +192,7 @@ gst_audio_convert_class_init (GstAudioConvertClass * klass) } static void -gst_audio_convert_init (GstAudioConvert * this) +gst_audio_convert_init (GstAudioConvert * this, GstAudioConvertClass * g_class) { } diff --git a/gst/audioresample/gstaudioresample.c b/gst/audioresample/gstaudioresample.c index 79a4d285b6..e3bdba6752 100644 --- a/gst/audioresample/gstaudioresample.c +++ b/gst/audioresample/gstaudioresample.c @@ -80,9 +80,6 @@ GST_STATIC_CAPS ( \ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, SUPPORTED_CAPS); - static void gst_audioresample_base_init (gpointer g_class); - static void gst_audioresample_class_init (GstAudioresampleClass * klass); - static void gst_audioresample_init (GstAudioresample * audioresample); static void gst_audioresample_dispose (GObject * object); static void gst_audioresample_set_property (GObject * object, @@ -150,7 +147,8 @@ static void gst_audioresample_class_init (GstAudioresampleClass * klass) GST_DEBUG_FUNCPTR (audioresample_transform); } -static void gst_audioresample_init (GstAudioresample * audioresample) +static void gst_audioresample_init (GstAudioresample * audioresample, + GstAudioresampleClass * klass) { ResampleState *r; diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c index e29e763f46..e94a8aab5f 100644 --- a/gst/videotestsrc/gstvideotestsrc.c +++ b/gst/videotestsrc/gstvideotestsrc.c @@ -137,7 +137,8 @@ gst_videotestsrc_class_init (GstVideoTestSrcClass * klass) } static void -gst_videotestsrc_init (GstVideoTestSrc * videotestsrc) +gst_videotestsrc_init (GstVideoTestSrc * videotestsrc, + GstVideoTestSrcClass * g_class) { gst_videotestsrc_set_pattern (videotestsrc, GST_VIDEOTESTSRC_SMPTE); diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c index 7ca1cf5046..c3c85cb62a 100644 --- a/gst/volume/gstvolume.c +++ b/gst/volume/gstvolume.c @@ -279,7 +279,7 @@ gst_volume_class_init (GstVolumeClass * klass) } static void -gst_volume_init (GstVolume * this) +gst_volume_init (GstVolume * this, GstVolumeClass * g_class) { GstMixerTrack *track = NULL; diff --git a/sys/v4l/gstv4lelement.c b/sys/v4l/gstv4lelement.c index 4d1636ad6c..a2585588bc 100644 --- a/sys/v4l/gstv4lelement.c +++ b/sys/v4l/gstv4lelement.c @@ -352,7 +352,7 @@ gst_v4lelement_class_init (GstV4lElementClass * klass) static void -gst_v4lelement_init (GstV4lElement * v4lelement) +gst_v4lelement_init (GstV4lElement * v4lelement, GstV4lElementClass * klass) { /* some default values */ v4lelement->video_fd = -1; diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c index 59e271ce7e..e5afa5245f 100644 --- a/sys/v4l/gstv4lsrc.c +++ b/sys/v4l/gstv4lsrc.c @@ -124,7 +124,7 @@ gst_v4lsrc_class_init (GstV4lSrcClass * klass) } static void -gst_v4lsrc_init (GstV4lSrc * v4lsrc) +gst_v4lsrc_init (GstV4lSrc * v4lsrc, GstV4lSrcClass * klass) { v4lsrc->buffer_size = 0;