rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

base/basetransform: Update BaseTransformImpl::set_caps() return type for consistency

Browse source 
In all other base classes it is a Result instead of a bool, so do the
same here.

Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/issues/225
This commit is contained in:
Sebastian Dröge 2019-11-21 00:02:23 +02:00
parent 80e01dbe3c
commit a783280dcf
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gstreamer-base/src/subclass/base_transform.rs
View file

@ -51,7 +51,12 @@ pub trait BaseTransformImpl: BaseTransformImplExt + ElementImpl + Send + Sync +
self.parent_fixate_caps(element, direction, caps, othercaps) self.parent_fixate_caps(element, direction, caps, othercaps)
} }
fn set_caps(&self, element: &BaseTransform, incaps: &gst::Caps, outcaps: &gst::Caps) -> bool { fn set_caps(
&self,
element: &BaseTransform,
incaps: &gst::Caps,
outcaps: &gst::Caps,
) -> Result<(), gst::LoggableError> {
self.parent_set_caps(element, incaps, outcaps) self.parent_set_caps(element, incaps, outcaps)
} }
@ -148,7 +153,7 @@ pub trait BaseTransformImplExt {
element: &BaseTransform, element: &BaseTransform,
incaps: &gst::Caps, incaps: &gst::Caps,
outcaps: &gst::Caps, outcaps: &gst::Caps,
) -> bool; ) -> Result<(), gst::LoggableError>;
fn parent_accept_caps( fn parent_accept_caps(
&self, &self,
@ -295,7 +300,7 @@ impl<T: BaseTransformImpl + ObjectImpl> BaseTransformImplExt for T {
element: &BaseTransform, element: &BaseTransform,
incaps: &gst::Caps, incaps: &gst::Caps,
outcaps: &gst::Caps, outcaps: &gst::Caps,
) -> bool { ) -> Result<(), gst::LoggableError> {
unsafe { unsafe {
let data = self.get_type_data(); let data = self.get_type_data();
let parent_class = let parent_class =
@ -303,13 +308,17 @@ impl<T: BaseTransformImpl + ObjectImpl> BaseTransformImplExt for T {
(*parent_class) (*parent_class)
.set_caps .set_caps
.map(|f| { .map(|f| {
from_glib(f( gst_result_from_gboolean!(
element.to_glib_none().0, f(
incaps.to_glib_none().0, element.to_glib_none().0,
outcaps.to_glib_none().0, incaps.to_glib_none().0,
)) outcaps.to_glib_none().0,
),
gst::CAT_RUST,
"Parent function `set_caps` failed"
)
}) })
.unwrap_or(true) .unwrap_or(Ok(()))
} }
} }
@ -731,7 +740,13 @@ where
let wrap: BaseTransform = from_glib_borrow(ptr); let wrap: BaseTransform = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, { gst_panic_to_error!(&wrap, &instance.panicked(), false, {
imp.set_caps(&wrap, &from_glib_borrow(incaps), &from_glib_borrow(outcaps)) match imp.set_caps(&wrap, &from_glib_borrow(incaps), &from_glib_borrow(outcaps)) {
Ok(()) => true,
Err(err) => {
err.log_with_object(&wrap);
false
}
}
}) })
.to_glib() .to_glib()
} }