diff options
| author | François Laignel <fengalin@free.fr> | 2022-10-20 21:18:35 +0300 |
|---|---|---|
| committer | François Laignel <fengalin@free.fr> | 2022-10-21 12:54:24 +0300 |
| commit | 6319d104a85d49c7251a1649d297541b4618bf4f (patch) | |
| tree | ee3af0e18bc7fbd047909f868c6ad6b834413787 /net/onvif | |
| parent | 7b5d887c5b00b330c4d31059299717641f31687f (diff) | |
Take advantage of `Into<Option<_>>` args
Commit 24b7cfc8 applied changes related to nullability as declared
by gir. One consequence was that some functions signature ended up
requiring users to pass `Some(val)` when they could use `val`
before.
This commit applies changes on `gstreamer-rs` which, will honoring
the nullability stil allow users to pass `val` for the few affected
functions.
This commit also fixes the signature for `Element::request_new_pad`
which was updated upstream.
Diffstat (limited to 'net/onvif')
| -rw-r--r-- | net/onvif/src/onvifmetadatacombiner/imp.rs | 8 | ||||
| -rw-r--r-- | net/onvif/src/onvifmetadataparse/imp.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/onvif/src/onvifmetadatacombiner/imp.rs b/net/onvif/src/onvifmetadatacombiner/imp.rs index 891f396f6..6fba3c690 100644 --- a/net/onvif/src/onvifmetadatacombiner/imp.rs +++ b/net/onvif/src/onvifmetadatacombiner/imp.rs @@ -129,7 +129,7 @@ impl ElementImpl for OnvifMetadataCombiner { fn request_new_pad( &self, _templ: &gst::PadTemplate, - _name: Option<String>, + _name: Option<&str>, _caps: Option<&gst::Caps>, ) -> Option<gst::Pad> { gst::error!( @@ -468,11 +468,11 @@ impl AggregatorImpl for OnvifMetadataCombiner { let templ_caps = templ.caps(); if let Some(filter) = filter { - q.set_result(Some( + q.set_result( &filter.intersect_with_mode(templ_caps, gst::CapsIntersectMode::First), - )); + ); } else { - q.set_result(Some(templ_caps)); + q.set_result(templ_caps); } true diff --git a/net/onvif/src/onvifmetadataparse/imp.rs b/net/onvif/src/onvifmetadataparse/imp.rs index 3f6ffcd7e..3833d2b9e 100644 --- a/net/onvif/src/onvifmetadataparse/imp.rs +++ b/net/onvif/src/onvifmetadataparse/imp.rs @@ -1044,7 +1044,7 @@ impl OnvifMetadataParse { caps }; - q.set_result(Some(&res)); + q.set_result(&res); true } @@ -1112,7 +1112,7 @@ impl OnvifMetadataParse { caps }; - q.set_result(Some(&res)); + q.set_result(&res); true } |