mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-05-20 17:28:49 +00:00
Code Issues Projects Releases Wiki Activity

Rename panic_to_error2() to panic_to_error()

Browse source 
No usage of the other one left.
This commit is contained in:
Sebastian Dröge 2017-09-24 23:22:58 +03:00
parent 0423264fea
commit cd23c993ae
4 changed files with 14 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst-plugin/src/base_sink.rs
View file

@ -199,7 +199,7 @@ where
let wrap: gst_base::BaseSink = from_glib_borrow(ptr);
let imp = &*element.imp;
panic_to_error2!(&wrap, &element.panicked, false, { imp.start(&wrap) }).to_glib()
panic_to_error!(&wrap, &element.panicked, false, { imp.start(&wrap) }).to_glib()
}
unsafe extern "C" fn base_sink_stop<T: ObjectType>(
@ -215,7 +215,7 @@ where
let wrap: gst_base::BaseSink = from_glib_borrow(ptr);
let imp = &*element.imp;
panic_to_error2!(&wrap, &element.panicked, false, { imp.stop(&wrap) }).to_glib()
panic_to_error!(&wrap, &element.panicked, false, { imp.stop(&wrap) }).to_glib()
}
unsafe extern "C" fn base_sink_render<T: ObjectType>(
@ -233,7 +233,7 @@ where
let imp = &*element.imp;
let buffer = gst::BufferRef::from_ptr(buffer);
panic_to_error2!(&wrap, &element.panicked, gst::FlowReturn::Error, {
panic_to_error!(&wrap, &element.panicked, gst::FlowReturn::Error, {
imp.render(&wrap, buffer)
}).to_glib()
}
@ -253,7 +253,7 @@ where
let imp = &*element.imp;
let query = gst::QueryRef::from_mut_ptr(query_ptr);
panic_to_error2!(&wrap, &element.panicked, false, { imp.query(&wrap, query) }).to_glib()
panic_to_error!(&wrap, &element.panicked, false, { imp.query(&wrap, query) }).to_glib()
}
unsafe extern "C" fn base_sink_event<T: ObjectType>(
@ -270,7 +270,7 @@ where
let wrap: gst_base::BaseSink = from_glib_borrow(ptr);
let imp = &*element.imp;
panic_to_error2!(&wrap, &element.panicked, false, {
panic_to_error!(&wrap, &element.panicked, false, {
imp.event(&wrap, &from_glib_none(event_ptr))
}).to_glib()
}

16
gst-plugin/src/base_src.rs
View file

@ -256,7 +256,7 @@ where
let wrap: gst_base::BaseSrc = from_glib_borrow(ptr);
let imp = &*element.imp;
panic_to_error2!(&wrap, &element.panicked, false, { imp.start(&wrap) }).to_glib()
panic_to_error!(&wrap, &element.panicked, false, { imp.start(&wrap) }).to_glib()
}
unsafe extern "C" fn base_src_stop<T: ObjectType>(
@ -272,7 +272,7 @@ where
let wrap: gst_base::BaseSrc = from_glib_borrow(ptr);
let imp = &*element.imp;
panic_to_error2!(&wrap, &element.panicked, false, { imp.stop(&wrap) }).to_glib()
panic_to_error!(&wrap, &element.panicked, false, { imp.stop(&wrap) }).to_glib()
}
unsafe extern "C" fn base_src_is_seekable<T: ObjectType>(
@ -288,7 +288,7 @@ where
let wrap: gst_base::BaseSrc = from_glib_borrow(ptr);
let imp = &*element.imp;
panic_to_error2!(&wrap, &element.panicked, false, { imp.is_seekable(&wrap) }).to_glib()
panic_to_error!(&wrap, &element.panicked, false, { imp.is_seekable(&wrap) }).to_glib()
}
unsafe extern "C" fn base_src_get_size<T: ObjectType>(
@ -305,7 +305,7 @@ where
let wrap: gst_base::BaseSrc = from_glib_borrow(ptr);
let imp = &*element.imp;
panic_to_error2!(&wrap, &element.panicked, false, {
panic_to_error!(&wrap, &element.panicked, false, {
match imp.get_size(&wrap) {
Some(s) => {
*size = s;
@ -333,7 +333,7 @@ where
let imp = &*element.imp;
let buffer = gst::BufferRef::from_mut_ptr(buffer);
panic_to_error2!(&wrap, &element.panicked, gst::FlowReturn::Error, {
panic_to_error!(&wrap, &element.panicked, gst::FlowReturn::Error, {
imp.fill(&wrap, offset, length, buffer)
}).to_glib()
}
@ -352,7 +352,7 @@ where
let wrap: gst_base::BaseSrc = from_glib_borrow(ptr);
let imp = &*element.imp;
panic_to_error2!(&wrap, &element.panicked, false, {
panic_to_error!(&wrap, &element.panicked, false, {
imp.do_seek(&wrap, &mut from_glib_borrow(segment))
}).to_glib()
}
@ -372,7 +372,7 @@ where
let imp = &*element.imp;
let query = gst::QueryRef::from_mut_ptr(query_ptr);
panic_to_error2!(&wrap, &element.panicked, false, { imp.query(&wrap, query) }).to_glib()
panic_to_error!(&wrap, &element.panicked, false, { imp.query(&wrap, query) }).to_glib()
}
unsafe extern "C" fn base_src_event<T: ObjectType>(
@ -389,7 +389,7 @@ where
let wrap: gst_base::BaseSrc = from_glib_borrow(ptr);
let imp = &*element.imp;
panic_to_error2!(&wrap, &element.panicked, false, {
panic_to_error!(&wrap, &element.panicked, false, {
imp.event(&wrap, &from_glib_none(event_ptr))
}).to_glib()
}

2
gst-plugin/src/element.rs
View file

@ -174,7 +174,7 @@ where
let wrap: gst::Element = from_glib_borrow(ptr);
let imp = &*element.imp;
panic_to_error2!(&wrap, &element.panicked, gst::StateChangeReturn::Failure, {
panic_to_error!(&wrap, &element.panicked, gst::StateChangeReturn::Failure, {
imp.change_state(&wrap, from_glib(transition))
}).to_glib()
}

27
gst-plugin/src/error.rs
View file

@ -219,33 +219,6 @@ pub type UriValidator = Fn(&Url) -> Result<(), UriError> + Send + Sync + 'static
#[macro_export]
macro_rules! panic_to_error(
($wrap:expr, $element:expr, $ret:expr, $code:block) => {{
if $wrap.panicked.load(Ordering::Relaxed) {
error_msg!(gst::LibraryError::Failed, ["Panicked"]).post($element);
$ret
} else {
let result = panic::catch_unwind(AssertUnwindSafe(|| $code));
match result {
Ok(result) => result,
Err(err) => {
$wrap.panicked.store(true, Ordering::Relaxed);
if let Some(cause) = err.downcast_ref::<&str>() {
error_msg!(gst::LibraryError::Failed, ["Panicked: {}", cause]).post($element);
} else if let Some(cause) = err.downcast_ref::<String>() {
error_msg!(gst::LibraryError::Failed, ["Panicked: {}", cause]).post($element);
} else {
error_msg!(gst::LibraryError::Failed, ["Panicked"]).post($element);
}
$ret
}
}
}
}};
);
#[macro_export]
macro_rules! panic_to_error2(
($element:expr, $panicked:expr, $ret:expr, $code:block) => {{
use std::panic::{self, AssertUnwindSafe};
use std::sync::atomic::Ordering;