Update for Value trait refactoring

11 files changed, 35 insertions, 48 deletions

diff --git a/video/closedcaption/src/ccdetect/imp.rs b/video/closedcaption/src/ccdetect/imp.rs
index 7745326e4..488039df1 100644
--- a/video/closedcaption/src/ccdetect/imp.rs
+++ b/video/closedcaption/src/ccdetect/imp.rs
@@ -264,7 +264,7 @@ impl ObjectImpl for CCDetect {
         match pspec.name() {
             "window" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.window = value.get_some().expect("type checked upstream");
+                settings.window = value.get().expect("type checked upstream");
             }
             _ => unimplemented!(),
         }
@@ -417,7 +417,7 @@ impl BaseTransformImpl for CCDetect {
             .structure(0)
             .ok_or_else(|| gst::loggable_error!(CAT, "Failed to parse input caps"))?;
         let format_str = s
-            .get::<&str>("format")
+            .get::<Option<&str>>("format")
             .map_err(|_| gst::loggable_error!(CAT, "Failed to parse input caps"))?
             .ok_or_else(|| gst::loggable_error!(CAT, "Failed to parse input caps"))?;
         let cc_format = match format_str {
diff --git a/video/closedcaption/src/cea608overlay/imp.rs b/video/closedcaption/src/cea608overlay/imp.rs
index 3221d4442..f78ebfd9f 100644
--- a/video/closedcaption/src/cea608overlay/imp.rs
+++ b/video/closedcaption/src/cea608overlay/imp.rs
@@ -604,7 +604,7 @@ impl ObjectImpl for Cea608Overlay {
                 let mut settings = self.settings.lock().unwrap();
                 let mut state = self.state.lock().unwrap();
 
-                settings.field = value.get_some().expect("type checked upstream");
+                settings.field = value.get().expect("type checked upstream");
                 state.selected_field = match settings.field {
                     -1 => None,
                     val => Some(val as u8),
diff --git a/video/closedcaption/src/mcc_enc/imp.rs b/video/closedcaption/src/mcc_enc/imp.rs
index 7a8033dcf..8fcd1c790 100644
--- a/video/closedcaption/src/mcc_enc/imp.rs
+++ b/video/closedcaption/src/mcc_enc/imp.rs
@@ -92,11 +92,7 @@ impl MccEnc {
             .sinkpad
             .current_caps()
             .ok_or(gst::FlowError::NotNegotiated)?;
-        let framerate = match caps
-            .structure(0)
-            .unwrap()
-            .get_some::<gst::Fraction>("framerate")
-        {
+        let framerate = match caps.structure(0).unwrap().get::<gst::Fraction>("framerate") {
             Ok(framerate) => framerate,
             Err(structure::GetError::FieldNotFound { .. }) => {
                 return Err(gst::FlowError::NotNegotiated);
@@ -371,7 +367,7 @@ impl MccEnc {
             EventView::Caps(ev) => {
                 let caps = ev.caps();
                 let s = caps.structure(0).unwrap();
-                let framerate = match s.get_some::<gst::Fraction>("framerate") {
+                let framerate = match s.get::<gst::Fraction>("framerate") {
                     Ok(framerate) => framerate,
                     Err(structure::GetError::FieldNotFound { .. }) => {
                         gst_error!(CAT, obj: pad, "Caps without framerate");
diff --git a/video/closedcaption/src/scc_enc/imp.rs b/video/closedcaption/src/scc_enc/imp.rs
index 646a38d0c..072755005 100644
--- a/video/closedcaption/src/scc_enc/imp.rs
+++ b/video/closedcaption/src/scc_enc/imp.rs
@@ -254,7 +254,7 @@ impl SccEnc {
             EventView::Caps(ev) => {
                 let caps = ev.caps();
                 let s = caps.structure(0).unwrap();
-                let framerate = match s.get_some::<gst::Fraction>("framerate") {
+                let framerate = match s.get::<gst::Fraction>("framerate") {
                     Ok(framerate) => Some(framerate),
                     Err(structure::GetError::FieldNotFound { .. }) => {
                         gst_error!(CAT, obj: pad, "Caps without framerate");
diff --git a/video/closedcaption/src/tttocea608/imp.rs b/video/closedcaption/src/tttocea608/imp.rs
index e0d82c749..6534d2b91 100644
--- a/video/closedcaption/src/tttocea608/imp.rs
+++ b/video/closedcaption/src/tttocea608/imp.rs
@@ -925,7 +925,7 @@ impl TtToCea608 {
                 s.fixate();
 
                 let mut state = self.state.lock().unwrap();
-                state.framerate = s.get_some::<gst::Fraction>("framerate").unwrap();
+                state.framerate = s.get::<gst::Fraction>("framerate").unwrap();
 
                 let upstream_caps = e.caps();
                 let s = upstream_caps.structure(0).unwrap();
@@ -1090,19 +1090,17 @@ impl ObjectImpl for TtToCea608 {
         match pspec.name() {
             "mode" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.mode = value
-                    .get_some::<Cea608Mode>()
-                    .expect("type checked upstream");
+                settings.mode = value.get::<Cea608Mode>().expect("type checked upstream");
                 self.state.lock().unwrap().force_clear = true;
             }
             "origin-row" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.origin_row = value.get_some().expect("type checked upstream");
+                settings.origin_row = value.get().expect("type checked upstream");
                 self.state.lock().unwrap().force_clear = true;
             }
             "origin-column" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.origin_column = value.get_some().expect("type checked upstream");
+                settings.origin_column = value.get().expect("type checked upstream");
                 let mut state = self.state.lock().unwrap();
                 state.force_clear = true;
                 state.column = settings.origin_column;
diff --git a/video/closedcaption/src/tttojson/imp.rs b/video/closedcaption/src/tttojson/imp.rs
index 0370c0108..c3c9799a9 100644
--- a/video/closedcaption/src/tttojson/imp.rs
+++ b/video/closedcaption/src/tttojson/imp.rs
@@ -256,9 +256,7 @@ impl ObjectImpl for TtToJson {
         match pspec.name() {
             "mode" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.mode = value
-                    .get_some::<Cea608Mode>()
-                    .expect("type checked upstream");
+                settings.mode = value.get::<Cea608Mode>().expect("type checked upstream");
             }
             _ => unimplemented!(),
         }
diff --git a/video/gif/src/gifenc/imp.rs b/video/gif/src/gifenc/imp.rs
index e973a9891..0fbc04d92 100644
--- a/video/gif/src/gifenc/imp.rs
+++ b/video/gif/src/gifenc/imp.rs
@@ -164,7 +164,7 @@ impl ObjectImpl for GifEnc {
         match pspec.name() {
             "repeat" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.repeat = value.get_some().expect("type checked upstream");
+                settings.repeat = value.get().expect("type checked upstream");
             }
             _ => unimplemented!(),
         }
diff --git a/video/hsv/src/hsvdetector/imp.rs b/video/hsv/src/hsvdetector/imp.rs
index 468abcbb1..a8e2813d2 100644
--- a/video/hsv/src/hsvdetector/imp.rs
+++ b/video/hsv/src/hsvdetector/imp.rs
@@ -156,7 +156,7 @@ impl ObjectImpl for HsvDetector {
         match pspec.name() {
             "hue-ref" => {
                 let mut settings = self.settings.lock().unwrap();
-                let hue_ref = value.get_some().expect("type checked upstream");
+                let hue_ref = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
@@ -168,7 +168,7 @@ impl ObjectImpl for HsvDetector {
             }
             "hue-var" => {
                 let mut settings = self.settings.lock().unwrap();
-                let hue_var = value.get_some().expect("type checked upstream");
+                let hue_var = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
@@ -180,7 +180,7 @@ impl ObjectImpl for HsvDetector {
             }
             "saturation-ref" => {
                 let mut settings = self.settings.lock().unwrap();
-                let saturation_ref = value.get_some().expect("type checked upstream");
+                let saturation_ref = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
@@ -192,7 +192,7 @@ impl ObjectImpl for HsvDetector {
             }
             "saturation-var" => {
                 let mut settings = self.settings.lock().unwrap();
-                let saturation_var = value.get_some().expect("type checked upstream");
+                let saturation_var = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
@@ -204,7 +204,7 @@ impl ObjectImpl for HsvDetector {
             }
             "value-ref" => {
                 let mut settings = self.settings.lock().unwrap();
-                let value_ref = value.get_some().expect("type checked upstream");
+                let value_ref = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
@@ -216,7 +216,7 @@ impl ObjectImpl for HsvDetector {
             }
             "value-var" => {
                 let mut settings = self.settings.lock().unwrap();
-                let value_var = value.get_some().expect("type checked upstream");
+                let value_var = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
diff --git a/video/hsv/src/hsvfilter/imp.rs b/video/hsv/src/hsvfilter/imp.rs
index 5d24235be..062219f58 100644
--- a/video/hsv/src/hsvfilter/imp.rs
+++ b/video/hsv/src/hsvfilter/imp.rs
@@ -142,7 +142,7 @@ impl ObjectImpl for HsvFilter {
         match pspec.name() {
             "hue-shift" => {
                 let mut settings = self.settings.lock().unwrap();
-                let hue_shift = value.get_some().expect("type checked upstream");
+                let hue_shift = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
@@ -154,7 +154,7 @@ impl ObjectImpl for HsvFilter {
             }
             "saturation-mul" => {
                 let mut settings = self.settings.lock().unwrap();
-                let saturation_mul = value.get_some().expect("type checked upstream");
+                let saturation_mul = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
@@ -166,7 +166,7 @@ impl ObjectImpl for HsvFilter {
             }
             "saturation-off" => {
                 let mut settings = self.settings.lock().unwrap();
-                let saturation_off = value.get_some().expect("type checked upstream");
+                let saturation_off = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
@@ -178,7 +178,7 @@ impl ObjectImpl for HsvFilter {
             }
             "value-mul" => {
                 let mut settings = self.settings.lock().unwrap();
-                let value_mul = value.get_some().expect("type checked upstream");
+                let value_mul = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
@@ -190,7 +190,7 @@ impl ObjectImpl for HsvFilter {
             }
             "value-off" => {
                 let mut settings = self.settings.lock().unwrap();
-                let value_off = value.get_some().expect("type checked upstream");
+                let value_off = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
diff --git a/video/rav1e/src/rav1enc/imp.rs b/video/rav1e/src/rav1enc/imp.rs
index 2f5447677..37cb10e05 100644
--- a/video/rav1e/src/rav1enc/imp.rs
+++ b/video/rav1e/src/rav1enc/imp.rs
@@ -319,46 +319,43 @@ impl ObjectImpl for Rav1Enc {
         match pspec.name() {
             "speed-preset" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.speed_preset = value.get_some().expect("type checked upstream");
+                settings.speed_preset = value.get().expect("type checked upstream");
             }
             "low-latency" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.low_latency = value.get_some().expect("type checked upstream");
+                settings.low_latency = value.get().expect("type checked upstream");
             }
             "min-key-frame-interval" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.min_key_frame_interval = value.get_some().expect("type checked upstream");
+                settings.min_key_frame_interval = value.get().expect("type checked upstream");
             }
             "max-key-frame-interval" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.max_key_frame_interval = value.get_some().expect("type checked upstream");
+                settings.max_key_frame_interval = value.get().expect("type checked upstream");
             }
             "bitrate" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.bitrate = value.get_some().expect("type checked upstream");
+                settings.bitrate = value.get().expect("type checked upstream");
             }
             "quantizer" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.quantizer =
-                    value.get_some::<u32>().expect("type checked upstream") as usize;
+                settings.quantizer = value.get::<u32>().expect("type checked upstream") as usize;
             }
             "tile-cols" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.tile_cols =
-                    value.get_some::<u32>().expect("type checked upstream") as usize;
+                settings.tile_cols = value.get::<u32>().expect("type checked upstream") as usize;
             }
             "tile-rows" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.tile_rows =
-                    value.get_some::<u32>().expect("type checked upstream") as usize;
+                settings.tile_rows = value.get::<u32>().expect("type checked upstream") as usize;
             }
             "tiles" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.tiles = value.get_some::<u32>().expect("type checked upstream") as usize;
+                settings.tiles = value.get::<u32>().expect("type checked upstream") as usize;
             }
             "threads" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.threads = value.get_some::<u32>().expect("type checked upstream") as usize;
+                settings.threads = value.get::<u32>().expect("type checked upstream") as usize;
             }
             _ => unimplemented!(),
         }
diff --git a/video/rspng/src/pngenc/imp.rs b/video/rspng/src/pngenc/imp.rs
index 16c54e71f..6836d78c4 100644
--- a/video/rspng/src/pngenc/imp.rs
+++ b/video/rspng/src/pngenc/imp.rs
@@ -209,14 +209,12 @@ impl ObjectImpl for PngEncoder {
             "compression-level" => {
                 let mut settings = self.settings.lock();
                 settings.compression = value
-                    .get_some::<CompressionLevel>()
+                    .get::<CompressionLevel>()
                     .expect("type checked upstream");
             }
             "filter" => {
                 let mut settings = self.settings.lock();
-                settings.filter = value
-                    .get_some::<FilterType>()
-                    .expect("type checked upstream");
+                settings.filter = value.get::<FilterType>().expect("type checked upstream");
             }
             _ => unreachable!(),
         }