From 0b58d4430cb3017b4b4cb6f2f0ff909d7c332b5c Mon Sep 17 00:00:00 2001 From: will <104373134+w-utter@users.noreply.github.com> Date: Mon, 3 Mar 2025 12:16:45 +1100 Subject: [PATCH] change fn signature in IntoGlibPtr to match glib latest Part-of: --- Cargo.lock | 24 ++++++++++++------------ gstreamer-play/src/config.rs | 2 +- gstreamer-player/src/config.rs | 2 +- gstreamer-video/src/video_codec_frame.rs | 6 ++++-- gstreamer-video/src/video_meta.rs | 8 +++----- gstreamer/src/caps_features.rs | 2 +- gstreamer/src/iterator.rs | 2 +- gstreamer/src/miniobject.rs | 2 +- gstreamer/src/structure.rs | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d1a1d5dec..77d06d5ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -169,7 +169,7 @@ checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" [[package]] name = "cairo-rs" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "bitflags 2.8.0", "cairo-sys-rs", @@ -180,7 +180,7 @@ dependencies = [ [[package]] name = "cairo-sys-rs" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "glib-sys", "libc", @@ -725,7 +725,7 @@ dependencies = [ [[package]] name = "gio" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "futures-channel", "futures-core", @@ -741,7 +741,7 @@ dependencies = [ [[package]] name = "gio-sys" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "glib-sys", "gobject-sys", @@ -770,7 +770,7 @@ dependencies = [ [[package]] name = "glib" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "bitflags 2.8.0", "futures-channel", @@ -790,7 +790,7 @@ dependencies = [ [[package]] name = "glib-macros" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "heck", "proc-macro-crate", @@ -802,7 +802,7 @@ dependencies = [ [[package]] name = "glib-sys" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "libc", "system-deps", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "gobject-sys" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "glib-sys", "libc", @@ -1971,7 +1971,7 @@ dependencies = [ [[package]] name = "pango" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "gio", "glib", @@ -1982,7 +1982,7 @@ dependencies = [ [[package]] name = "pango-sys" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "glib-sys", "gobject-sys", @@ -1993,7 +1993,7 @@ dependencies = [ [[package]] name = "pangocairo" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "cairo-rs", "glib", @@ -2005,7 +2005,7 @@ dependencies = [ [[package]] name = "pangocairo-sys" version = "0.21.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#a7079b6862891393e33c84dfb9111d848a1a39cc" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#9ce31b97ee1e26e5e3bacffaad26963a437af03e" dependencies = [ "cairo-sys-rs", "glib-sys", diff --git a/gstreamer-play/src/config.rs b/gstreamer-play/src/config.rs index f187d98e5..b2f68a0d8 100644 --- a/gstreamer-play/src/config.rs +++ b/gstreamer-play/src/config.rs @@ -120,7 +120,7 @@ impl PlayConfig { impl IntoGlibPtr<*mut gst::ffi::GstStructure> for PlayConfig { #[inline] - unsafe fn into_glib_ptr(self) -> *mut gst::ffi::GstStructure { + fn into_glib_ptr(self) -> *mut gst::ffi::GstStructure { let mut s = mem::ManuallyDrop::new(self); s.0.to_glib_none_mut().0 } diff --git a/gstreamer-player/src/config.rs b/gstreamer-player/src/config.rs index bbf8e5f9a..df39623b4 100644 --- a/gstreamer-player/src/config.rs +++ b/gstreamer-player/src/config.rs @@ -99,7 +99,7 @@ impl PlayerConfig { impl IntoGlibPtr<*mut gst::ffi::GstStructure> for PlayerConfig { #[inline] - unsafe fn into_glib_ptr(self) -> *mut gst::ffi::GstStructure { + fn into_glib_ptr(self) -> *mut gst::ffi::GstStructure { let mut s = mem::ManuallyDrop::new(self); s.0.to_glib_none_mut().0 } diff --git a/gstreamer-video/src/video_codec_frame.rs b/gstreamer-video/src/video_codec_frame.rs index f34dc583c..f875f2e4b 100644 --- a/gstreamer-video/src/video_codec_frame.rs +++ b/gstreamer-video/src/video_codec_frame.rs @@ -237,9 +237,11 @@ impl<'a> VideoCodecFrame<'a> { impl IntoGlibPtr<*mut ffi::GstVideoCodecFrame> for VideoCodecFrame<'_> { #[inline] - unsafe fn into_glib_ptr(self) -> *mut ffi::GstVideoCodecFrame { + fn into_glib_ptr(self) -> *mut ffi::GstVideoCodecFrame { let stream_lock = self.element.stream_lock(); - glib::ffi::g_rec_mutex_unlock(stream_lock); + unsafe { + glib::ffi::g_rec_mutex_unlock(stream_lock); + } let s = mem::ManuallyDrop::new(self); s.to_glib_none().0 diff --git a/gstreamer-video/src/video_meta.rs b/gstreamer-video/src/video_meta.rs index 955250d35..224e39a9c 100644 --- a/gstreamer-video/src/video_meta.rs +++ b/gstreamer-video/src/video_meta.rs @@ -1125,11 +1125,9 @@ impl AncillaryMeta { #[inline] pub fn set_data(&mut self, data: glib::Slice) { - unsafe { - assert!(data.len() < 256); - self.0.data_count = data.len() as u16; - self.0.data = data.into_glib_ptr(); - } + assert!(data.len() < 256); + self.0.data_count = data.len() as u16; + self.0.data = data.into_glib_ptr(); } #[inline] diff --git a/gstreamer/src/caps_features.rs b/gstreamer/src/caps_features.rs index 3bc20f582..a41ceed42 100644 --- a/gstreamer/src/caps_features.rs +++ b/gstreamer/src/caps_features.rs @@ -92,7 +92,7 @@ impl CapsFeatures { impl IntoGlibPtr<*mut ffi::GstCapsFeatures> for CapsFeatures { #[inline] - unsafe fn into_glib_ptr(self) -> *mut ffi::GstCapsFeatures { + fn into_glib_ptr(self) -> *mut ffi::GstCapsFeatures { let s = mem::ManuallyDrop::new(self); s.0.as_ptr() } diff --git a/gstreamer/src/iterator.rs b/gstreamer/src/iterator.rs index 9e40f2e17..d8b706f19 100644 --- a/gstreamer/src/iterator.rs +++ b/gstreamer/src/iterator.rs @@ -221,7 +221,7 @@ where impl IntoGlibPtr<*mut ffi::GstIterator> for Iterator { #[inline] - unsafe fn into_glib_ptr(self) -> *mut ffi::GstIterator { + fn into_glib_ptr(self) -> *mut ffi::GstIterator { let s = mem::ManuallyDrop::new(self); let it = s.to_glib_none().0; it as *mut _ diff --git a/gstreamer/src/miniobject.rs b/gstreamer/src/miniobject.rs index 0ba61eb4b..b7227da19 100644 --- a/gstreamer/src/miniobject.rs +++ b/gstreamer/src/miniobject.rs @@ -126,7 +126,7 @@ macro_rules! mini_object_wrapper ( impl $crate::glib::translate::IntoGlibPtr<*mut $ffi_name> for $name { #[inline] - unsafe fn into_glib_ptr(self) -> *mut $ffi_name { + fn into_glib_ptr(self) -> *mut $ffi_name { let s = std::mem::ManuallyDrop::new(self); s.as_mut_ptr() } diff --git a/gstreamer/src/structure.rs b/gstreamer/src/structure.rs index b488d4f86..3e5917c43 100644 --- a/gstreamer/src/structure.rs +++ b/gstreamer/src/structure.rs @@ -164,7 +164,7 @@ impl Structure { impl IntoGlibPtr<*mut ffi::GstStructure> for Structure { #[inline] - unsafe fn into_glib_ptr(self) -> *mut ffi::GstStructure { + fn into_glib_ptr(self) -> *mut ffi::GstStructure { let s = mem::ManuallyDrop::new(self); s.0.as_ptr() }