generic: migrate to new ClockTime design

5 files changed, 11 insertions, 11 deletions

diff --git a/generic/sodium/examples/decrypt_example.rs b/generic/sodium/examples/decrypt_example.rs
index 1a8a199a6..d1f335eaa 100644
--- a/generic/sodium/examples/decrypt_example.rs
+++ b/generic/sodium/examples/decrypt_example.rs
@@ -124,7 +124,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         .expect("Unable to set the pipeline to the `Playing` state");
 
     let bus = pipeline.bus().unwrap();
-    for msg in bus.iter_timed(gst::CLOCK_TIME_NONE) {
+    for msg in bus.iter_timed(gst::ClockTime::NONE) {
         use gst::MessageView;
         match msg.view() {
             MessageView::Error(err) => {
diff --git a/generic/sodium/examples/encrypt_example.rs b/generic/sodium/examples/encrypt_example.rs
index 29aa586f0..ea125ddc3 100644
--- a/generic/sodium/examples/encrypt_example.rs
+++ b/generic/sodium/examples/encrypt_example.rs
@@ -121,7 +121,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     pipeline.set_state(gst::State::Playing)?;
 
     let bus = pipeline.bus().unwrap();
-    for msg in bus.iter_timed(gst::CLOCK_TIME_NONE) {
+    for msg in bus.iter_timed(gst::ClockTime::NONE) {
         use gst::MessageView;
         match msg.view() {
             MessageView::Error(err) => {
diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs
index ce8a840a9..428b252c1 100644
--- a/generic/sodium/src/decrypter/imp.rs
+++ b/generic/sodium/src/decrypter/imp.rs
@@ -322,8 +322,8 @@ impl Decrypter {
                 }
 
                 let size = match peer_query.result().try_into().unwrap() {
-                    gst::format::Bytes(Some(size)) => size,
-                    gst::format::Bytes(None) => {
+                    Some(gst::format::Bytes(size)) => size,
+                    None => {
                         gst_error!(CAT, "Failed to query upstream duration");
 
                         return false;
@@ -348,7 +348,7 @@ impl Decrypter {
                 let size = size - total_chunks * box_::MACBYTES as u64;
 
                 gst_debug!(CAT, obj: pad, "Setting duration bytes: {}", size);
-                q.set(gst::format::Bytes::from(size));
+                q.set(gst::format::Bytes(size));
 
                 true
             }
diff --git a/generic/sodium/src/encrypter/imp.rs b/generic/sodium/src/encrypter/imp.rs
index 3b5bde2af..ac1f1f402 100644
--- a/generic/sodium/src/encrypter/imp.rs
+++ b/generic/sodium/src/encrypter/imp.rs
@@ -299,8 +299,8 @@ impl Encrypter {
                 }
 
                 let size = match peer_query.result().try_into().unwrap() {
-                    gst::format::Bytes(Some(size)) => size,
-                    gst::format::Bytes(None) => {
+                    Some(gst::format::Bytes(size)) => size,
+                    None => {
                         gst_error!(CAT, "Failed to query upstream duration");
 
                         return false;
@@ -324,7 +324,7 @@ impl Encrypter {
                 let size = size + crate::HEADERS_SIZE as u64;
 
                 gst_debug!(CAT, obj: pad, "Setting duration bytes: {}", size);
-                q.set(gst::format::Bytes::from(size));
+                q.set(gst::format::Bytes(size));
 
                 true
             }
diff --git a/generic/sodium/tests/decrypter.rs b/generic/sodium/tests/decrypter.rs
index 8feafaefd..25f1afeb5 100644
--- a/generic/sodium/tests/decrypter.rs
+++ b/generic/sodium/tests/decrypter.rs
@@ -119,7 +119,7 @@ fn test_pipeline() {
         .expect("Unable to set the pipeline to the `Playing` state");
 
     let bus = pipeline.bus().unwrap();
-    for msg in bus.iter_timed(gst::CLOCK_TIME_NONE) {
+    for msg in bus.iter_timed(gst::ClockTime::NONE) {
         use gst::MessageView;
         match msg.view() {
             MessageView::Error(err) => {
@@ -200,11 +200,11 @@ fn test_pull_range() {
     assert_eq!(seekable, true);
     assert_eq!(
         start,
-        gst::GenericFormattedValue::Bytes(gst::format::Bytes(Some(0)))
+        gst::GenericFormattedValue::Bytes(Some(gst::format::Bytes(0)))
     );
     assert_eq!(
         stop,
-        gst::GenericFormattedValue::Bytes(gst::format::Bytes(Some(6043)))
+        gst::GenericFormattedValue::Bytes(Some(gst::format::Bytes(6043)))
     );
 
     // do pulls