From c5d3a2efcedd42fd8ee66a5e0d2ec9f50ffc620a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 17 Oct 2021 17:27:40 +0300 Subject: [PATCH] Update for event API changes --- net/reqwest/tests/reqwesthttpsrc.rs | 6 ++---- text/json/src/jsongstparse/imp.rs | 6 +++++- .../src/fallbacksrc/custom_source/imp.rs | 6 ++---- utils/fallbackswitch/src/fallbacksrc/imp.rs | 17 +++++------------ video/closedcaption/src/jsontovtt/imp.rs | 2 +- video/closedcaption/src/mcc_parse/imp.rs | 6 +++++- video/closedcaption/src/scc_parse/imp.rs | 6 +++++- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/net/reqwest/tests/reqwesthttpsrc.rs b/net/reqwest/tests/reqwesthttpsrc.rs index afe16216..9156ab90 100644 --- a/net/reqwest/tests/reqwesthttpsrc.rs +++ b/net/reqwest/tests/reqwesthttpsrc.rs @@ -656,10 +656,8 @@ fn test_iradio_mode() { ); { - use gst::EventView; - let tag_event = srcpad.sticky_event(gst::EventType::Tag, 0).unwrap(); - if let EventView::Tag(tags) = tag_event.view() { - let tags = tags.tag(); + if let Some(tag_event) = srcpad.sticky_event::>(0) { + let tags = tag_event.tag(); assert_eq!(tags.get::().unwrap().get(), "Name"); assert_eq!(tags.get::().unwrap().get(), "Genre"); assert_eq!( diff --git a/text/json/src/jsongstparse/imp.rs b/text/json/src/jsongstparse/imp.rs index c3331c7f..8d589071 100644 --- a/text/json/src/jsongstparse/imp.rs +++ b/text/json/src/jsongstparse/imp.rs @@ -697,7 +697,11 @@ impl JsonGstParse { } } - fn perform_seek(&self, event: &gst::event::Seek, element: &super::JsonGstParse) -> bool { + fn perform_seek( + &self, + event: &gst::event::Seek<&gst::EventRef>, + element: &super::JsonGstParse, + ) -> bool { if self.state.lock().unwrap().pull.is_none() { gst_error!(CAT, obj: element, "seeking is only supported in pull mode"); return false; diff --git a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs b/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs index fbdad2de..0efe8b68 100644 --- a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs @@ -259,10 +259,8 @@ impl CustomSource { let mut stream_type = None; // Take stream type from stream-start event if we can - if let Some(event) = pad.sticky_event(gst::EventType::StreamStart, 0) { - if let gst::EventView::StreamStart(ev) = event.view() { - stream_type = ev.stream().map(|s| s.stream_type()); - } + if let Some(ev) = pad.sticky_event::>(0) { + stream_type = ev.stream().map(|s| s.stream_type()); } // Otherwise from the caps diff --git a/utils/fallbackswitch/src/fallbacksrc/imp.rs b/utils/fallbackswitch/src/fallbacksrc/imp.rs index 9419e558..259ed1b5 100644 --- a/utils/fallbackswitch/src/fallbacksrc/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/imp.rs @@ -1267,11 +1267,8 @@ impl FallbackSrc { let mut is_image = false; - if let Some(stream_event) = pad.sticky_event(gst::EventType::StreamStart, 0) { - let stream = match stream_event.view() { - gst::EventView::StreamStart(ref ev) => ev.stream(), - _ => unreachable!(), - }; + if let Some(ev) = pad.sticky_event::>(0) { + let stream = ev.stream(); if let Some(stream) = stream { if let Some(caps) = stream.caps() { @@ -1574,19 +1571,15 @@ impl FallbackSrc { None => return Ok(()), }; - let ev = match pad.sticky_event(gst::EventType::Segment, 0) { - Some(ev) => ev, + let segment = match pad.sticky_event::>(0) { + Some(ev) => ev.segment().clone(), None => { gst_warning!(CAT, obj: element, "Have no segment event yet"); return Ok(()); } }; - let segment = match ev.view() { - gst::EventView::Segment(s) => s.segment(), - _ => unreachable!(), - }; - let segment = segment.downcast_ref::().ok_or_else(|| { + let segment = segment.downcast::().map_err(|_| { gst_error!(CAT, obj: element, "Have no time segment"); gst::error_msg!(gst::CoreError::Clock, ["Have no time segment"]) })?; diff --git a/video/closedcaption/src/jsontovtt/imp.rs b/video/closedcaption/src/jsontovtt/imp.rs index 6b82b257..dc604c68 100644 --- a/video/closedcaption/src/jsontovtt/imp.rs +++ b/video/closedcaption/src/jsontovtt/imp.rs @@ -303,7 +303,7 @@ impl State { Ok(ret) } - fn handle_gap(&mut self, gap: gst::event::Gap) -> Vec { + fn handle_gap(&mut self, gap: gst::event::Gap<&gst::EventRef>) -> Vec { let mut ret = vec![]; let (pts, duration) = gap.get(); diff --git a/video/closedcaption/src/mcc_parse/imp.rs b/video/closedcaption/src/mcc_parse/imp.rs index 8b55b5a9..ff0f18bb 100644 --- a/video/closedcaption/src/mcc_parse/imp.rs +++ b/video/closedcaption/src/mcc_parse/imp.rs @@ -955,7 +955,11 @@ impl MccParse { } } - fn perform_seek(&self, event: &gst::event::Seek, element: &super::MccParse) -> bool { + fn perform_seek( + &self, + event: &gst::event::Seek<&gst::EventRef>, + element: &super::MccParse, + ) -> bool { if self.state.lock().unwrap().pull.is_none() { gst_error!(CAT, obj: element, "seeking is only supported in pull mode"); return false; diff --git a/video/closedcaption/src/scc_parse/imp.rs b/video/closedcaption/src/scc_parse/imp.rs index 76ffe8b2..75cdaac1 100644 --- a/video/closedcaption/src/scc_parse/imp.rs +++ b/video/closedcaption/src/scc_parse/imp.rs @@ -839,7 +839,11 @@ impl SccParse { } } - fn perform_seek(&self, event: &gst::event::Seek, element: &super::SccParse) -> bool { + fn perform_seek( + &self, + event: &gst::event::Seek<&gst::EventRef>, + element: &super::SccParse, + ) -> bool { if self.state.lock().unwrap().pull.is_none() { gst_error!(CAT, obj: element, "seeking is only supported in pull mode"); return false;