From fc5ed15af584770bdca21a3439ba9c368707ec42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 9 Mar 2023 16:46:52 +0200 Subject: [PATCH] Update for `gst::Element::link_many()` and related API generalization Specifically, get rid of now unneeded `&`. --- generic/threadshare/tests/jitterbuffer.rs | 8 ++--- generic/threadshare/tests/pipeline.rs | 14 ++++----- generic/threadshare/tests/proxy.rs | 10 +++---- generic/threadshare/tests/queue.rs | 2 +- generic/threadshare/tests/tcpclientsrc.rs | 2 +- mux/fmp4/examples/hls_live.rs | 8 ++--- mux/fmp4/examples/hls_vod.rs | 8 ++--- net/hlssink3/tests/hlssink3.rs | 12 ++++---- net/webrtc/src/webrtcsink/imp.rs | 30 +++++++++---------- .../examples/gtk_fallbackswitch.rs | 2 +- utils/fallbackswitch/src/fallbacksrc/imp.rs | 24 +++++++-------- utils/fallbackswitch/tests/fallbackswitch.rs | 2 +- utils/togglerecord/examples/gtk_recording.rs | 12 ++++---- utils/uriplaylistbin/tests/uriplaylistbin.rs | 2 +- video/cdg/tests/cdgdec.rs | 4 +-- 15 files changed, 70 insertions(+), 70 deletions(-) diff --git a/generic/threadshare/tests/jitterbuffer.rs b/generic/threadshare/tests/jitterbuffer.rs index 687ce5f8..851d66a3 100644 --- a/generic/threadshare/tests/jitterbuffer.rs +++ b/generic/threadshare/tests/jitterbuffer.rs @@ -91,9 +91,9 @@ fn jb_pipeline() { .build(); pipeline - .add_many(&[&src, &enc, &pay, &jb, &depay, &dec, sink.upcast_ref()]) + .add_many([&src, &enc, &pay, &jb, &depay, &dec, sink.upcast_ref()]) .unwrap(); - gst::Element::link_many(&[&src, &enc, &pay, &jb, &depay, &dec, sink.upcast_ref()]).unwrap(); + gst::Element::link_many([&src, &enc, &pay, &jb, &depay, &dec, sink.upcast_ref()]).unwrap(); let (sender, receiver) = mpsc::channel(); sink.set_callbacks( @@ -175,7 +175,7 @@ fn jb_ts_pipeline() { .build(); pipeline - .add_many(&[ + .add_many([ &src, &queue, &enc, @@ -186,7 +186,7 @@ fn jb_ts_pipeline() { sink.upcast_ref(), ]) .unwrap(); - gst::Element::link_many(&[ + gst::Element::link_many([ &src, &queue, &enc, diff --git a/generic/threadshare/tests/pipeline.rs b/generic/threadshare/tests/pipeline.rs index 6b9f5534..91e5882a 100644 --- a/generic/threadshare/tests/pipeline.rs +++ b/generic/threadshare/tests/pipeline.rs @@ -85,9 +85,9 @@ fn multiple_contexts_queue() { .build(); pipeline - .add_many(&[&src, &queue, sink.upcast_ref()]) + .add_many([&src, &queue, sink.upcast_ref()]) .unwrap(); - gst::Element::link_many(&[&src, &queue, sink.upcast_ref()]).unwrap(); + gst::Element::link_many([&src, &queue, sink.upcast_ref()]).unwrap(); let sender_clone = sender.clone(); sink.set_callbacks( @@ -230,7 +230,7 @@ fn multiple_contexts_proxy() { .build(); pipeline - .add_many(&[&src, &proxysink, &proxysrc, sink.upcast_ref()]) + .add_many([&src, &proxysink, &proxysrc, sink.upcast_ref()]) .unwrap(); src.link(&proxysink).unwrap(); proxysrc.link(&sink).unwrap(); @@ -353,9 +353,9 @@ fn eos() { .build(); pipeline - .add_many(&[&src, &queue, sink.upcast_ref()]) + .add_many([&src, &queue, sink.upcast_ref()]) .unwrap(); - gst::Element::link_many(&[&src, &queue, sink.upcast_ref()]).unwrap(); + gst::Element::link_many([&src, &queue, sink.upcast_ref()]).unwrap(); let (sample_notifier, sample_notif_rcv) = mpsc::channel(); let (eos_notifier, eos_notif_rcv) = mpsc::channel(); @@ -487,9 +487,9 @@ fn premature_shutdown() { .build(); pipeline - .add_many(&[&src, &queue, sink.upcast_ref()]) + .add_many([&src, &queue, sink.upcast_ref()]) .unwrap(); - gst::Element::link_many(&[&src, &queue, sink.upcast_ref()]).unwrap(); + gst::Element::link_many([&src, &queue, sink.upcast_ref()]).unwrap(); let (appsink_sender, appsink_receiver) = mpsc::channel(); diff --git a/generic/threadshare/tests/proxy.rs b/generic/threadshare/tests/proxy.rs index 49eb64e6..f7992eed 100644 --- a/generic/threadshare/tests/proxy.rs +++ b/generic/threadshare/tests/proxy.rs @@ -54,7 +54,7 @@ fn test_push() { let appsink = gst_app::AppSink::builder().build(); pipeline - .add_many(&[&fakesrc, &proxysink, &proxysrc, appsink.upcast_ref()]) + .add_many([&fakesrc, &proxysink, &proxysrc, appsink.upcast_ref()]) .unwrap(); fakesrc.link(&proxysink).unwrap(); proxysrc.link(&appsink).unwrap(); @@ -122,10 +122,10 @@ fn test_from_pipeline_to_pipeline() { .unwrap(); let fakesink = gst::ElementFactory::make("fakesink").build().unwrap(); - pipe_1.add_many(&[&fakesrc, &pxsink]).unwrap(); + pipe_1.add_many([&fakesrc, &pxsink]).unwrap(); fakesrc.link(&pxsink).unwrap(); - pipe_2.add_many(&[&pxsrc, &fakesink]).unwrap(); + pipe_2.add_many([&pxsrc, &fakesink]).unwrap(); pxsrc.link(&fakesink).unwrap(); pipe_1.set_state(gst::State::Paused).unwrap(); @@ -169,10 +169,10 @@ fn test_from_pipeline_to_pipeline_and_back() { .build() .unwrap(); - pipe_1.add_many(&[&pxsrc_1, &pxsink_1]).unwrap(); + pipe_1.add_many([&pxsrc_1, &pxsink_1]).unwrap(); pxsrc_1.link(&pxsink_1).unwrap(); - pipe_2.add_many(&[&pxsrc_2, &pxsink_2]).unwrap(); + pipe_2.add_many([&pxsrc_2, &pxsink_2]).unwrap(); pxsrc_2.link(&pxsink_2).unwrap(); pipe_1.set_state(gst::State::Paused).unwrap(); diff --git a/generic/threadshare/tests/queue.rs b/generic/threadshare/tests/queue.rs index 321f3cd5..28ce10ae 100644 --- a/generic/threadshare/tests/queue.rs +++ b/generic/threadshare/tests/queue.rs @@ -44,7 +44,7 @@ fn test_push() { let appsink = gst_app::AppSink::builder().build(); pipeline - .add_many(&[&fakesrc, &queue, appsink.upcast_ref()]) + .add_many([&fakesrc, &queue, appsink.upcast_ref()]) .unwrap(); fakesrc.link(&queue).unwrap(); queue.link(&appsink).unwrap(); diff --git a/generic/threadshare/tests/tcpclientsrc.rs b/generic/threadshare/tests/tcpclientsrc.rs index 27c9fe1e..a450452e 100644 --- a/generic/threadshare/tests/tcpclientsrc.rs +++ b/generic/threadshare/tests/tcpclientsrc.rs @@ -68,7 +68,7 @@ fn test_push() { .build(); pipeline - .add_many(&[&tcpclientsrc, appsink.upcast_ref()]) + .add_many([&tcpclientsrc, appsink.upcast_ref()]) .unwrap(); tcpclientsrc.link(&appsink).unwrap(); diff --git a/mux/fmp4/examples/hls_live.rs b/mux/fmp4/examples/hls_live.rs index aaec4f2e..fa77a37a 100644 --- a/mux/fmp4/examples/hls_live.rs +++ b/mux/fmp4/examples/hls_live.rs @@ -425,7 +425,7 @@ impl VideoStream { .build()?; let appsink = gst_app::AppSink::builder().buffer_list(true).build(); - pipeline.add_many(&[ + pipeline.add_many([ &src, &raw_capsfilter, &timeoverlay, @@ -435,7 +435,7 @@ impl VideoStream { appsink.upcast_ref(), ])?; - gst::Element::link_many(&[ + gst::Element::link_many([ &src, &raw_capsfilter, &timeoverlay, @@ -472,9 +472,9 @@ impl AudioStream { .build()?; let appsink = gst_app::AppSink::builder().buffer_list(true).build(); - pipeline.add_many(&[&src, &enc, &mux, appsink.upcast_ref()])?; + pipeline.add_many([&src, &enc, &mux, appsink.upcast_ref()])?; - gst::Element::link_many(&[&src, &enc, &mux, appsink.upcast_ref()])?; + gst::Element::link_many([&src, &enc, &mux, appsink.upcast_ref()])?; probe_encoder(state, enc); diff --git a/mux/fmp4/examples/hls_vod.rs b/mux/fmp4/examples/hls_vod.rs index 1f987b6d..a31f17db 100644 --- a/mux/fmp4/examples/hls_vod.rs +++ b/mux/fmp4/examples/hls_vod.rs @@ -318,7 +318,7 @@ impl VideoStream { .build()?; let appsink = gst_app::AppSink::builder().buffer_list(true).build(); - pipeline.add_many(&[ + pipeline.add_many([ &src, &raw_capsfilter, &timeoverlay, @@ -328,7 +328,7 @@ impl VideoStream { appsink.upcast_ref(), ])?; - gst::Element::link_many(&[ + gst::Element::link_many([ &src, &raw_capsfilter, &timeoverlay, @@ -372,9 +372,9 @@ impl AudioStream { .build()?; let appsink = gst_app::AppSink::builder().buffer_list(true).build(); - pipeline.add_many(&[&src, &raw_capsfilter, &enc, &mux, appsink.upcast_ref()])?; + pipeline.add_many([&src, &raw_capsfilter, &enc, &mux, appsink.upcast_ref()])?; - gst::Element::link_many(&[&src, &raw_capsfilter, &enc, &mux, appsink.upcast_ref()])?; + gst::Element::link_many([&src, &raw_capsfilter, &enc, &mux, appsink.upcast_ref()])?; probe_encoder(state, enc); diff --git a/net/hlssink3/tests/hlssink3.rs b/net/hlssink3/tests/hlssink3.rs index e921829a..ea35bbbe 100644 --- a/net/hlssink3/tests/hlssink3.rs +++ b/net/hlssink3/tests/hlssink3.rs @@ -174,8 +174,8 @@ fn test_hlssink3_element_with_video_content() -> Result<(), ()> { Some(true.to_value()) }); - try_or_pause!(pipeline.add_many(&[&video_src, &x264enc, &h264parse, &hlssink3,])); - try_or_pause!(gst::Element::link_many(&[ + try_or_pause!(pipeline.add_many([&video_src, &x264enc, &h264parse, &hlssink3,])); + try_or_pause!(gst::Element::link_many([ &video_src, &x264enc, &h264parse, &hlssink3 ])); @@ -280,8 +280,8 @@ fn test_hlssink3_element_with_audio_content() -> Result<(), ()> { hlssink3.connect("delete-fragment", false, move |_| Some(true.to_value())); - try_or_pause!(pipeline.add_many(&[&audio_src, &hls_avenc_aac, &hlssink3,])); - try_or_pause!(gst::Element::link_many(&[ + try_or_pause!(pipeline.add_many([&audio_src, &hls_avenc_aac, &hlssink3,])); + try_or_pause!(gst::Element::link_many([ &audio_src, &hls_avenc_aac, &hlssink3 @@ -379,8 +379,8 @@ fn test_hlssink3_write_correct_playlist_content() -> Result<(), ()> { Some(true.to_value()) }); - try_or_pause!(pipeline.add_many(&[&video_src, &x264enc, &h264parse, &hlssink3,])); - try_or_pause!(gst::Element::link_many(&[ + try_or_pause!(pipeline.add_many([&video_src, &x264enc, &h264parse, &hlssink3,])); + try_or_pause!(gst::Element::link_many([ &video_src, &x264enc, &h264parse, &hlssink3 ])); diff --git a/net/webrtc/src/webrtcsink/imp.rs b/net/webrtc/src/webrtcsink/imp.rs index 8221ebe3..669be9bc 100644 --- a/net/webrtc/src/webrtcsink/imp.rs +++ b/net/webrtc/src/webrtcsink/imp.rs @@ -321,8 +321,8 @@ fn make_converter_for_video_caps(caps: &gst::Caps) -> Result Result Result Result (gst::Pipeline, gst::Pad, gst::Element) { .unwrap(); pipeline - .add_many(&[ + .add_many([ &video_src, &fallback_video_src, &fallbackswitch, diff --git a/utils/fallbackswitch/src/fallbacksrc/imp.rs b/utils/fallbackswitch/src/fallbacksrc/imp.rs index d31dc487..7d73c423 100644 --- a/utils/fallbackswitch/src/fallbacksrc/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/imp.rs @@ -925,7 +925,7 @@ impl FallbackSrc { .build() .expect("No queue found"); - bin.add_many(&[ + bin.add_many([ &audiotestsrc, &audioconvert, &audioresample, @@ -934,7 +934,7 @@ impl FallbackSrc { ]) .unwrap(); - gst::Element::link_many(&[ + gst::Element::link_many([ &audiotestsrc, &audioconvert, &audioresample, @@ -984,7 +984,7 @@ impl FallbackSrc { .build() .expect("No queue found"); - bin.add_many(&[ + bin.add_many([ &videotestsrc, &videoconvert, &videoscale, @@ -993,7 +993,7 @@ impl FallbackSrc { ]) .unwrap(); - gst::Element::link_many(&[ + gst::Element::link_many([ &videotestsrc, &videoconvert, &videoscale, @@ -1601,10 +1601,10 @@ impl FallbackSrc { .build() .expect("No capsfilter found"); - bin.add_many(&[&videoconvert, &videoscale, &imagefreeze, &capsfilter]) + bin.add_many([&videoconvert, &videoscale, &imagefreeze, &capsfilter]) .unwrap(); - gst::Element::link_many(&[&videoconvert, &videoscale, &imagefreeze, &capsfilter]).unwrap(); + gst::Element::link_many([&videoconvert, &videoscale, &imagefreeze, &capsfilter]).unwrap(); let ghostpad = gst::GhostPad::with_target(Some("sink"), &videoconvert.static_pad("sink").unwrap()) @@ -1649,10 +1649,10 @@ impl FallbackSrc { .build() .expect("No capsfilter found"); - bin.add_many(&[&videoconvert, &videoscale, &capsfilter]) + bin.add_many([&videoconvert, &videoscale, &capsfilter]) .unwrap(); - gst::Element::link_many(&[&videoconvert, &videoscale, &capsfilter]).unwrap(); + gst::Element::link_many([&videoconvert, &videoscale, &capsfilter]).unwrap(); let ghostpad = gst::GhostPad::with_target(Some("sink"), &videoconvert.static_pad("sink").unwrap()) @@ -1697,10 +1697,10 @@ impl FallbackSrc { .build() .expect("No capsfilter found"); - bin.add_many(&[&audioconvert, &audioresample, &capsfilter]) + bin.add_many([&audioconvert, &audioresample, &capsfilter]) .unwrap(); - gst::Element::link_many(&[&audioconvert, &audioresample, &capsfilter]).unwrap(); + gst::Element::link_many([&audioconvert, &audioresample, &capsfilter]).unwrap(); let ghostpad = gst::GhostPad::with_target(Some("sink"), &audioconvert.static_pad("sink").unwrap()) @@ -1869,7 +1869,7 @@ impl FallbackSrc { source .source - .add_many(&[&converters, &queue, &clocksync]) + .add_many([&converters, &queue, &clocksync]) .unwrap(); converters.sync_state_with_parent().unwrap(); queue.sync_state_with_parent().unwrap(); @@ -1884,7 +1884,7 @@ impl FallbackSrc { ) })?; - gst::Element::link_many(&[&converters, &queue, &clocksync]).unwrap(); + gst::Element::link_many([&converters, &queue, &clocksync]).unwrap(); let ghostpad = gst::GhostPad::with_target(Some(type_), &clocksync.static_pad("src").unwrap()).unwrap(); diff --git a/utils/fallbackswitch/tests/fallbackswitch.rs b/utils/fallbackswitch/tests/fallbackswitch.rs index 8257c73d..cf1a2033 100644 --- a/utils/fallbackswitch/tests/fallbackswitch.rs +++ b/utils/fallbackswitch/tests/fallbackswitch.rs @@ -506,7 +506,7 @@ fn setup_pipeline( let queue = gst::ElementFactory::make("queue").build().unwrap(); pipeline - .add_many(&[src.upcast_ref(), &switch, &queue, sink.upcast_ref()]) + .add_many([src.upcast_ref(), &switch, &queue, sink.upcast_ref()]) .unwrap(); src.link_pads(Some("src"), &switch, Some("sink_0")).unwrap(); switch.link_pads(Some("src"), &queue, Some("sink")).unwrap(); diff --git a/utils/togglerecord/examples/gtk_recording.rs b/utils/togglerecord/examples/gtk_recording.rs index 9e9ab663..7159a072 100644 --- a/utils/togglerecord/examples/gtk_recording.rs +++ b/utils/togglerecord/examples/gtk_recording.rs @@ -85,7 +85,7 @@ fn create_pipeline() -> ( .unwrap(); pipeline - .add_many(&[ + .add_many([ &video_src, &timeoverlay, &video_tee, @@ -113,7 +113,7 @@ fn create_pipeline() -> ( ]) .unwrap(); - gst::Element::link_many(&[ + gst::Element::link_many([ &video_src, &timeoverlay, &video_tee, @@ -123,7 +123,7 @@ fn create_pipeline() -> ( ]) .unwrap(); - gst::Element::link_many(&[ + gst::Element::link_many([ &video_tee, &video_queue2, &video_convert2, @@ -142,7 +142,7 @@ fn create_pipeline() -> ( .link_pads(Some("src"), &mux, Some("video_%u")) .unwrap(); - gst::Element::link_many(&[ + gst::Element::link_many([ &audio_src, &audio_tee, &audio_queue1, @@ -151,7 +151,7 @@ fn create_pipeline() -> ( ]) .unwrap(); - gst::Element::link_many(&[ + gst::Element::link_many([ &audio_tee, &audio_queue2, &audio_convert2, @@ -170,7 +170,7 @@ fn create_pipeline() -> ( .link_pads(Some("src"), &mux, Some("audio_%u")) .unwrap(); - gst::Element::link_many(&[&mux, &file_sink]).unwrap(); + gst::Element::link_many([&mux, &file_sink]).unwrap(); ( pipeline, diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs index 77424780..822023a3 100644 --- a/utils/uriplaylistbin/tests/uriplaylistbin.rs +++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs @@ -93,7 +93,7 @@ fn test( .unwrap(); let mq = gst::ElementFactory::make("multiqueue").build().unwrap(); - pipeline.add_many(&[&playlist, &mq]).unwrap(); + pipeline.add_many([&playlist, &mq]).unwrap(); assert_eq!(playlist.property::("current-iteration"), 0); assert_eq!(playlist.property::("current-uri-index"), 0); diff --git a/video/cdg/tests/cdgdec.rs b/video/cdg/tests/cdgdec.rs index 7810883b..a47599ca 100644 --- a/video/cdg/tests/cdgdec.rs +++ b/video/cdg/tests/cdgdec.rs @@ -53,9 +53,9 @@ fn test_cdgdec() { let sink = gst_app::AppSink::builder().build(); pipeline - .add_many(&[&filesrc, &parse, &dec, sink.upcast_ref()]) + .add_many([&filesrc, &parse, &dec, sink.upcast_ref()]) .expect("failed to add elements to the pipeline"); - gst::Element::link_many(&[&filesrc, &parse, &dec, sink.upcast_ref()]) + gst::Element::link_many([&filesrc, &parse, &dec, sink.upcast_ref()]) .expect("failed to link the elements"); sink.set_callbacks(