mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-06-06 16:29:27 +00:00
Code Issues Projects Releases Wiki Activity

gst: fix Element::request_new_pad signature

Browse source 
See:

https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1133#note_1600152
This commit is contained in:
François Laignel 2022-10-21 10:16:34 +02:00
parent 4ebdfb8602
commit 0e5a4f05f8
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/src/bin/cairo_compositor.rs
View file

@ -161,7 +161,7 @@ mod cairo_compositor {
fn request_new_pad(
&self,
templ: &gst::PadTemplate,
name: Option<String>,
name: Option<&str>,
caps: Option<&gst::Caps>,
) -> Option<gst::Pad> {
let element = self.instance();

9
gstreamer/src/subclass/element.rs
View file

@ -93,7 +93,7 @@ pub trait ElementImpl: ElementImplExt + GstObjectImpl + Send + Sync {
fn request_new_pad(
&self,
templ: &crate::PadTemplate,
name: Option<String>,
name: Option<&str>,
caps: Option<&crate::Caps>,
) -> Option<crate::Pad> {
self.parent_request_new_pad(templ, name, caps)
@ -137,7 +137,7 @@ pub trait ElementImplExt: ObjectSubclass {
fn parent_request_new_pad(
&self,
templ: &crate::PadTemplate,
name: Option<String>,
name: Option<&str>,
caps: Option<&crate::Caps>,
) -> Option<crate::Pad>;
@ -198,7 +198,7 @@ impl<T: ElementImpl> ElementImplExt for T {
fn parent_request_new_pad(
&self,
templ: &crate::PadTemplate,
name: Option<String>,
name: Option<&str>,
caps: Option<&crate::Caps>,
) -> Option<crate::Pad> {
unsafe {
@ -481,13 +481,14 @@ unsafe extern "C" fn element_request_new_pad<T: ElementImpl>(
let imp = instance.imp();
let caps = Option::<crate::Caps>::from_glib_borrow(caps);
let name = Option::<String>::from_glib_none(name);
// XXX: This is effectively unsafe but the best we can do
// See https://bugzilla.gnome.org/show_bug.cgi?id=791193
let pad = panic_to_error!(imp, None, {
imp.request_new_pad(
&from_glib_borrow(templ),
from_glib_none(name),
name.as_deref(),
caps.as_ref().as_ref(),
)
});