From 99fbbc32cbb0a095411670965c0995fe9b32bf1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 5 Nov 2020 18:48:17 +0200 Subject: [PATCH] Use glib::Class instead of glib::object::Class --- gstreamer-audio/src/subclass/audio_decoder.rs | 2 +- gstreamer-audio/src/subclass/audio_encoder.rs | 2 +- gstreamer-audio/src/subclass/audio_sink.rs | 2 +- gstreamer-audio/src/subclass/audio_src.rs | 2 +- gstreamer-base/src/subclass/aggregator.rs | 2 +- gstreamer-base/src/subclass/aggregator_pad.rs | 2 +- gstreamer-base/src/subclass/base_parse.rs | 2 +- gstreamer-base/src/subclass/base_sink.rs | 2 +- gstreamer-base/src/subclass/base_src.rs | 2 +- gstreamer-base/src/subclass/base_transform.rs | 2 +- gstreamer-base/src/subclass/push_src.rs | 2 +- gstreamer-rtsp-server/src/subclass/rtsp_client.rs | 2 +- gstreamer-rtsp-server/src/subclass/rtsp_media.rs | 2 +- gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs | 2 +- gstreamer-rtsp-server/src/subclass/rtsp_server.rs | 2 +- gstreamer-video/src/subclass/video_decoder.rs | 2 +- gstreamer-video/src/subclass/video_encoder.rs | 2 +- gstreamer-video/src/subclass/video_sink.rs | 2 +- gstreamer/src/subclass/bin.rs | 2 +- gstreamer/src/subclass/clock.rs | 2 +- gstreamer/src/subclass/device.rs | 2 +- gstreamer/src/subclass/device_provider.rs | 2 +- gstreamer/src/subclass/element.rs | 2 +- gstreamer/src/subclass/ghost_pad.rs | 2 +- gstreamer/src/subclass/pad.rs | 2 +- gstreamer/src/subclass/pipeline.rs | 2 +- gstreamer/src/subclass/system_clock.rs | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gstreamer-audio/src/subclass/audio_decoder.rs b/gstreamer-audio/src/subclass/audio_decoder.rs index 2beb5ce26..2631db38f 100644 --- a/gstreamer-audio/src/subclass/audio_decoder.rs +++ b/gstreamer-audio/src/subclass/audio_decoder.rs @@ -513,7 +513,7 @@ unsafe impl IsSubclassable for AudioDecoder where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_audio_sys::GstAudioDecoderClass); diff --git a/gstreamer-audio/src/subclass/audio_encoder.rs b/gstreamer-audio/src/subclass/audio_encoder.rs index bfe403fbe..c5319fc21 100644 --- a/gstreamer-audio/src/subclass/audio_encoder.rs +++ b/gstreamer-audio/src/subclass/audio_encoder.rs @@ -462,7 +462,7 @@ unsafe impl IsSubclassable for AudioEncoder where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_audio_sys::GstAudioEncoderClass); diff --git a/gstreamer-audio/src/subclass/audio_sink.rs b/gstreamer-audio/src/subclass/audio_sink.rs index c0e3bceaa..2f97dce9e 100644 --- a/gstreamer-audio/src/subclass/audio_sink.rs +++ b/gstreamer-audio/src/subclass/audio_sink.rs @@ -188,7 +188,7 @@ unsafe impl IsSubclassable for AudioSink where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_audio_sys::GstAudioSinkClass); diff --git a/gstreamer-audio/src/subclass/audio_src.rs b/gstreamer-audio/src/subclass/audio_src.rs index 3b2db239d..a237c7a5a 100644 --- a/gstreamer-audio/src/subclass/audio_src.rs +++ b/gstreamer-audio/src/subclass/audio_src.rs @@ -204,7 +204,7 @@ unsafe impl IsSubclassable for AudioSrc where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_audio_sys::GstAudioSrcClass); diff --git a/gstreamer-base/src/subclass/aggregator.rs b/gstreamer-base/src/subclass/aggregator.rs index 72972a2cf..08d8b63dc 100644 --- a/gstreamer-base/src/subclass/aggregator.rs +++ b/gstreamer-base/src/subclass/aggregator.rs @@ -676,7 +676,7 @@ unsafe impl IsSubclassable for Aggregator where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_base_sys::GstAggregatorClass); diff --git a/gstreamer-base/src/subclass/aggregator_pad.rs b/gstreamer-base/src/subclass/aggregator_pad.rs index 00481f706..442531d08 100644 --- a/gstreamer-base/src/subclass/aggregator_pad.rs +++ b/gstreamer-base/src/subclass/aggregator_pad.rs @@ -100,7 +100,7 @@ impl AggregatorPadImplExt for T { } } unsafe impl IsSubclassable for AggregatorPad { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_base_sys::GstAggregatorPadClass); diff --git a/gstreamer-base/src/subclass/base_parse.rs b/gstreamer-base/src/subclass/base_parse.rs index 770b45566..2a1d93dcb 100644 --- a/gstreamer-base/src/subclass/base_parse.rs +++ b/gstreamer-base/src/subclass/base_parse.rs @@ -218,7 +218,7 @@ unsafe impl IsSubclassable for BaseParse where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_base_sys::GstBaseParseClass); diff --git a/gstreamer-base/src/subclass/base_sink.rs b/gstreamer-base/src/subclass/base_sink.rs index fa91075f2..78203b3f8 100644 --- a/gstreamer-base/src/subclass/base_sink.rs +++ b/gstreamer-base/src/subclass/base_sink.rs @@ -384,7 +384,7 @@ unsafe impl IsSubclassable for BaseSink where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_base_sys::GstBaseSinkClass); diff --git a/gstreamer-base/src/subclass/base_src.rs b/gstreamer-base/src/subclass/base_src.rs index c5a1f8edb..f821d5d5d 100644 --- a/gstreamer-base/src/subclass/base_src.rs +++ b/gstreamer-base/src/subclass/base_src.rs @@ -573,7 +573,7 @@ unsafe impl IsSubclassable for BaseSrc where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_base_sys::GstBaseSrcClass); diff --git a/gstreamer-base/src/subclass/base_transform.rs b/gstreamer-base/src/subclass/base_transform.rs index 14b020cec..8541f3fa9 100644 --- a/gstreamer-base/src/subclass/base_transform.rs +++ b/gstreamer-base/src/subclass/base_transform.rs @@ -830,7 +830,7 @@ unsafe impl IsSubclassable for BaseTransform where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_base_sys::GstBaseTransformClass); diff --git a/gstreamer-base/src/subclass/push_src.rs b/gstreamer-base/src/subclass/push_src.rs index d802cf522..7082134bf 100644 --- a/gstreamer-base/src/subclass/push_src.rs +++ b/gstreamer-base/src/subclass/push_src.rs @@ -117,7 +117,7 @@ unsafe impl IsSubclassable for PushSrc where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { <::BaseSrc as IsSubclassable>::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_base_sys::GstPushSrcClass); diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_client.rs b/gstreamer-rtsp-server/src/subclass/rtsp_client.rs index f5caa0080..f8ad29b34 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_client.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_client.rs @@ -793,7 +793,7 @@ impl RTSPClientImplExt for T { } } unsafe impl IsSubclassable for RTSPClient { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_rtsp_server_sys::GstRTSPClientClass); diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_media.rs b/gstreamer-rtsp-server/src/subclass/rtsp_media.rs index 91b4faa4c..623d3781c 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_media.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_media.rs @@ -449,7 +449,7 @@ impl RTSPMediaImplExt for T { } } unsafe impl IsSubclassable for RTSPMedia { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_rtsp_server_sys::GstRTSPMediaClass); diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs b/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs index 5067f27fe..35651aefe 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs @@ -202,7 +202,7 @@ impl RTSPMediaFactoryImplExt for T { } } unsafe impl IsSubclassable for RTSPMediaFactory { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_server.rs b/gstreamer-rtsp-server/src/subclass/rtsp_server.rs index 7bd36ca60..a209a0404 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_server.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_server.rs @@ -54,7 +54,7 @@ impl RTSPServerImplExt for T { } } unsafe impl IsSubclassable for RTSPServer { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_rtsp_server_sys::GstRTSPServerClass); diff --git a/gstreamer-video/src/subclass/video_decoder.rs b/gstreamer-video/src/subclass/video_decoder.rs index 3ac85ee0b..d5ea08643 100644 --- a/gstreamer-video/src/subclass/video_decoder.rs +++ b/gstreamer-video/src/subclass/video_decoder.rs @@ -502,7 +502,7 @@ unsafe impl IsSubclassable for VideoDecoder where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_video_sys::GstVideoDecoderClass); diff --git a/gstreamer-video/src/subclass/video_encoder.rs b/gstreamer-video/src/subclass/video_encoder.rs index 1266a6bfc..ace9610c8 100644 --- a/gstreamer-video/src/subclass/video_encoder.rs +++ b/gstreamer-video/src/subclass/video_encoder.rs @@ -438,7 +438,7 @@ unsafe impl IsSubclassable for VideoEncoder where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_video_sys::GstVideoEncoderClass); diff --git a/gstreamer-video/src/subclass/video_sink.rs b/gstreamer-video/src/subclass/video_sink.rs index 15ec81458..1c5d76087 100644 --- a/gstreamer-video/src/subclass/video_sink.rs +++ b/gstreamer-video/src/subclass/video_sink.rs @@ -61,7 +61,7 @@ unsafe impl IsSubclassable for VideoSink where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_video_sys::GstVideoSinkClass); diff --git a/gstreamer/src/subclass/bin.rs b/gstreamer/src/subclass/bin.rs index 04f806a7c..07b1c7867 100644 --- a/gstreamer/src/subclass/bin.rs +++ b/gstreamer/src/subclass/bin.rs @@ -90,7 +90,7 @@ unsafe impl IsSubclassable for Bin where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { <::Element as IsSubclassable>::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_sys::GstBinClass); diff --git a/gstreamer/src/subclass/clock.rs b/gstreamer/src/subclass/clock.rs index a9ca50c30..4052d6d87 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 override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { diff --git a/gstreamer/src/subclass/device.rs b/gstreamer/src/subclass/device.rs index 6e0e74693..5807a7b8f 100644 --- a/gstreamer/src/subclass/device.rs +++ b/gstreamer/src/subclass/device.rs @@ -99,7 +99,7 @@ impl DeviceImplExt for T { } unsafe impl IsSubclassable for Device { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_sys::GstDeviceClass); diff --git a/gstreamer/src/subclass/device_provider.rs b/gstreamer/src/subclass/device_provider.rs index 626e79328..3f741b53d 100644 --- a/gstreamer/src/subclass/device_provider.rs +++ b/gstreamer/src/subclass/device_provider.rs @@ -115,7 +115,7 @@ pub unsafe trait DeviceProviderClassSubclassExt: Sized + 'static { unsafe impl DeviceProviderClassSubclassExt for DeviceProviderClass {} unsafe impl IsSubclassable for DeviceProvider { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { let klass = &mut *(klass.as_mut() as *mut gst_sys::GstDeviceProviderClass); diff --git a/gstreamer/src/subclass/element.rs b/gstreamer/src/subclass/element.rs index d1762a985..125b6ebcc 100644 --- a/gstreamer/src/subclass/element.rs +++ b/gstreamer/src/subclass/element.rs @@ -342,7 +342,7 @@ unsafe impl IsSubclassable for Element where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { diff --git a/gstreamer/src/subclass/ghost_pad.rs b/gstreamer/src/subclass/ghost_pad.rs index f40652504..91c59ccd7 100644 --- a/gstreamer/src/subclass/ghost_pad.rs +++ b/gstreamer/src/subclass/ghost_pad.rs @@ -16,7 +16,7 @@ use GhostPad; pub trait GhostPadImpl: PadImpl {} unsafe impl IsSubclassable for GhostPad { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { <::Pad as IsSubclassable>::override_vfuncs(klass); unsafe { let _klass = &mut *(klass.as_mut() as *mut gst_sys::GstGhostPadClass); diff --git a/gstreamer/src/subclass/pad.rs b/gstreamer/src/subclass/pad.rs index fad7f6b93..9b13a6b3b 100644 --- a/gstreamer/src/subclass/pad.rs +++ b/gstreamer/src/subclass/pad.rs @@ -58,7 +58,7 @@ impl PadImplExt for T { } unsafe impl IsSubclassable for Pad { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { >::override_vfuncs(klass); unsafe { diff --git a/gstreamer/src/subclass/pipeline.rs b/gstreamer/src/subclass/pipeline.rs index 3af922639..3063578bc 100644 --- a/gstreamer/src/subclass/pipeline.rs +++ b/gstreamer/src/subclass/pipeline.rs @@ -19,7 +19,7 @@ unsafe impl IsSubclassable for Pipeline where ::Instance: PanicPoison, { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { <::Bin as IsSubclassable>::override_vfuncs(klass); unsafe { let _klass = &mut *(klass.as_mut() as *mut gst_sys::GstPipelineClass); diff --git a/gstreamer/src/subclass/system_clock.rs b/gstreamer/src/subclass/system_clock.rs index f2220d644..1ad150406 100644 --- a/gstreamer/src/subclass/system_clock.rs +++ b/gstreamer/src/subclass/system_clock.rs @@ -16,7 +16,7 @@ use SystemClock; pub trait SystemClockImpl: ClockImpl {} unsafe impl IsSubclassable for SystemClock { - fn override_vfuncs(klass: &mut glib::object::Class) { + fn override_vfuncs(klass: &mut glib::Class) { <::Clock as IsSubclassable>::override_vfuncs(klass); unsafe { let _klass = &mut *(klass.as_mut() as *mut gst_sys::GstSystemClockClass);