From 3c0281db0ce18a60feece1d2e76d2bf5bd57e335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 7 Feb 2021 17:40:45 +0200 Subject: [PATCH] gstreamer/uri_handler: Update for glib class data API changes Based on a patch by Bilal Elmoussaoui --- gstreamer/src/subclass/uri_handler.rs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gstreamer/src/subclass/uri_handler.rs b/gstreamer/src/subclass/uri_handler.rs index f8bce2d47..ee459aa83 100644 --- a/gstreamer/src/subclass/uri_handler.rs +++ b/gstreamer/src/subclass/uri_handler.rs @@ -15,6 +15,11 @@ pub trait URIHandlerImpl: super::element::ElementImpl { fn set_uri(&self, element: &Self::Type, uri: &str) -> Result<(), glib::Error>; } +// Send+Sync wrapper around a NULL-terminated C string array +struct CStrV(*const *const libc::c_char); +unsafe impl Send for CStrV {} +unsafe impl Sync for CStrV {} + unsafe impl IsImplementable for URIHandler { unsafe extern "C" fn interface_init( iface: glib::ffi::gpointer, @@ -25,13 +30,10 @@ unsafe impl IsImplementable for URIHandler { // Store the protocols in the interface data for later use let mut data = T::type_data(); let protocols = T::get_protocols(); - let protocols: *mut *const libc::c_char = protocols.to_glib_full(); + let protocols = protocols.to_glib_full(); let data = data.as_mut(); - if data.interface_data.is_null() { - data.interface_data = Box::into_raw(Box::new(Vec::new())); - } - (*(data.interface_data as *mut Vec<(glib::ffi::GType, glib::ffi::gpointer)>)) - .push((URIHandler::static_type().to_glib(), protocols as *mut _)); + + data.set_class_data(URIHandler::static_type(), CStrV(protocols)); uri_handler_iface.get_type = Some(uri_handler_get_type::); uri_handler_iface.get_protocols = Some(uri_handler_get_protocols::); @@ -51,7 +53,9 @@ unsafe extern "C" fn uri_handler_get_protocols( ) -> *const *const libc::c_char { let data = ::type_data(); data.as_ref() - .get_interface_data(URIHandler::static_type().to_glib()) as *const _ + .get_class_data::(URIHandler::static_type()) + .unwrap_or(&CStrV(std::ptr::null())) + .0 } unsafe extern "C" fn uri_handler_get_uri(