mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2025-04-27 15:34:51 +00:00
Code Issues Projects Releases Wiki Activity

Change return type of add_probe to support removing (#116)

Browse source 
* Change return type of add_probe to support 0 PadProbeId

* use from_glib for the conversion of the PadProbeId
This commit is contained in:
JohanGoversTech 2018-06-14 14:45:54 +02:00 committed by Sebastian Dröge
parent f4d57a6652
commit db3fe69415
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gstreamer/src/pad.rs
View file

@ -102,7 +102,7 @@ impl Drop for StreamLock {
} }
pub trait PadExtManual { pub trait PadExtManual {
fn add_probe<F>(&self, mask: PadProbeType, func: F) -> PadProbeId fn add_probe<F>(&self, mask: PadProbeType, func: F) -> Option<PadProbeId>
where where
F: Fn(&Pad, &mut PadProbeInfo) -> PadProbeReturn + Send + Sync + 'static; F: Fn(&Pad, &mut PadProbeInfo) -> PadProbeReturn + Send + Sync + 'static;
fn remove_probe(&self, id: PadProbeId); fn remove_probe(&self, id: PadProbeId);
@ -225,7 +225,7 @@ pub trait PadExtManual {
} }
impl<O: IsA<Pad>> PadExtManual for O { impl<O: IsA<Pad>> PadExtManual for O {
fn add_probe<F>(&self, mask: PadProbeType, func: F) -> PadProbeId fn add_probe<F>(&self, mask: PadProbeType, func: F) -> Option<PadProbeId>
where where
F: Fn(&Pad, &mut PadProbeInfo) -> PadProbeReturn + Send + Sync + 'static, F: Fn(&Pad, &mut PadProbeInfo) -> PadProbeReturn + Send + Sync + 'static,
{ {
@ -241,7 +241,11 @@ impl<O: IsA<Pad>> PadExtManual for O {
Some(destroy_closure), Some(destroy_closure),
); );
from_glib(id) if id == 0 {
None
} else {
Some(from_glib(id))
}
} }
} }