From 849a524b09634bdb2cc2233ef5d1c506a3fea8db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 30 May 2021 20:27:49 +0300 Subject: [PATCH] element: Make caps in link_filtered() / link_pads_filtered() mandatory Instead of passing `None`, the non-filtered variants of the functions can be used. Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/issues/328 --- gstreamer/Gir.toml | 8 ++++++++ gstreamer/src/auto/element.rs | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gstreamer/Gir.toml b/gstreamer/Gir.toml index 2b667f134..dece0f730 100644 --- a/gstreamer/Gir.toml +++ b/gstreamer/Gir.toml @@ -556,6 +556,10 @@ manual_traits = ["ElementExtManual"] [[object.function]] name = "link_filtered" + [[object.function.parameter]] + name = "filter" + # Can use `link` instead + nullable = false [object.function.return] bool_return_is_error = "Failed to link elements" @@ -566,6 +570,10 @@ manual_traits = ["ElementExtManual"] [[object.function]] name = "link_pads_filtered" + [[object.function.parameter]] + name = "filter" + # Can use `link` instead + nullable = false [object.function.return] bool_return_is_error = "Failed to link pads" diff --git a/gstreamer/src/auto/element.rs b/gstreamer/src/auto/element.rs index 2488d37fd..4f2751d9b 100644 --- a/gstreamer/src/auto/element.rs +++ b/gstreamer/src/auto/element.rs @@ -172,7 +172,7 @@ pub trait ElementExt: 'static { fn link_filtered>( &self, dest: &P, - filter: Option<&Caps>, + filter: &Caps, ) -> Result<(), glib::error::BoolError>; //#[doc(alias = "gst_element_link_many")] @@ -192,7 +192,7 @@ pub trait ElementExt: 'static { srcpadname: Option<&str>, dest: &P, destpadname: Option<&str>, - filter: Option<&Caps>, + filter: &Caps, ) -> Result<(), glib::error::BoolError>; #[doc(alias = "gst_element_link_pads_full")] @@ -547,7 +547,7 @@ impl> ElementExt for O { fn link_filtered>( &self, dest: &P, - filter: Option<&Caps>, + filter: &Caps, ) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( @@ -589,7 +589,7 @@ impl> ElementExt for O { srcpadname: Option<&str>, dest: &P, destpadname: Option<&str>, - filter: Option<&Caps>, + filter: &Caps, ) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!(