Update for caps/structure-related string API changes

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1048>

3 files changed, 18 insertions, 15 deletions

diff --git a/video/cdg/src/cdgdec/imp.rs b/video/cdg/src/cdgdec/imp.rs
index 9d077731..ae6874c8 100644
--- a/video/cdg/src/cdgdec/imp.rs
+++ b/video/cdg/src/cdgdec/imp.rs
@@ -204,7 +204,7 @@ impl VideoDecoderImpl for CdgDec {
             let pools = query.allocation_pools();
             if let Some((Some(ref pool), _, _, _)) = pools.first() {
                 let mut config = pool.config();
-                config.add_option(&gst_video::BUFFER_POOL_OPTION_VIDEO_META);
+                config.add_option(gst_video::BUFFER_POOL_OPTION_VIDEO_META);
                 pool.set_config(config)
                     .map_err(|_| gst::loggable_error!(CAT, "Failed to configure buffer pool"))?;
             }
diff --git a/video/closedcaption/src/cea608overlay/imp.rs b/video/closedcaption/src/cea608overlay/imp.rs
index 13a03b56..b6a78f7f 100644
--- a/video/closedcaption/src/cea608overlay/imp.rs
+++ b/video/closedcaption/src/cea608overlay/imp.rs
@@ -266,7 +266,7 @@ impl Cea608Overlay {
 
         let upstream_has_meta = caps
             .features(0)
-            .map(|f| f.contains(&gst_video::CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION))
+            .map(|f| f.contains(gst_video::CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION))
             .unwrap_or(false);
 
         if !upstream_has_meta {
@@ -274,7 +274,7 @@ impl Cea608Overlay {
             let overlay_caps = caps_clone.make_mut();
 
             if let Some(features) = overlay_caps.features_mut(0) {
-                features.add(&gst_video::CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
+                features.add(gst_video::CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
                 let peercaps = self.srcpad.peer_query_caps(Some(&caps_clone));
                 downstream_accepts_meta = !peercaps.is_empty();
                 if downstream_accepts_meta {
diff --git a/video/gtk4/src/sink/imp.rs b/video/gtk4/src/sink/imp.rs
index db4d64cf..caa8361d 100644
--- a/video/gtk4/src/sink/imp.rs
+++ b/video/gtk4/src/sink/imp.rs
@@ -147,10 +147,16 @@ impl ElementImpl for PaintableSink {
 
                 for features in [
                     None,
-                    Some(&["memory:GLMemory", "meta:GstVideoOverlayComposition"][..]),
-                    Some(&["memory:GLMemory"][..]),
-                    Some(&["memory:SystemMemory", "meta:GstVideoOverlayComposition"][..]),
-                    Some(&["meta:GstVideoOverlayComposition"][..]),
+                    Some(gst::CapsFeatures::new([
+                        "memory:GLMemory",
+                        "meta:GstVideoOverlayComposition",
+                    ])),
+                    Some(gst::CapsFeatures::new(["memory:GLMemory"])),
+                    Some(gst::CapsFeatures::new([
+                        "memory:SystemMemory",
+                        "meta:GstVideoOverlayComposition",
+                    ])),
+                    Some(gst::CapsFeatures::new(["meta:GstVideoOverlayComposition"])),
                 ] {
                     let mut c = gst_video::video_make_raw_caps(&[
                         gst_video::VideoFormat::Bgra,
@@ -163,15 +169,12 @@ impl ElementImpl for PaintableSink {
                     .build();
 
                     if let Some(features) = features {
-                        c.get_mut()
-                            .unwrap()
-                            .set_features_simple(Some(gst::CapsFeatures::new(features)));
-
-                        if features.contains(&"memory:GLMemory") {
-                            c.get_mut()
-                                .unwrap()
-                                .set_simple(&[("texture-target", &"2D")])
+                        let c = c.get_mut().unwrap();
+
+                        if features.contains("memory:GLMemory") {
+                            c.set("texture-target", "2D")
                         }
+                        c.set_features_simple(Some(features));
                     }
 
                     caps.append(c);