From 0b544ffbd32ba2ed9c84f6e88fc62f9f054a8d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 15 Nov 2021 11:48:14 +0200 Subject: [PATCH] Simplify `glib::IsImplementable` trait implementations --- gstreamer-player/src/subclass/player_video_renderer.rs | 2 -- gstreamer/src/subclass/child_proxy.rs | 2 -- gstreamer/src/subclass/preset.rs | 6 +----- gstreamer/src/subclass/tag_setter.rs | 5 +---- gstreamer/src/subclass/uri_handler.rs | 2 -- 5 files changed, 2 insertions(+), 15 deletions(-) diff --git a/gstreamer-player/src/subclass/player_video_renderer.rs b/gstreamer-player/src/subclass/player_video_renderer.rs index 9b6c14b8c..229d4431b 100644 --- a/gstreamer-player/src/subclass/player_video_renderer.rs +++ b/gstreamer-player/src/subclass/player_video_renderer.rs @@ -16,8 +16,6 @@ unsafe impl IsImplementable for PlayerVideoRender iface.create_video_sink = Some(video_renderer_create_video_sink::); } - - fn instance_init(_instance: &mut glib::subclass::InitializingObject) {} } pub trait PlayerVideoRendererImplExt: ObjectSubclass { diff --git a/gstreamer/src/subclass/child_proxy.rs b/gstreamer/src/subclass/child_proxy.rs index 54f6a0c07..6ebe75014 100644 --- a/gstreamer/src/subclass/child_proxy.rs +++ b/gstreamer/src/subclass/child_proxy.rs @@ -124,8 +124,6 @@ unsafe impl IsImplementable for ChildProxy { iface.child_added = Some(child_proxy_child_added::); iface.child_removed = Some(child_proxy_child_removed::); } - - fn instance_init(_instance: &mut glib::subclass::InitializingObject) {} } unsafe extern "C" fn child_proxy_get_child_by_name( diff --git a/gstreamer/src/subclass/preset.rs b/gstreamer/src/subclass/preset.rs index 2c3ca85d4..5dc8a6464 100644 --- a/gstreamer/src/subclass/preset.rs +++ b/gstreamer/src/subclass/preset.rs @@ -6,8 +6,4 @@ use crate::Preset; pub trait PresetImpl: super::element::ElementImpl {} -unsafe impl IsImplementable for Preset { - fn interface_init(_iface: &mut glib::Interface) {} - - fn instance_init(_instance: &mut glib::subclass::InitializingObject) {} -} +unsafe impl IsImplementable for Preset {} diff --git a/gstreamer/src/subclass/tag_setter.rs b/gstreamer/src/subclass/tag_setter.rs index b7b9153a3..b2b1fe062 100644 --- a/gstreamer/src/subclass/tag_setter.rs +++ b/gstreamer/src/subclass/tag_setter.rs @@ -6,7 +6,4 @@ use crate::TagSetter; pub trait TagSetterImpl: super::element::ElementImpl {} -unsafe impl IsImplementable for TagSetter { - fn interface_init(_iface: &mut glib::Interface) {} - fn instance_init(_instance: &mut glib::subclass::InitializingObject) {} -} +unsafe impl IsImplementable for TagSetter {} diff --git a/gstreamer/src/subclass/uri_handler.rs b/gstreamer/src/subclass/uri_handler.rs index c17656f06..83ab1c3ad 100644 --- a/gstreamer/src/subclass/uri_handler.rs +++ b/gstreamer/src/subclass/uri_handler.rs @@ -102,8 +102,6 @@ unsafe impl IsImplementable for URIHandler { iface.get_uri = Some(uri_handler_get_uri::); iface.set_uri = Some(uri_handler_set_uri::); } - - fn instance_init(_instance: &mut glib::subclass::InitializingObject) {} } unsafe extern "C" fn uri_handler_get_type(