From e85799b9d6ba89e3f3e76a5d092bc7145121af03 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 11 Jun 2020 12:45:15 +0200 Subject: use new constructor names --- generic/sodium/src/decrypter.rs | 4 ++-- generic/sodium/src/encrypter.rs | 4 ++-- generic/sodium/tests/encrypter.rs | 2 +- generic/threadshare/src/appsrc.rs | 2 +- generic/threadshare/src/inputselector.rs | 4 ++-- generic/threadshare/src/jitterbuffer/jitterbuffer.rs | 4 ++-- generic/threadshare/src/proxy.rs | 4 ++-- generic/threadshare/src/queue.rs | 4 ++-- generic/threadshare/src/tcpclientsrc.rs | 2 +- generic/threadshare/src/udpsink.rs | 2 +- generic/threadshare/src/udpsrc.rs | 2 +- generic/threadshare/tests/inputselector.rs | 4 ++-- generic/threadshare/tests/pad.rs | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) (limited to 'generic') diff --git a/generic/sodium/src/decrypter.rs b/generic/sodium/src/decrypter.rs index 39891ee17..b6eae734d 100644 --- a/generic/sodium/src/decrypter.rs +++ b/generic/sodium/src/decrypter.rs @@ -596,9 +596,9 @@ impl ObjectSubclass for Decrypter { fn new_with_class(klass: &subclass::simple::ClassStruct) -> Self { let templ = klass.get_pad_template("sink").unwrap(); - let sinkpad = gst::Pad::new_from_template(&templ, Some("sink")); + let sinkpad = gst::Pad::from_template(&templ, Some("sink")); let templ = klass.get_pad_template("src").unwrap(); - let srcpad = gst::Pad::new_from_template(&templ, Some("src")); + let srcpad = gst::Pad::from_template(&templ, Some("src")); Decrypter::set_pad_functions(&sinkpad, &srcpad); let props = Mutex::new(Props::default()); diff --git a/generic/sodium/src/encrypter.rs b/generic/sodium/src/encrypter.rs index 60a6e01e8..431316e88 100644 --- a/generic/sodium/src/encrypter.rs +++ b/generic/sodium/src/encrypter.rs @@ -425,9 +425,9 @@ impl ObjectSubclass for Encrypter { fn new_with_class(klass: &subclass::simple::ClassStruct) -> Self { let templ = klass.get_pad_template("sink").unwrap(); - let sinkpad = gst::Pad::new_from_template(&templ, Some("sink")); + let sinkpad = gst::Pad::from_template(&templ, Some("sink")); let templ = klass.get_pad_template("src").unwrap(); - let srcpad = gst::Pad::new_from_template(&templ, Some("src")); + let srcpad = gst::Pad::from_template(&templ, Some("src")); Encrypter::set_pad_functions(&sinkpad, &srcpad); let props = Mutex::new(Props::default()); diff --git a/generic/sodium/tests/encrypter.rs b/generic/sodium/tests/encrypter.rs index e2f6dc83a..b7b92fe2d 100644 --- a/generic/sodium/tests/encrypter.rs +++ b/generic/sodium/tests/encrypter.rs @@ -83,7 +83,7 @@ fn encrypt_file() { enc.set_property("block-size", &1024u32) .expect("failed to set property"); - let mut h = gst_check::Harness::new_with_element(&enc, None, None); + let mut h = gst_check::Harness::with_element(&enc, None, None); h.add_element_src_pad(&enc.get_static_pad("src").expect("failed to get src pad")); h.add_element_sink_pad(&enc.get_static_pad("sink").expect("failed to get src pad")); h.set_src_caps_str("application/x-sodium-encrypted"); diff --git a/generic/threadshare/src/appsrc.rs b/generic/threadshare/src/appsrc.rs index 8bc923029..3590b8536 100644 --- a/generic/threadshare/src/appsrc.rs +++ b/generic/threadshare/src/appsrc.rs @@ -630,7 +630,7 @@ impl ObjectSubclass for AppSrc { Self { src_pad: PadSrc::new( - gst::Pad::new_from_template(&klass.get_pad_template("src").unwrap(), Some("src")), + gst::Pad::from_template(&klass.get_pad_template("src").unwrap(), Some("src")), src_pad_handler.clone(), ), src_pad_handler, diff --git a/generic/threadshare/src/inputselector.rs b/generic/threadshare/src/inputselector.rs index 45e84a65d..83dec5509 100644 --- a/generic/threadshare/src/inputselector.rs +++ b/generic/threadshare/src/inputselector.rs @@ -470,7 +470,7 @@ impl ObjectSubclass for InputSelector { fn new_with_class(klass: &subclass::simple::ClassStruct) -> Self { Self { src_pad: PadSrc::new( - gst::Pad::new_from_template(&klass.get_pad_template("src").unwrap(), Some("src")), + gst::Pad::from_template(&klass.get_pad_template("src").unwrap(), Some("src")), InputSelectorPadSrcHandler, ), state: Mutex::new(State::default()), @@ -598,7 +598,7 @@ impl ElementImpl for InputSelector { let mut state = self.state.lock().unwrap(); let mut pads = self.pads.lock().unwrap(); let sink_pad = - gst::Pad::new_from_template(&templ, Some(format!("sink_{}", pads.pad_serial).as_str())); + gst::Pad::from_template(&templ, Some(format!("sink_{}", pads.pad_serial).as_str())); pads.pad_serial += 1; sink_pad.set_active(true).unwrap(); element.add_pad(&sink_pad).unwrap(); diff --git a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs index 8d490f87c..0e4c2e857 100644 --- a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs +++ b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs @@ -1478,11 +1478,11 @@ impl ObjectSubclass for JitterBuffer { Self { sink_pad: PadSink::new( - gst::Pad::new_from_template(&klass.get_pad_template("sink").unwrap(), Some("sink")), + gst::Pad::from_template(&klass.get_pad_template("sink").unwrap(), Some("sink")), sink_pad_handler.clone(), ), src_pad: PadSrc::new( - gst::Pad::new_from_template(&klass.get_pad_template("src").unwrap(), Some("src")), + gst::Pad::from_template(&klass.get_pad_template("src").unwrap(), Some("src")), src_pad_handler.clone(), ), sink_pad_handler, diff --git a/generic/threadshare/src/proxy.rs b/generic/threadshare/src/proxy.rs index 6972b0080..45dfec11e 100644 --- a/generic/threadshare/src/proxy.rs +++ b/generic/threadshare/src/proxy.rs @@ -683,7 +683,7 @@ impl ObjectSubclass for ProxySink { fn new_with_class(klass: &subclass::simple::ClassStruct) -> Self { Self { sink_pad: PadSink::new( - gst::Pad::new_from_template(&klass.get_pad_template("sink").unwrap(), Some("sink")), + gst::Pad::from_template(&klass.get_pad_template("sink").unwrap(), Some("sink")), ProxySinkPadHandler, ), proxy_ctx: StdMutex::new(None), @@ -1204,7 +1204,7 @@ impl ObjectSubclass for ProxySrc { fn new_with_class(klass: &subclass::simple::ClassStruct) -> Self { Self { src_pad: PadSrc::new( - gst::Pad::new_from_template(&klass.get_pad_template("src").unwrap(), Some("src")), + gst::Pad::from_template(&klass.get_pad_template("src").unwrap(), Some("src")), ProxySrcPadHandler, ), task: Task::default(), diff --git a/generic/threadshare/src/queue.rs b/generic/threadshare/src/queue.rs index 021643351..a51afd74a 100644 --- a/generic/threadshare/src/queue.rs +++ b/generic/threadshare/src/queue.rs @@ -792,11 +792,11 @@ impl ObjectSubclass for Queue { fn new_with_class(klass: &subclass::simple::ClassStruct) -> Self { Self { sink_pad: PadSink::new( - gst::Pad::new_from_template(&klass.get_pad_template("sink").unwrap(), Some("sink")), + gst::Pad::from_template(&klass.get_pad_template("sink").unwrap(), Some("sink")), QueuePadSinkHandler, ), src_pad: PadSrc::new( - gst::Pad::new_from_template(&klass.get_pad_template("src").unwrap(), Some("src")), + gst::Pad::from_template(&klass.get_pad_template("src").unwrap(), Some("src")), QueuePadSrcHandler, ), task: Task::default(), diff --git a/generic/threadshare/src/tcpclientsrc.rs b/generic/threadshare/src/tcpclientsrc.rs index f2333eb50..9e0ab6964 100644 --- a/generic/threadshare/src/tcpclientsrc.rs +++ b/generic/threadshare/src/tcpclientsrc.rs @@ -646,7 +646,7 @@ impl ObjectSubclass for TcpClientSrc { Self { src_pad: PadSrc::new( - gst::Pad::new_from_template(&klass.get_pad_template("src").unwrap(), Some("src")), + gst::Pad::from_template(&klass.get_pad_template("src").unwrap(), Some("src")), src_pad_handler.clone(), ), src_pad_handler, diff --git a/generic/threadshare/src/udpsink.rs b/generic/threadshare/src/udpsink.rs index 04a39146a..1f2b7151e 100644 --- a/generic/threadshare/src/udpsink.rs +++ b/generic/threadshare/src/udpsink.rs @@ -1294,7 +1294,7 @@ impl ObjectSubclass for UdpSink { Self { sink_pad: PadSink::new( - gst::Pad::new_from_template(&klass.get_pad_template("sink").unwrap(), Some("sink")), + gst::Pad::from_template(&klass.get_pad_template("sink").unwrap(), Some("sink")), sink_pad_handler.clone(), ), sink_pad_handler, diff --git a/generic/threadshare/src/udpsrc.rs b/generic/threadshare/src/udpsrc.rs index fa49a40c6..62f832a6c 100644 --- a/generic/threadshare/src/udpsrc.rs +++ b/generic/threadshare/src/udpsrc.rs @@ -823,7 +823,7 @@ impl ObjectSubclass for UdpSrc { Self { src_pad: PadSrc::new( - gst::Pad::new_from_template(&klass.get_pad_template("src").unwrap(), Some("src")), + gst::Pad::from_template(&klass.get_pad_template("src").unwrap(), Some("src")), src_pad_handler.clone(), ), src_pad_handler, diff --git a/generic/threadshare/tests/inputselector.rs b/generic/threadshare/tests/inputselector.rs index 9401abda4..cc7489f37 100644 --- a/generic/threadshare/tests/inputselector.rs +++ b/generic/threadshare/tests/inputselector.rs @@ -34,8 +34,8 @@ fn test_active_pad() { let is = gst::ElementFactory::make("ts-input-selector", None).unwrap(); - let mut h1 = gst_check::Harness::new_with_element(&is, Some("sink_%u"), Some("src")); - let mut h2 = gst_check::Harness::new_with_element(&is, Some("sink_%u"), None); + let mut h1 = gst_check::Harness::with_element(&is, Some("sink_%u"), Some("src")); + let mut h2 = gst_check::Harness::with_element(&is, Some("sink_%u"), None); let active_pad = is .get_property("active-pad") diff --git a/generic/threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs index 0cea01265..182db3184 100644 --- a/generic/threadshare/tests/pad.rs +++ b/generic/threadshare/tests/pad.rs @@ -325,7 +325,7 @@ impl ObjectSubclass for ElementSrcTest { fn new_with_class(klass: &glib::subclass::simple::ClassStruct) -> Self { ElementSrcTest { src_pad: PadSrc::new( - gst::Pad::new_from_template(&klass.get_pad_template("src").unwrap(), Some("src")), + gst::Pad::from_template(&klass.get_pad_template("src").unwrap(), Some("src")), PadSrcTestHandler, ), task: Task::default(), @@ -639,7 +639,7 @@ impl ObjectSubclass for ElementSinkTest { fn new_with_class(klass: &glib::subclass::simple::ClassStruct) -> Self { ElementSinkTest { sink_pad: PadSink::new( - gst::Pad::new_from_template(&klass.get_pad_template("sink").unwrap(), Some("sink")), + gst::Pad::from_template(&klass.get_pad_template("sink").unwrap(), Some("sink")), PadSinkTestHandler, ), flushing: AtomicBool::new(true), -- cgit v1.2.3