Update for GLib/GStreamer API changes

And clean up a lot of related property/caps/structure code.

5 files changed, 8 insertions, 8 deletions

diff --git a/generic/sodium/examples/decrypt_example.rs b/generic/sodium/examples/decrypt_example.rs
index d1f335eaa..d80c31c3c 100644
--- a/generic/sodium/examples/decrypt_example.rs
+++ b/generic/sodium/examples/decrypt_example.rs
@@ -109,8 +109,8 @@ fn main() -> Result<(), Box<dyn Error>> {
         .set_property("location", &out_loc)
         .expect("Failed to set location property");
 
-    decrypter.set_property("receiver-key", &glib::Bytes::from_owned(receiver.private.0))?;
-    decrypter.set_property("sender-key", &glib::Bytes::from_owned(sender.public))?;
+    decrypter.set_property("receiver-key", glib::Bytes::from_owned(receiver.private.0))?;
+    decrypter.set_property("sender-key", glib::Bytes::from_owned(sender.public))?;
 
     let pipeline = gst::Pipeline::new(Some("test-pipeline"));
     pipeline
diff --git a/generic/sodium/examples/encrypt_example.rs b/generic/sodium/examples/encrypt_example.rs
index ea125ddc3..fa454c300 100644
--- a/generic/sodium/examples/encrypt_example.rs
+++ b/generic/sodium/examples/encrypt_example.rs
@@ -108,8 +108,8 @@ fn main() -> Result<(), Box<dyn Error>> {
         .set_property("location", &out_loc)
         .expect("Failed to set location property");
 
-    encrypter.set_property("receiver-key", &glib::Bytes::from_owned(receiver.public))?;
-    encrypter.set_property("sender-key", &glib::Bytes::from_owned(sender.private.0))?;
+    encrypter.set_property("receiver-key", glib::Bytes::from_owned(receiver.public))?;
+    encrypter.set_property("sender-key", glib::Bytes::from_owned(sender.private.0))?;
 
     let pipeline = gst::Pipeline::new(Some("test-pipeline"));
     pipeline
diff --git a/generic/sodium/src/lib.rs b/generic/sodium/src/lib.rs
index 6266049a4..12bee785f 100644
--- a/generic/sodium/src/lib.rs
+++ b/generic/sodium/src/lib.rs
@@ -42,13 +42,13 @@ fn typefind_register(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
         "sodium_encrypted_typefind",
         gst::Rank::None,
         None,
-        Some(&Caps::new_simple("application/x-sodium-encrypted", &[])),
+        Some(&Caps::builder("application/x-sodium-encrypted").build()),
         |typefind| {
             if let Some(data) = typefind.peek(0, TYPEFIND_HEADER_SIZE as u32) {
                 if data == TYPEFIND_HEADER {
                     typefind.suggest(
                         TypeFindProbability::Maximum,
-                        &Caps::new_simple("application/x-sodium-encrypted", &[]),
+                        &Caps::builder("application/x-sodium-encrypted").build(),
                     );
                 }
             }
diff --git a/generic/sodium/tests/decrypter.rs b/generic/sodium/tests/decrypter.rs
index 25f1afeb5..a11a93d41 100644
--- a/generic/sodium/tests/decrypter.rs
+++ b/generic/sodium/tests/decrypter.rs
@@ -166,7 +166,7 @@ fn test_pull_range() {
 
     let filesrc = gst::ElementFactory::make("filesrc", None).unwrap();
     filesrc
-        .set_property("location", &input_path.to_str().unwrap())
+        .set_property("location", input_path.to_str().unwrap())
         .expect("failed to set property");
 
     let dec = gst::ElementFactory::make("sodiumdecrypter", None).unwrap();
diff --git a/generic/sodium/tests/encrypter.rs b/generic/sodium/tests/encrypter.rs
index e55c0aa46..14f0b0fab 100644
--- a/generic/sodium/tests/encrypter.rs
+++ b/generic/sodium/tests/encrypter.rs
@@ -78,7 +78,7 @@ fn encrypt_file() {
         .expect("failed to set property");
     enc.set_property("receiver-key", &*RECEIVER_PUBLIC)
         .expect("failed to set property");
-    enc.set_property("block-size", &1024u32)
+    enc.set_property("block-size", 1024u32)
         .expect("failed to set property");
 
     let mut h = gst_check::Harness::with_element(&enc, None, None);