diff --git a/gstreamer-audio/src/subclass/audio_decoder.rs b/gstreamer-audio/src/subclass/audio_decoder.rs index 940ea2ed5..951853ddf 100644 --- a/gstreamer-audio/src/subclass/audio_decoder.rs +++ b/gstreamer-audio/src/subclass/audio_decoder.rs @@ -522,7 +522,7 @@ impl AudioDecoderImplExt for T { unsafe impl IsSubclassable for AudioDecoder { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.open = Some(audio_decoder_open::); klass.close = Some(audio_decoder_close::); @@ -542,10 +542,6 @@ unsafe impl IsSubclassable for AudioDecoder { klass.propose_allocation = Some(audio_decoder_propose_allocation::); klass.decide_allocation = Some(audio_decoder_decide_allocation::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn audio_decoder_open( diff --git a/gstreamer-audio/src/subclass/audio_encoder.rs b/gstreamer-audio/src/subclass/audio_encoder.rs index 44d800b59..6b877d7c1 100644 --- a/gstreamer-audio/src/subclass/audio_encoder.rs +++ b/gstreamer-audio/src/subclass/audio_encoder.rs @@ -472,7 +472,7 @@ impl AudioEncoderImplExt for T { unsafe impl IsSubclassable for AudioEncoder { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.open = Some(audio_encoder_open::); klass.close = Some(audio_encoder_close::); @@ -491,10 +491,6 @@ unsafe impl IsSubclassable for AudioEncoder { klass.propose_allocation = Some(audio_encoder_propose_allocation::); klass.decide_allocation = Some(audio_encoder_decide_allocation::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn audio_encoder_open( diff --git a/gstreamer-audio/src/subclass/audio_sink.rs b/gstreamer-audio/src/subclass/audio_sink.rs index 8e28459c2..69dcf7293 100644 --- a/gstreamer-audio/src/subclass/audio_sink.rs +++ b/gstreamer-audio/src/subclass/audio_sink.rs @@ -184,7 +184,7 @@ impl AudioSinkImplExt for T { unsafe impl IsSubclassable for AudioSink { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.close = Some(audiosink_close::); klass.delay = Some(audiosink_delay::); @@ -194,10 +194,6 @@ unsafe impl IsSubclassable for AudioSink { klass.write = Some(audiosink_write::); klass.reset = Some(audiosink_reset::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn audiosink_close( diff --git a/gstreamer-audio/src/subclass/audio_src.rs b/gstreamer-audio/src/subclass/audio_src.rs index dad587cbf..d250f59ee 100644 --- a/gstreamer-audio/src/subclass/audio_src.rs +++ b/gstreamer-audio/src/subclass/audio_src.rs @@ -200,7 +200,7 @@ impl AudioSrcImplExt for T { unsafe impl IsSubclassable for AudioSrc { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.close = Some(audiosrc_close::); klass.delay = Some(audiosrc_delay::); @@ -210,10 +210,6 @@ unsafe impl IsSubclassable for AudioSrc { klass.read = Some(audiosrc_read::); klass.reset = Some(audiosrc_reset::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn audiosrc_close( diff --git a/gstreamer-base/src/subclass/aggregator.rs b/gstreamer-base/src/subclass/aggregator.rs index 84d429cbe..c55e22d95 100644 --- a/gstreamer-base/src/subclass/aggregator.rs +++ b/gstreamer-base/src/subclass/aggregator.rs @@ -792,7 +792,7 @@ impl AggregatorImplExt for T { unsafe impl IsSubclassable for Aggregator { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.flush = Some(aggregator_flush::); klass.clip = Some(aggregator_clip::); @@ -821,10 +821,6 @@ unsafe impl IsSubclassable for Aggregator { klass.finish_buffer_list = Some(aggregator_finish_buffer_list::); } } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn aggregator_flush( diff --git a/gstreamer-base/src/subclass/aggregator_pad.rs b/gstreamer-base/src/subclass/aggregator_pad.rs index aefe8c647..33a9f2eab 100644 --- a/gstreamer-base/src/subclass/aggregator_pad.rs +++ b/gstreamer-base/src/subclass/aggregator_pad.rs @@ -93,15 +93,11 @@ impl AggregatorPadImplExt for T { } unsafe impl IsSubclassable for AggregatorPad { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.flush = Some(aggregator_pad_flush::); klass.skip_buffer = Some(aggregator_pad_skip_buffer::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn aggregator_pad_flush( diff --git a/gstreamer-base/src/subclass/base_parse.rs b/gstreamer-base/src/subclass/base_parse.rs index 123a700db..02d6efa60 100644 --- a/gstreamer-base/src/subclass/base_parse.rs +++ b/gstreamer-base/src/subclass/base_parse.rs @@ -199,7 +199,7 @@ impl BaseParseImplExt for T { unsafe impl IsSubclassable for BaseParse { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.start = Some(base_parse_start::); klass.stop = Some(base_parse_stop::); @@ -207,10 +207,6 @@ unsafe impl IsSubclassable for BaseParse { klass.handle_frame = Some(base_parse_handle_frame::); klass.convert = Some(base_parse_convert::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn base_parse_start( diff --git a/gstreamer-base/src/subclass/base_sink.rs b/gstreamer-base/src/subclass/base_sink.rs index 78a9f5b03..7e9feb63e 100644 --- a/gstreamer-base/src/subclass/base_sink.rs +++ b/gstreamer-base/src/subclass/base_sink.rs @@ -430,7 +430,7 @@ impl BaseSinkImplExt for T { unsafe impl IsSubclassable for BaseSink { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.start = Some(base_sink_start::); klass.stop = Some(base_sink_stop::); @@ -447,10 +447,6 @@ unsafe impl IsSubclassable for BaseSink { klass.unlock_stop = Some(base_sink_unlock_stop::); klass.propose_allocation = Some(base_sink_propose_allocation::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn base_sink_start( diff --git a/gstreamer-base/src/subclass/base_src.rs b/gstreamer-base/src/subclass/base_src.rs index 74a0c313c..7b8097057 100644 --- a/gstreamer-base/src/subclass/base_src.rs +++ b/gstreamer-base/src/subclass/base_src.rs @@ -614,7 +614,7 @@ impl BaseSrcImplExt for T { unsafe impl IsSubclassable for BaseSrc { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.start = Some(base_src_start::); klass.stop = Some(base_src_stop::); @@ -635,10 +635,6 @@ unsafe impl IsSubclassable for BaseSrc { klass.unlock_stop = Some(base_src_unlock_stop::); klass.decide_allocation = Some(base_src_decide_allocation::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn base_src_start( diff --git a/gstreamer-base/src/subclass/base_transform.rs b/gstreamer-base/src/subclass/base_transform.rs index 8d8d8b5f7..44b0932e5 100644 --- a/gstreamer-base/src/subclass/base_transform.rs +++ b/gstreamer-base/src/subclass/base_transform.rs @@ -920,7 +920,7 @@ impl BaseTransformImplExt for T { unsafe impl IsSubclassable for BaseTransform { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.start = Some(base_transform_start::); klass.stop = Some(base_transform_stop::); @@ -960,10 +960,6 @@ unsafe impl IsSubclassable for BaseTransform { } } } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } #[derive(Debug)] diff --git a/gstreamer-base/src/subclass/push_src.rs b/gstreamer-base/src/subclass/push_src.rs index 0ec7a3bf7..9898b1746 100644 --- a/gstreamer-base/src/subclass/push_src.rs +++ b/gstreamer-base/src/subclass/push_src.rs @@ -176,16 +176,12 @@ impl PushSrcImplExt for T { unsafe impl IsSubclassable for PushSrc { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.fill = Some(push_src_fill::); klass.alloc = Some(push_src_alloc::); klass.create = Some(push_src_create::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn push_src_fill( diff --git a/gstreamer-gl/src/subclass/gl_base_filter.rs b/gstreamer-gl/src/subclass/gl_base_filter.rs index 22e0c1071..397a9a1fb 100644 --- a/gstreamer-gl/src/subclass/gl_base_filter.rs +++ b/gstreamer-gl/src/subclass/gl_base_filter.rs @@ -102,16 +102,12 @@ impl GLBaseFilterImplExt for T { unsafe impl IsSubclassable for GLBaseFilter { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.gl_set_caps = Some(gl_set_caps::); klass.gl_start = Some(gl_start::); klass.gl_stop = Some(gl_stop::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance) - } } unsafe extern "C" fn gl_set_caps( diff --git a/gstreamer-gl/src/subclass/gl_base_src.rs b/gstreamer-gl/src/subclass/gl_base_src.rs index e70c50dae..d5a5039d5 100644 --- a/gstreamer-gl/src/subclass/gl_base_src.rs +++ b/gstreamer-gl/src/subclass/gl_base_src.rs @@ -95,17 +95,13 @@ impl GLBaseSrcImplExt for T { unsafe impl IsSubclassable for GLBaseSrc { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.supported_gl_api = T::SUPPORTED_GL_API.into_glib(); klass.gl_start = Some(gl_start::); klass.gl_stop = Some(gl_stop::); klass.fill_gl_memory = Some(fill_gl_memory::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance) - } } unsafe extern "C" fn gl_start(ptr: *mut GstGLBaseSrc) -> glib::ffi::gboolean { diff --git a/gstreamer-gl/src/subclass/gl_filter.rs b/gstreamer-gl/src/subclass/gl_filter.rs index e47bbf186..b3b5913cc 100644 --- a/gstreamer-gl/src/subclass/gl_filter.rs +++ b/gstreamer-gl/src/subclass/gl_filter.rs @@ -226,7 +226,7 @@ impl GLFilterImplExt for T { unsafe impl IsSubclassable for GLFilter { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.set_caps = Some(set_caps::); klass.init_fbo = Some(init_fbo::); @@ -247,10 +247,6 @@ unsafe impl IsSubclassable for GLFilter { unsafe { ffi::gst_gl_filter_add_rgba_pad_templates(klass) } } } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance) - } } unsafe extern "C" fn filter( diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_client.rs b/gstreamer-rtsp-server/src/subclass/rtsp_client.rs index 45f4d6a4a..66ade789a 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_client.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_client.rs @@ -855,7 +855,7 @@ impl RTSPClientImplExt for T { } unsafe impl IsSubclassable for RTSPClient { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.create_sdp = Some(client_create_sdp::); klass.configure_client_media = Some(client_configure_client_media::); @@ -888,10 +888,6 @@ unsafe impl IsSubclassable for RTSPClient { klass.pre_announce_request = Some(client_pre_announce_request::); klass.pre_record_request = Some(client_pre_record_request::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn client_create_sdp( diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_media.rs b/gstreamer-rtsp-server/src/subclass/rtsp_media.rs index d6bc00b00..422c26300 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_media.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_media.rs @@ -452,7 +452,7 @@ impl RTSPMediaImplExt for T { } unsafe impl IsSubclassable for RTSPMedia { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.handle_message = Some(media_handle_message::); klass.prepare = Some(media_prepare::); @@ -472,10 +472,6 @@ unsafe impl IsSubclassable for RTSPMedia { klass.new_state = Some(media_new_state::); klass.handle_sdp = Some(media_handle_sdp::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn media_handle_message( diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs b/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs index 3dad2dac0..61d84dafd 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs @@ -226,7 +226,7 @@ impl RTSPMediaFactoryImplExt for T { } unsafe impl IsSubclassable for RTSPMediaFactory { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.gen_key = Some(factory_gen_key::); klass.create_element = Some(factory_create_element::); @@ -236,10 +236,6 @@ unsafe impl IsSubclassable for RTSPMediaFactory { klass.media_constructed = Some(factory_media_constructed::); klass.media_configure = Some(factory_media_configure::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn factory_gen_key( diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_mount_points.rs b/gstreamer-rtsp-server/src/subclass/rtsp_mount_points.rs index 6ef166096..7690d1988 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_mount_points.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_mount_points.rs @@ -50,14 +50,10 @@ impl RTSPMountPointsImplExt for T { unsafe impl IsSubclassable for RTSPMountPoints { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.make_path = Some(mount_points_make_path::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn mount_points_make_path( diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_server.rs b/gstreamer-rtsp-server/src/subclass/rtsp_server.rs index 15e97499a..0133945a5 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_server.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_server.rs @@ -49,15 +49,11 @@ impl RTSPServerImplExt for T { } unsafe impl IsSubclassable for RTSPServer { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.create_client = Some(server_create_client::); klass.client_connected = Some(server_client_connected::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn server_create_client( diff --git a/gstreamer-video/src/subclass/video_decoder.rs b/gstreamer-video/src/subclass/video_decoder.rs index 8263e2a09..a660eceb5 100644 --- a/gstreamer-video/src/subclass/video_decoder.rs +++ b/gstreamer-video/src/subclass/video_decoder.rs @@ -572,7 +572,7 @@ impl VideoDecoderImplExt for T { unsafe impl IsSubclassable for VideoDecoder { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.open = Some(video_decoder_open::); klass.close = Some(video_decoder_close::); @@ -597,10 +597,6 @@ unsafe impl IsSubclassable for VideoDecoder { klass.handle_missing_data = Some(video_decoder_handle_missing_data::); } } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn video_decoder_open( diff --git a/gstreamer-video/src/subclass/video_encoder.rs b/gstreamer-video/src/subclass/video_encoder.rs index 93f769082..020c02b4e 100644 --- a/gstreamer-video/src/subclass/video_encoder.rs +++ b/gstreamer-video/src/subclass/video_encoder.rs @@ -464,7 +464,7 @@ impl VideoEncoderImplExt for T { unsafe impl IsSubclassable for VideoEncoder { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.open = Some(video_encoder_open::); klass.close = Some(video_encoder_close::); @@ -483,10 +483,6 @@ unsafe impl IsSubclassable for VideoEncoder { klass.propose_allocation = Some(video_encoder_propose_allocation::); klass.decide_allocation = Some(video_encoder_decide_allocation::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn video_encoder_open( diff --git a/gstreamer-video/src/subclass/video_filter.rs b/gstreamer-video/src/subclass/video_filter.rs index c80bb8ca0..2fed33988 100644 --- a/gstreamer-video/src/subclass/video_filter.rs +++ b/gstreamer-video/src/subclass/video_filter.rs @@ -211,7 +211,8 @@ unsafe impl IsSubclassable for VideoFilter { fn class_init(klass: &mut glib::Class) { use gst_base::subclass::base_transform::BaseTransformMode; - >::class_init(klass); + Self::parent_class_init::(klass); + let klass = klass.as_mut(); klass.set_info = Some(video_filter_set_info::); @@ -230,10 +231,6 @@ unsafe impl IsSubclassable for VideoFilter { } } } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn video_filter_set_info( diff --git a/gstreamer-video/src/subclass/video_sink.rs b/gstreamer-video/src/subclass/video_sink.rs index 0419df697..e32cc5ef4 100644 --- a/gstreamer-video/src/subclass/video_sink.rs +++ b/gstreamer-video/src/subclass/video_sink.rs @@ -49,14 +49,10 @@ impl VideoSinkImplExt for T { unsafe impl IsSubclassable for VideoSink { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.show_frame = Some(video_sink_show_frame::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn video_sink_show_frame( diff --git a/gstreamer/src/subclass/bin.rs b/gstreamer/src/subclass/bin.rs index c2463d5d2..d6fc94ccd 100644 --- a/gstreamer/src/subclass/bin.rs +++ b/gstreamer/src/subclass/bin.rs @@ -100,16 +100,12 @@ impl BinImplExt for T { unsafe impl IsSubclassable for Bin { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.add_element = Some(bin_add_element::); klass.remove_element = Some(bin_remove_element::); klass.handle_message = Some(bin_handle_message::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn bin_add_element( diff --git a/gstreamer/src/subclass/clock.rs b/gstreamer/src/subclass/clock.rs index 2c1a89ee8..a06705cc4 100644 --- a/gstreamer/src/subclass/clock.rs +++ b/gstreamer/src/subclass/clock.rs @@ -233,7 +233,7 @@ impl ClockImplExt for T { unsafe impl IsSubclassable for Clock { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.change_resolution = Some(clock_change_resolution::); klass.get_resolution = Some(clock_get_resolution::); @@ -242,10 +242,6 @@ unsafe impl IsSubclassable for Clock { klass.wait_async = Some(clock_wait_async::); klass.unschedule = Some(clock_unschedule::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn clock_change_resolution( diff --git a/gstreamer/src/subclass/device.rs b/gstreamer/src/subclass/device.rs index aa1db5b1f..e4b1ebb26 100644 --- a/gstreamer/src/subclass/device.rs +++ b/gstreamer/src/subclass/device.rs @@ -101,15 +101,11 @@ impl DeviceImplExt for T { unsafe impl IsSubclassable for Device { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.create_element = Some(device_create_element::); klass.reconfigure_element = Some(device_reconfigure_element::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn device_create_element( diff --git a/gstreamer/src/subclass/device_provider.rs b/gstreamer/src/subclass/device_provider.rs index a3fd5744a..66b442b45 100644 --- a/gstreamer/src/subclass/device_provider.rs +++ b/gstreamer/src/subclass/device_provider.rs @@ -143,7 +143,7 @@ impl DeviceProviderImplExt for T { unsafe impl IsSubclassable for DeviceProvider { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.probe = Some(device_provider_probe::); klass.start = Some(device_provider_start::); @@ -169,10 +169,6 @@ unsafe impl IsSubclassable for DeviceProvider { } } } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn device_provider_probe( diff --git a/gstreamer/src/subclass/element.rs b/gstreamer/src/subclass/element.rs index f8cfb1863..f47afaa4e 100644 --- a/gstreamer/src/subclass/element.rs +++ b/gstreamer/src/subclass/element.rs @@ -374,8 +374,7 @@ impl ElementImplExt for T { unsafe impl IsSubclassable for Element { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); - + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.change_state = Some(element_change_state::); klass.request_new_pad = Some(element_request_new_pad::); @@ -413,7 +412,7 @@ unsafe impl IsSubclassable for Element { } fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); + Self::parent_instance_init::(instance); instance.set_instance_data(Self::static_type(), atomic::AtomicBool::new(false)); } diff --git a/gstreamer/src/subclass/ghost_pad.rs b/gstreamer/src/subclass/ghost_pad.rs index 6a8bdcd51..30e04f34c 100644 --- a/gstreamer/src/subclass/ghost_pad.rs +++ b/gstreamer/src/subclass/ghost_pad.rs @@ -7,14 +7,4 @@ use crate::GhostPad; pub trait GhostPadImpl: PadImpl {} -unsafe impl IsSubclassable for GhostPad { - fn class_init(klass: &mut glib::Class) { - >::class_init(klass); - let _klass = klass.as_mut(); - // Nothing to do here - } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } -} +unsafe impl IsSubclassable for GhostPad {} diff --git a/gstreamer/src/subclass/pad.rs b/gstreamer/src/subclass/pad.rs index 7aedea76c..9be39ed49 100644 --- a/gstreamer/src/subclass/pad.rs +++ b/gstreamer/src/subclass/pad.rs @@ -60,15 +60,11 @@ impl PadImplExt for T { unsafe impl IsSubclassable for Pad { fn class_init(klass: &mut glib::Class) { - >::class_init(klass); + Self::parent_class_init::(klass); let klass = klass.as_mut(); klass.linked = Some(pad_linked::); klass.unlinked = Some(pad_unlinked::); } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } } unsafe extern "C" fn pad_linked(ptr: *mut ffi::GstPad, peer: *mut ffi::GstPad) { diff --git a/gstreamer/src/subclass/pipeline.rs b/gstreamer/src/subclass/pipeline.rs index 06956e4c9..af56a58c7 100644 --- a/gstreamer/src/subclass/pipeline.rs +++ b/gstreamer/src/subclass/pipeline.rs @@ -7,14 +7,4 @@ use crate::Pipeline; pub trait PipelineImpl: BinImpl {} -unsafe impl IsSubclassable for Pipeline { - fn class_init(klass: &mut glib::Class) { - >::class_init(klass); - let _klass = klass.as_mut(); - // Nothing to do here - } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } -} +unsafe impl IsSubclassable for Pipeline {} diff --git a/gstreamer/src/subclass/system_clock.rs b/gstreamer/src/subclass/system_clock.rs index 69d25c4a1..9c46b4e3b 100644 --- a/gstreamer/src/subclass/system_clock.rs +++ b/gstreamer/src/subclass/system_clock.rs @@ -7,14 +7,4 @@ use crate::SystemClock; pub trait SystemClockImpl: ClockImpl {} -unsafe impl IsSubclassable for SystemClock { - fn class_init(klass: &mut glib::Class) { - >::class_init(klass); - let _klass = klass.as_mut(); - // Nothing to do here - } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } -} +unsafe impl IsSubclassable for SystemClock {} diff --git a/gstreamer/src/subclass/tracer.rs b/gstreamer/src/subclass/tracer.rs index 01ae971dd..9f8b40893 100644 --- a/gstreamer/src/subclass/tracer.rs +++ b/gstreamer/src/subclass/tracer.rs @@ -59,15 +59,7 @@ pub trait TracerImpl: TracerImplExt + ObjectImpl + Send + Sync { fn pad_unlink_pre(&self, ts: u64, src: &Pad, sink: &Pad) {} } -unsafe impl IsSubclassable for Tracer { - fn class_init(klass: &mut glib::Class) { - >::class_init(klass); - } - - fn instance_init(instance: &mut glib::subclass::InitializingObject) { - >::instance_init(instance); - } -} +unsafe impl IsSubclassable for Tracer {} pub trait TracerImplExt: ObjectSubclass { // rustdoc-stripper-ignore-next