mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-06-05 06:58:58 +00:00
Code Issues Projects Releases Wiki Activity

Update to LoggedError signatures

Browse source 
See gstreamer-rs!214
This commit is contained in:
François Laignel 2019-01-24 21:19:39 +01:00
parent 4c618394b7
commit 3596870751
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst-plugin-flv/src/flvdemux.rs
View file

@ -142,7 +142,7 @@ impl ObjectSubclass for FlvDemux {
sinkpad.set_activate_function(|pad, parent| {
FlvDemux::catch_panic_pad_function(
parent,
|| Err(glib_bool_error!("Panic activating sink pad")),
|| Err(gst_loggable_error!(CAT, "Panic activating sink pad")),
|demux, element| demux.sink_activate(pad, element),
)
});
@ -150,7 +150,12 @@ impl ObjectSubclass for FlvDemux {
sinkpad.set_activatemode_function(|pad, parent, mode, active| {
FlvDemux::catch_panic_pad_function(
parent,
|| Err(glib_bool_error!("Panic activating sink pad with mode")),
|| {
Err(gst_loggable_error!(
CAT,
"Panic activating sink pad with mode"
))
},
|demux, element| demux.sink_activatemode(pad, element, mode, active),
)
});
@ -290,11 +295,11 @@ impl FlvDemux {
&self,
pad: &gst::Pad,
_element: &gst::Element,
) -> Result<(), glib::BoolError> {
) -> Result<(), gst::LoggableError> {
let mode = {
let mut query = gst::Query::new_scheduling();
if !pad.peer_query(&mut query) {
return Err(glib_bool_error!("Scheduling query failed on peer"));
return Err(gst_loggable_error!(CAT, "Scheduling query failed on peer"));
}
// TODO: pull mode
@ -312,7 +317,8 @@ impl FlvDemux {
}
};
pad.activate_mode(mode, true)
pad.activate_mode(mode, true)?;
Ok(())
}
fn sink_activatemode(
@ -321,11 +327,11 @@ impl FlvDemux {
element: &gst::Element,
mode: gst::PadMode,
active: bool,
) -> Result<(), glib::BoolError> {
) -> Result<(), gst::LoggableError> {
if active {
self.start(element, mode).map_err(|err| {
element.post_error_message(&err);
glib_bool_error!("Failed to start element with mode {:?}", mode)
gst_loggable_error!(CAT, "Failed to start element with mode {:?}", mode)
})?;
if mode == gst::PadMode::Pull {
@ -340,7 +346,7 @@ impl FlvDemux {
self.stop(element).map_err(|err| {
element.post_error_message(&err);
glib_bool_error!("Failed to stop element")
gst_loggable_error!(CAT, "Failed to stop element")
})?;
}