From 13923051a0f4f06ea2ec8506b0b048a33d254715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 1 Dec 2021 15:33:45 +0200 Subject: [PATCH] Fix compilation after `gst::Pad::sticky_events_foreach` API changes --- generic/threadshare/src/inputselector/imp.rs | 3 ++- utils/uriplaylistbin/src/uriplaylistbin/imp.rs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs index cb046b7b..5b20adbf 100644 --- a/generic/threadshare/src/inputselector/imp.rs +++ b/generic/threadshare/src/inputselector/imp.rs @@ -115,8 +115,9 @@ impl InputSelectorPadSinkHandler { if state.active_sinkpad.as_ref() == Some(pad.gst_pad()) { if inner.send_sticky || state.switched_pad { pad.gst_pad().sticky_events_foreach(|event| { + use std::ops::ControlFlow; stickies.push(event.clone()); - Ok(Some(event)) + ControlFlow::Continue(gst::EventForeachAction::Keep) }); inner.send_sticky = false; diff --git a/utils/uriplaylistbin/src/uriplaylistbin/imp.rs b/utils/uriplaylistbin/src/uriplaylistbin/imp.rs index 142de04e..8003018d 100644 --- a/utils/uriplaylistbin/src/uriplaylistbin/imp.rs +++ b/utils/uriplaylistbin/src/uriplaylistbin/imp.rs @@ -1262,8 +1262,9 @@ impl UriPlaylistBin { // proxy sticky events src.sticky_events_foreach(|event| { + use std::ops::ControlFlow; let _ = ghost.store_sticky_event(&event); - Ok(Some(event)) + ControlFlow::Continue(gst::EventForeachAction::Keep) }); unsafe {