Update for Value trait refactoring

7 files changed, 30 insertions, 30 deletions

diff --git a/audio/audiofx/src/audioecho/imp.rs b/audio/audiofx/src/audioecho/imp.rs
index f5e32f8f5..08b17fed3 100644
--- a/audio/audiofx/src/audioecho/imp.rs
+++ b/audio/audiofx/src/audioecho/imp.rs
@@ -147,20 +147,20 @@ impl ObjectImpl for AudioEcho {
             "max-delay" => {
                 let mut settings = self.settings.lock().unwrap();
                 if self.state.lock().unwrap().is_none() {
-                    settings.max_delay = value.get_some().expect("type checked upstream");
+                    settings.max_delay = value.get().expect("type checked upstream");
                 }
             }
             "delay" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.delay = value.get_some().expect("type checked upstream");
+                settings.delay = value.get().expect("type checked upstream");
             }
             "intensity" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.intensity = value.get_some().expect("type checked upstream");
+                settings.intensity = value.get().expect("type checked upstream");
             }
             "feedback" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.feedback = value.get_some().expect("type checked upstream");
+                settings.feedback = value.get().expect("type checked upstream");
             }
             _ => unimplemented!(),
         }
diff --git a/audio/audiofx/src/audioloudnorm/imp.rs b/audio/audiofx/src/audioloudnorm/imp.rs
index b79af3e65..b2eb149ac 100644
--- a/audio/audiofx/src/audioloudnorm/imp.rs
+++ b/audio/audiofx/src/audioloudnorm/imp.rs
@@ -1813,19 +1813,19 @@ impl ObjectImpl for AudioLoudNorm {
         match pspec.name() {
             "loudness-target" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.loudness_target = value.get_some().expect("type checked upstream");
+                settings.loudness_target = value.get().expect("type checked upstream");
             }
             "loudness-range-target" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.loudness_range_target = value.get_some().expect("type checked upstream");
+                settings.loudness_range_target = value.get().expect("type checked upstream");
             }
             "max-true-peak" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.max_true_peak = value.get_some().expect("type checked upstream");
+                settings.max_true_peak = value.get().expect("type checked upstream");
             }
             "offset" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.offset = value.get_some().expect("type checked upstream");
+                settings.offset = value.get().expect("type checked upstream");
             }
             _ => unimplemented!(),
         }
diff --git a/audio/audiofx/src/ebur128level/imp.rs b/audio/audiofx/src/ebur128level/imp.rs
index 06b7459e4..233ac8697 100644
--- a/audio/audiofx/src/ebur128level/imp.rs
+++ b/audio/audiofx/src/ebur128level/imp.rs
@@ -129,7 +129,7 @@ impl ObjectImpl for EbuR128Level {
                 glib::subclass::Signal::builder("reset", &[], glib::Type::UNIT.into())
                     .action()
                     .class_handler(|_token, args| {
-                        let this = args[0].get::<super::EbuR128Level>().unwrap().unwrap();
+                        let this = args[0].get::<super::EbuR128Level>().unwrap();
                         let imp = EbuR128Level::from_instance(&this);
 
                         gst_info!(CAT, obj: &this, "Resetting measurements",);
@@ -187,7 +187,7 @@ impl ObjectImpl for EbuR128Level {
         let mut settings = self.settings.lock().unwrap();
         match pspec.name() {
             "mode" => {
-                let mode = value.get_some().expect("type checked upstream");
+                let mode = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
@@ -198,7 +198,7 @@ impl ObjectImpl for EbuR128Level {
                 settings.mode = mode;
             }
             "post-messages" => {
-                let post_messages = value.get_some().expect("type checked upstream");
+                let post_messages = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
@@ -209,7 +209,7 @@ impl ObjectImpl for EbuR128Level {
                 settings.post_messages = post_messages;
             }
             "interval" => {
-                let interval = value.get_some().expect("type checked upstream");
+                let interval = value.get().expect("type checked upstream");
                 gst_info!(
                     CAT,
                     obj: obj,
diff --git a/audio/audiofx/tests/ebur128level.rs b/audio/audiofx/tests/ebur128level.rs
index 33befbd2f..057a44ef5 100644
--- a/audio/audiofx/tests/ebur128level.rs
+++ b/audio/audiofx/tests/ebur128level.rs
@@ -121,23 +121,23 @@ fn run_test(layout: gst_audio::AudioLayout, format: gst_audio::AudioFormat) {
                 let s = msg.structure().unwrap();
                 if s.name() == "ebur128-level" {
                     num_msgs += 1;
-                    let timestamp = s.get_some::<u64>("timestamp").unwrap();
-                    let running_time = s.get_some::<u64>("running-time").unwrap();
-                    let stream_time = s.get_some::<u64>("stream-time").unwrap();
+                    let timestamp = s.get::<u64>("timestamp").unwrap();
+                    let running_time = s.get::<u64>("running-time").unwrap();
+                    let stream_time = s.get::<u64>("stream-time").unwrap();
                     assert_eq!(timestamp, num_msgs * 500 * gst::MSECOND_VAL);
                     assert_eq!(running_time, num_msgs * 500 * gst::MSECOND_VAL);
                     assert_eq!(stream_time, num_msgs * 500 * gst::MSECOND_VAL);
 
                     // Check if all these exist
-                    let _momentary_loudness = s.get_some::<f64>("momentary-loudness").unwrap();
-                    let _shortterm_loudness = s.get_some::<f64>("shortterm-loudness").unwrap();
-                    let _global_loudness = s.get_some::<f64>("global-loudness").unwrap();
-                    let _relative_threshold = s.get_some::<f64>("relative-threshold").unwrap();
-                    let _loudness_range = s.get_some::<f64>("loudness-range").unwrap();
-                    let sample_peak = s.get::<gst::Array>("sample-peak").unwrap().unwrap();
+                    let _momentary_loudness = s.get::<f64>("momentary-loudness").unwrap();
+                    let _shortterm_loudness = s.get::<f64>("shortterm-loudness").unwrap();
+                    let _global_loudness = s.get::<f64>("global-loudness").unwrap();
+                    let _relative_threshold = s.get::<f64>("relative-threshold").unwrap();
+                    let _loudness_range = s.get::<f64>("loudness-range").unwrap();
+                    let sample_peak = s.get::<gst::Array>("sample-peak").unwrap();
                     assert_eq!(sample_peak.as_slice().len(), 2);
                     assert_eq!(sample_peak.as_slice()[0].type_(), glib::Type::F64);
-                    let true_peak = s.get::<gst::Array>("true-peak").unwrap().unwrap();
+                    let true_peak = s.get::<gst::Array>("true-peak").unwrap();
                     assert_eq!(true_peak.as_slice().len(), 2);
                     assert_eq!(true_peak.as_slice()[0].type_(), glib::Type::F64);
                 }
diff --git a/audio/claxon/src/claxondec/imp.rs b/audio/claxon/src/claxondec/imp.rs
index d88464198..6661e55b3 100644
--- a/audio/claxon/src/claxondec/imp.rs
+++ b/audio/claxon/src/claxondec/imp.rs
@@ -137,7 +137,7 @@ impl AudioDecoderImpl for ClaxonDec {
                     "Not enough streamheaders, trying in-band"
                 );
             } else {
-                let ident_buf = streamheaders[0].get::<gst::Buffer>();
+                let ident_buf = streamheaders[0].get::<Option<gst::Buffer>>();
                 if let Ok(Some(ident_buf)) = ident_buf {
                     gst_debug!(CAT, obj: element, "Got streamheader buffers");
                     let inmap = ident_buf.map_readable().unwrap();
diff --git a/audio/csound/src/filter/imp.rs b/audio/csound/src/filter/imp.rs
index 054275f43..c191a62a4 100644
--- a/audio/csound/src/filter/imp.rs
+++ b/audio/csound/src/filter/imp.rs
@@ -390,12 +390,12 @@ impl ObjectImpl for CsoundFilter {
         match pspec.name() {
             "loop" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.loop_ = value.get_some().expect("type checked upstream");
+                settings.loop_ = value.get().expect("type checked upstream");
             }
             "location" => {
                 let mut settings = self.settings.lock().unwrap();
                 if self.state.lock().unwrap().is_none() {
-                    settings.location = match value.get::<String>() {
+                    settings.location = match value.get::<Option<String>>() {
                         Ok(location) => location,
                         _ => unreachable!("type checked upstream"),
                     };
@@ -404,7 +404,7 @@ impl ObjectImpl for CsoundFilter {
             "csd-text" => {
                 let mut settings = self.settings.lock().unwrap();
                 if self.state.lock().unwrap().is_none() {
-                    settings.csd_text = match value.get::<String>() {
+                    settings.csd_text = match value.get::<Option<String>>() {
                         Ok(text) => text,
                         _ => unreachable!("type checked upstream"),
                     };
@@ -412,7 +412,7 @@ impl ObjectImpl for CsoundFilter {
             }
             "score_offset" => {
                 let mut settings = self.settings.lock().unwrap();
-                settings.offset = value.get_some().expect("type checked upstream");
+                settings.offset = value.get().expect("type checked upstream");
             }
             _ => unimplemented!(),
         }
diff --git a/audio/lewton/src/lewtondec/imp.rs b/audio/lewton/src/lewtondec/imp.rs
index 2a0a9d572..26cef0c56 100644
--- a/audio/lewton/src/lewtondec/imp.rs
+++ b/audio/lewton/src/lewtondec/imp.rs
@@ -148,9 +148,9 @@ impl AudioDecoderImpl for LewtonDec {
                 return Ok(());
             }
 
-            let ident_buf = streamheaders[0].get::<gst::Buffer>();
-            let comment_buf = streamheaders[1].get::<gst::Buffer>();
-            let setup_buf = streamheaders[2].get::<gst::Buffer>();
+            let ident_buf = streamheaders[0].get::<Option<gst::Buffer>>();
+            let comment_buf = streamheaders[1].get::<Option<gst::Buffer>>();
+            let setup_buf = streamheaders[2].get::<Option<gst::Buffer>>();
             if let (Ok(Some(ident_buf)), Ok(Some(comment_buf)), Ok(Some(setup_buf))) =
                 (ident_buf, comment_buf, setup_buf)
             {