From b025d068f2a62910d22ddd5c9136aa9d3cc0f0ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 9 Mar 2023 17:30:57 +0200 Subject: [PATCH] Update for remaining `gst::Element::link_many()` and related API generalization Specifically, get rid of now unneeded `&`. --- audio/csound/examples/effect_example.rs | 2 +- generic/sodium/examples/decrypt_example.rs | 4 ++-- generic/sodium/examples/encrypt_example.rs | 4 ++-- generic/sodium/tests/decrypter.rs | 8 ++++---- video/closedcaption/src/transcriberbin/imp.rs | 8 ++++---- video/gtk4/examples/gtksink.rs | 2 +- video/videofx/tests/colordetect.rs | 4 ++-- video/videofx/tests/videocompare.rs | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/audio/csound/examples/effect_example.rs b/audio/csound/examples/effect_example.rs index 98c7b63e..7ad38282 100644 --- a/audio/csound/examples/effect_example.rs +++ b/audio/csound/examples/effect_example.rs @@ -84,7 +84,7 @@ fn create_pipeline() -> Result> { .build() .unwrap(); - pipeline.add_many(&[&audio_src, &csoundfilter, &audio_sink])?; + pipeline.add_many([&audio_src, &csoundfilter, &audio_sink])?; audio_src.link_pads(Some("src"), &csoundfilter, Some("sink"))?; csoundfilter.link_pads(Some("src"), &audio_sink, Some("sink"))?; diff --git a/generic/sodium/examples/decrypt_example.rs b/generic/sodium/examples/decrypt_example.rs index f888c96e..b88e5713 100644 --- a/generic/sodium/examples/decrypt_example.rs +++ b/generic/sodium/examples/decrypt_example.rs @@ -102,9 +102,9 @@ fn main() -> Result<(), Box> { let pipeline = gst::Pipeline::builder().name("test-pipeline").build(); pipeline - .add_many(&[&filesrc, &decrypter, &typefind, &filesink]) + .add_many([&filesrc, &decrypter, &typefind, &filesink]) .expect("failed to add elements to the pipeline"); - gst::Element::link_many(&[&filesrc, &decrypter, &typefind, &filesink]) + gst::Element::link_many([&filesrc, &decrypter, &typefind, &filesink]) .expect("failed to link the elements"); pipeline diff --git a/generic/sodium/examples/encrypt_example.rs b/generic/sodium/examples/encrypt_example.rs index b94fee5c..54a66e8a 100644 --- a/generic/sodium/examples/encrypt_example.rs +++ b/generic/sodium/examples/encrypt_example.rs @@ -105,9 +105,9 @@ fn main() -> Result<(), Box> { let pipeline = gst::Pipeline::builder().name("test-pipeline").build(); pipeline - .add_many(&[&filesrc, &encrypter, &filesink]) + .add_many([&filesrc, &encrypter, &filesink]) .expect("failed to add elements to the pipeline"); - gst::Element::link_many(&[&filesrc, &encrypter, &filesink]) + gst::Element::link_many([&filesrc, &encrypter, &filesink]) .expect("failed to link the elements"); pipeline.set_state(gst::State::Playing)?; diff --git a/generic/sodium/tests/decrypter.rs b/generic/sodium/tests/decrypter.rs index 43ba194f..a8a154ca 100644 --- a/generic/sodium/tests/decrypter.rs +++ b/generic/sodium/tests/decrypter.rs @@ -91,9 +91,9 @@ fn test_pipeline() { let sink = gst_app::AppSink::builder().build(); pipeline - .add_many(&[&filesrc, &dec, &typefind, sink.upcast_ref()]) + .add_many([&filesrc, &dec, &typefind, sink.upcast_ref()]) .expect("failed to add elements to the pipeline"); - gst::Element::link_many(&[&filesrc, &dec, &typefind, sink.upcast_ref()]) + gst::Element::link_many([&filesrc, &dec, &typefind, sink.upcast_ref()]) .expect("failed to link the elements"); let adapter = Arc::new(Mutex::new(gst_base::UniqueAdapter::new())); @@ -179,9 +179,9 @@ fn test_pull_range() { .unwrap(); pipeline - .add_many(&[&filesrc, &dec]) + .add_many([&filesrc, &dec]) .expect("failed to add elements to the pipeline"); - gst::Element::link_many(&[&filesrc, &dec]).expect("failed to link the elements"); + gst::Element::link_many([&filesrc, &dec]).expect("failed to link the elements"); // Activate in the pad in pull mode pipeline diff --git a/video/closedcaption/src/transcriberbin/imp.rs b/video/closedcaption/src/transcriberbin/imp.rs index 5a94b287..338eca6b 100644 --- a/video/closedcaption/src/transcriberbin/imp.rs +++ b/video/closedcaption/src/transcriberbin/imp.rs @@ -97,7 +97,7 @@ impl TranscriberBin { .build()?; let ccconverter = gst::ElementFactory::make("ccconverter").build()?; - state.transcription_bin.add_many(&[ + state.transcription_bin.add_many([ &aqueue_transcription, &state.transcriber_aconv, &state.transcriber, @@ -109,7 +109,7 @@ impl TranscriberBin { &state.transcription_valve, ])?; - gst::Element::link_many(&[ + gst::Element::link_many([ &aqueue_transcription, &state.transcriber_aconv, &state.transcriber, @@ -156,7 +156,7 @@ impl TranscriberBin { let vclocksync = gst::ElementFactory::make("clocksync").build()?; - state.internal_bin.add_many(&[ + state.internal_bin.add_many([ &aclocksync, &state.audio_tee, &state.audio_queue_passthrough, @@ -392,7 +392,7 @@ impl TranscriberBin { state.transcription_bin.add(&state.transcriber)?; state.transcriber.sync_state_with_parent().unwrap(); - gst::Element::link_many(&[ + gst::Element::link_many([ &state.transcriber_aconv, &state.transcriber, &state.transcriber_queue, diff --git a/video/gtk4/examples/gtksink.rs b/video/gtk4/examples/gtksink.rs index 0f64c7fb..bdb3da2e 100644 --- a/video/gtk4/examples/gtksink.rs +++ b/video/gtk4/examples/gtksink.rs @@ -57,7 +57,7 @@ fn create_ui(app: >k::Application) { (src, sink.upcast()) }; - pipeline.add_many(&[&src, &overlay, &sink]).unwrap(); + pipeline.add_many([&src, &overlay, &sink]).unwrap(); let caps = gst_video::VideoCapsBuilder::new() .width(640) .height(480) diff --git a/video/videofx/tests/colordetect.rs b/video/videofx/tests/colordetect.rs index 9b7b527c..122805dc 100644 --- a/video/videofx/tests/colordetect.rs +++ b/video/videofx/tests/colordetect.rs @@ -33,9 +33,9 @@ fn test_red_color() { let sink = gst::ElementFactory::make("fakevideosink").build().unwrap(); pipeline - .add_many(&[&src, &filter, &sink]) + .add_many([&src, &filter, &sink]) .expect("failed to add elements to the pipeline"); - gst::Element::link_many(&[&src, &filter, &sink]).expect("failed to link the elements"); + gst::Element::link_many([&src, &filter, &sink]).expect("failed to link the elements"); pipeline .set_state(gst::State::Playing) diff --git a/video/videofx/tests/videocompare.rs b/video/videofx/tests/videocompare.rs index f07089d9..951b192c 100644 --- a/video/videofx/tests/videocompare.rs +++ b/video/videofx/tests/videocompare.rs @@ -48,10 +48,10 @@ fn setup_pipeline( let sink = gst::ElementFactory::make("fakesink").build().unwrap(); pipeline - .add_many(&[&reference_src, &secondary_src, &videocompare, &sink]) + .add_many([&reference_src, &secondary_src, &videocompare, &sink]) .unwrap(); - gst::Element::link_many(&[&reference_src, &videocompare, &sink]).expect("Link primary path"); - gst::Element::link_many(&[&secondary_src, &videocompare]).expect("Link secondary path"); + gst::Element::link_many([&reference_src, &videocompare, &sink]).expect("Link primary path"); + gst::Element::link_many([&secondary_src, &videocompare]).expect("Link secondary path"); } #[test]