Update everything for element factory builder API changes

And set properties as part of object construction wherever it makes
sense.

4 files changed, 95 insertions, 57 deletions

diff --git a/generic/sodium/examples/decrypt_example.rs b/generic/sodium/examples/decrypt_example.rs
index 5a0a9d2fb..1da10de15 100644
--- a/generic/sodium/examples/decrypt_example.rs
+++ b/generic/sodium/examples/decrypt_example.rs
@@ -85,16 +85,20 @@ fn main() -> Result<(), Box<dyn Error>> {
     let receiver = &Keys::from_file(&receiver_keys)?;
     let sender = &Keys::from_file(&sender_keys)?;
 
-    let filesrc = gst::ElementFactory::make("filesrc", None).unwrap();
-    let decrypter = gst::ElementFactory::make("sodiumdecrypter", None).unwrap();
-    let typefind = gst::ElementFactory::make("typefind", None).unwrap();
-    let filesink = gst::ElementFactory::make("filesink", None).unwrap();
-
-    filesrc.set_property("location", &args.input);
-    filesink.set_property("location", &args.output);
-
-    decrypter.set_property("receiver-key", glib::Bytes::from_owned(receiver.private.0));
-    decrypter.set_property("sender-key", glib::Bytes::from_owned(sender.public));
+    let filesrc = gst::ElementFactory::make("filesrc")
+        .property("location", &args.input)
+        .build()
+        .unwrap();
+    let decrypter = gst::ElementFactory::make("sodiumdecrypter")
+        .property("receiver-key", glib::Bytes::from_owned(receiver.private.0))
+        .property("sender-key", glib::Bytes::from_owned(sender.public))
+        .build()
+        .unwrap();
+    let typefind = gst::ElementFactory::make("typefind").build().unwrap();
+    let filesink = gst::ElementFactory::make("filesink")
+        .property("location", &args.output)
+        .build()
+        .unwrap();
 
     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 c8cd97bf8..ff578b0d8 100644
--- a/generic/sodium/examples/encrypt_example.rs
+++ b/generic/sodium/examples/encrypt_example.rs
@@ -89,15 +89,19 @@ fn main() -> Result<(), Box<dyn Error>> {
     let receiver = &Keys::from_file(&receiver_keys)?;
     let sender = &Keys::from_file(&sender_keys)?;
 
-    let filesrc = gst::ElementFactory::make("filesrc", None).unwrap();
-    let encrypter = gst::ElementFactory::make("sodiumencrypter", None).unwrap();
-    let filesink = gst::ElementFactory::make("filesink", None).unwrap();
-
-    filesrc.set_property("location", &args.input);
-    filesink.set_property("location", &args.output);
-
-    encrypter.set_property("receiver-key", glib::Bytes::from_owned(receiver.public));
-    encrypter.set_property("sender-key", glib::Bytes::from_owned(sender.private.0));
+    let filesrc = gst::ElementFactory::make("filesrc")
+        .property("location", &args.input)
+        .build()
+        .unwrap();
+    let encrypter = gst::ElementFactory::make("sodiumencrypter")
+        .property("receiver-key", glib::Bytes::from_owned(receiver.public))
+        .property("sender-key", glib::Bytes::from_owned(sender.private.0))
+        .build()
+        .unwrap();
+    let filesink = gst::ElementFactory::make("filesink")
+        .property("location", &args.output)
+        .build()
+        .unwrap();
 
     let pipeline = gst::Pipeline::new(Some("test-pipeline"));
     pipeline
diff --git a/generic/sodium/tests/decrypter.rs b/generic/sodium/tests/decrypter.rs
index 3243ffea7..a489d188f 100644
--- a/generic/sodium/tests/decrypter.rs
+++ b/generic/sodium/tests/decrypter.rs
@@ -72,17 +72,21 @@ fn test_pipeline() {
         r
     };
 
-    let filesrc = gst::ElementFactory::make("filesrc", None).unwrap();
-    filesrc.set_property("location", &input_path.to_str().unwrap());
+    let filesrc = gst::ElementFactory::make("filesrc")
+        .property("location", &input_path.to_str().unwrap())
+        .build()
+        .unwrap();
 
-    let dec = gst::ElementFactory::make("sodiumdecrypter", None).unwrap();
-    dec.set_property("sender-key", &*SENDER_PUBLIC);
-    dec.set_property("receiver-key", &*RECEIVER_PRIVATE);
+    let dec = gst::ElementFactory::make("sodiumdecrypter")
+        .property("sender-key", &*SENDER_PUBLIC)
+        .property("receiver-key", &*RECEIVER_PRIVATE)
+        .build()
+        .unwrap();
 
     // the typefind element here is cause the decrypter only supports
     // operating in pull mode bu the filesink wants push-mode.
-    let typefind = gst::ElementFactory::make("typefind", None).unwrap();
-    let sink = gst::ElementFactory::make("appsink", None).unwrap();
+    let typefind = gst::ElementFactory::make("typefind").build().unwrap();
+    let sink = gst::ElementFactory::make("appsink").build().unwrap();
 
     pipeline
         .add_many(&[&filesrc, &dec, &typefind, &sink])
@@ -160,12 +164,16 @@ fn test_pull_range() {
         r
     };
 
-    let filesrc = gst::ElementFactory::make("filesrc", None).unwrap();
-    filesrc.set_property("location", input_path.to_str().unwrap());
+    let filesrc = gst::ElementFactory::make("filesrc")
+        .property("location", input_path.to_str().unwrap())
+        .build()
+        .unwrap();
 
-    let dec = gst::ElementFactory::make("sodiumdecrypter", None).unwrap();
-    dec.set_property("sender-key", &*SENDER_PUBLIC);
-    dec.set_property("receiver-key", &*RECEIVER_PRIVATE);
+    let dec = gst::ElementFactory::make("sodiumdecrypter")
+        .property("sender-key", &*SENDER_PUBLIC)
+        .property("receiver-key", &*RECEIVER_PRIVATE)
+        .build()
+        .unwrap();
 
     pipeline
         .add_many(&[&filesrc, &dec])
@@ -265,33 +273,43 @@ fn test_state_changes() {
 
     // NullToReady without keys provided
     {
-        let dec = gst::ElementFactory::make("sodiumdecrypter", None).unwrap();
+        let dec = gst::ElementFactory::make("sodiumdecrypter")
+            .build()
+            .unwrap();
         assert!(dec.change_state(gst::StateChange::NullToReady).is_err());
 
         // Set only receiver key
-        let dec = gst::ElementFactory::make("sodiumdecrypter", None).unwrap();
-        dec.set_property("receiver-key", &*RECEIVER_PRIVATE);
+        let dec = gst::ElementFactory::make("sodiumdecrypter")
+            .property("receiver-key", &*RECEIVER_PRIVATE)
+            .build()
+            .unwrap();
         assert!(dec.change_state(gst::StateChange::NullToReady).is_err());
 
         // Set only sender key
-        let dec = gst::ElementFactory::make("sodiumdecrypter", None).unwrap();
-        dec.set_property("sender-key", &*SENDER_PUBLIC);
+        let dec = gst::ElementFactory::make("sodiumdecrypter")
+            .property("sender-key", &*SENDER_PUBLIC)
+            .build()
+            .unwrap();
         assert!(dec.change_state(gst::StateChange::NullToReady).is_err());
     }
 
     // NullToReady, no nonce provided
     {
-        let dec = gst::ElementFactory::make("sodiumdecrypter", None).unwrap();
-        dec.set_property("sender-key", &*SENDER_PUBLIC);
-        dec.set_property("receiver-key", &*RECEIVER_PRIVATE);
+        let dec = gst::ElementFactory::make("sodiumdecrypter")
+            .property("sender-key", &*SENDER_PUBLIC)
+            .property("receiver-key", &*RECEIVER_PRIVATE)
+            .build()
+            .unwrap();
         assert!(dec.change_state(gst::StateChange::NullToReady).is_ok());
     }
 
     // ReadyToNull
     {
-        let dec = gst::ElementFactory::make("sodiumdecrypter", None).unwrap();
-        dec.set_property("sender-key", &*SENDER_PUBLIC);
-        dec.set_property("receiver-key", &*RECEIVER_PRIVATE);
+        let dec = gst::ElementFactory::make("sodiumdecrypter")
+            .property("sender-key", &*SENDER_PUBLIC)
+            .property("receiver-key", &*RECEIVER_PRIVATE)
+            .build()
+            .unwrap();
         assert!(dec.change_state(gst::StateChange::NullToReady).is_ok());
     }
 }
diff --git a/generic/sodium/tests/encrypter.rs b/generic/sodium/tests/encrypter.rs
index c17cb3ae1..e0c18faf9 100644
--- a/generic/sodium/tests/encrypter.rs
+++ b/generic/sodium/tests/encrypter.rs
@@ -73,10 +73,12 @@ fn encrypt_file() {
 
     let mut adapter = gst_base::UniqueAdapter::new();
 
-    let enc = gst::ElementFactory::make("sodiumencrypter", None).unwrap();
-    enc.set_property("sender-key", &*SENDER_PRIVATE);
-    enc.set_property("receiver-key", &*RECEIVER_PUBLIC);
-    enc.set_property("block-size", 1024u32);
+    let enc = gst::ElementFactory::make("sodiumencrypter")
+        .property("sender-key", &*SENDER_PRIVATE)
+        .property("receiver-key", &*RECEIVER_PUBLIC)
+        .property("block-size", 1024u32)
+        .build()
+        .unwrap();
 
     let mut h = gst_check::Harness::with_element(&enc, None, None);
     h.add_element_src_pad(&enc.static_pad("src").expect("failed to get src pad"));
@@ -109,33 +111,43 @@ fn test_state_changes() {
 
     // NullToReady without keys provided
     {
-        let enc = gst::ElementFactory::make("sodiumencrypter", None).unwrap();
+        let enc = gst::ElementFactory::make("sodiumencrypter")
+            .build()
+            .unwrap();
         assert!(enc.change_state(gst::StateChange::NullToReady).is_err());
 
         // Set only receiver key
-        let enc = gst::ElementFactory::make("sodiumencrypter", None).unwrap();
-        enc.set_property("receiver-key", &*RECEIVER_PUBLIC);
+        let enc = gst::ElementFactory::make("sodiumencrypter")
+            .property("receiver-key", &*RECEIVER_PUBLIC)
+            .build()
+            .unwrap();
         assert!(enc.change_state(gst::StateChange::NullToReady).is_err());
 
         // Set only sender key
-        let enc = gst::ElementFactory::make("sodiumencrypter", None).unwrap();
-        enc.set_property("sender-key", &*SENDER_PRIVATE);
+        let enc = gst::ElementFactory::make("sodiumencrypter")
+            .property("sender-key", &*SENDER_PRIVATE)
+            .build()
+            .unwrap();
         assert!(enc.change_state(gst::StateChange::NullToReady).is_err());
     }
 
     // NullToReady
     {
-        let enc = gst::ElementFactory::make("sodiumencrypter", None).unwrap();
-        enc.set_property("sender-key", &*SENDER_PRIVATE);
-        enc.set_property("receiver-key", &*RECEIVER_PUBLIC);
+        let enc = gst::ElementFactory::make("sodiumencrypter")
+            .property("sender-key", &*SENDER_PRIVATE)
+            .property("receiver-key", &*RECEIVER_PUBLIC)
+            .build()
+            .unwrap();
         assert!(enc.change_state(gst::StateChange::NullToReady).is_ok());
     }
 
     // ReadyToNull
     {
-        let enc = gst::ElementFactory::make("sodiumencrypter", None).unwrap();
-        enc.set_property("sender-key", &*SENDER_PRIVATE);
-        enc.set_property("receiver-key", &*RECEIVER_PUBLIC);
+        let enc = gst::ElementFactory::make("sodiumencrypter")
+            .property("sender-key", &*SENDER_PRIVATE)
+            .property("receiver-key", &*RECEIVER_PUBLIC)
+            .build()
+            .unwrap();
         assert!(enc.change_state(gst::StateChange::NullToReady).is_ok());
     }
 }