From 5df7df303c847f5e572cb7c8dc9638fe4da723b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= Date: Wed, 6 Nov 2024 20:33:57 +0100 Subject: [PATCH] gst: Element::foreach*_pad: return ControlFlow instead of bool in callback Same as for BufferList::foreach*. Part-of: --- gstreamer/src/element.rs | 95 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 2 deletions(-) diff --git a/gstreamer/src/element.rs b/gstreamer/src/element.rs index bc0057221..41ac77ec7 100644 --- a/gstreamer/src/element.rs +++ b/gstreamer/src/element.rs @@ -1,6 +1,6 @@ // Take a look at the license at the top of the repository in the LICENSE file. -use std::{ffi::CStr, future::Future, mem, num::NonZeroU64, pin::Pin}; +use std::{ffi::CStr, future::Future, mem, num::NonZeroU64, ops::ControlFlow, pin::Pin}; use glib::translate::*; use itertools::Itertools; @@ -333,6 +333,81 @@ pub trait ElementExtManual: IsA + 'static { } } + #[doc(alias = "gst_element_foreach_pad")] + fn foreach_pad ControlFlow<()>>(&self, func: F) { + unsafe extern "C" fn trampoline ControlFlow<()>>( + element: *mut ffi::GstElement, + pad: *mut ffi::GstPad, + user_data: glib::ffi::gpointer, + ) -> glib::ffi::gboolean { + let element = from_glib_borrow(element); + let pad = from_glib_borrow(pad); + let callback = user_data as *mut F; + (*callback)(&element, &pad).is_continue().into_glib() + } + + unsafe { + let mut func = func; + let func_ptr: &mut F = &mut func; + + let _ = ffi::gst_element_foreach_pad( + self.as_ptr() as *mut _, + Some(trampoline::), + func_ptr as *mut _ as *mut _, + ); + } + } + + #[doc(alias = "gst_element_foreach_sink_pad")] + fn foreach_sink_pad ControlFlow<()>>(&self, func: F) { + unsafe extern "C" fn trampoline ControlFlow<()>>( + element: *mut ffi::GstElement, + pad: *mut ffi::GstPad, + user_data: glib::ffi::gpointer, + ) -> glib::ffi::gboolean { + let element = from_glib_borrow(element); + let pad = from_glib_borrow(pad); + let callback = user_data as *mut P; + (*callback)(&element, &pad).is_continue().into_glib() + } + + unsafe { + let mut func = func; + let func_ptr: &mut F = &mut func; + + let _ = ffi::gst_element_foreach_sink_pad( + self.as_ptr() as *mut _, + Some(trampoline::), + func_ptr as *mut _ as *mut _, + ); + } + } + + #[doc(alias = "gst_element_foreach_src_pad")] + fn foreach_src_pad ControlFlow<()>>(&self, func: F) { + unsafe extern "C" fn trampoline ControlFlow<()>>( + element: *mut ffi::GstElement, + pad: *mut ffi::GstPad, + user_data: glib::ffi::gpointer, + ) -> glib::ffi::gboolean { + let element = from_glib_borrow(element); + let pad = from_glib_borrow(pad); + let callback = user_data as *mut P; + (*callback)(&element, &pad).is_continue().into_glib() + } + + unsafe { + let mut func = func; + let func_ptr: &mut F = &mut func; + + let _ = ffi::gst_element_foreach_src_pad( + self.as_ptr() as *mut _, + Some(trampoline::), + func_ptr as *mut _ as *mut _, + ); + } + } + fn num_pads(&self) -> u16 { unsafe { let elt: &ffi::GstElement = &*(self.as_ptr() as *const _); @@ -1242,10 +1317,26 @@ mod tests { identity.foreach_pad(|_element, pad| { pad_names.push(pad.name()); - true + ControlFlow::Continue(()) }); pad_names.sort(); assert_eq!(pad_names, vec![String::from("sink"), String::from("src")]); + + pad_names.clear(); + identity.foreach_sink_pad(|_element, pad| { + pad_names.push(pad.name()); + + ControlFlow::Continue(()) + }); + assert_eq!(pad_names, vec![String::from("sink")]); + + pad_names.clear(); + identity.foreach_src_pad(|_element, pad| { + pad_names.push(pad.name()); + + ControlFlow::Continue(()) + }); + assert_eq!(pad_names, vec![String::from("src")]); } #[test]