Move from `imp.instance()` to `imp.obj()`

It's doing the same thing and is shorter.

15 files changed, 56 insertions, 69 deletions

diff --git a/generic/file/src/filesrc/imp.rs b/generic/file/src/filesrc/imp.rs
index 471e0e8e4..1faa24b69 100644
--- a/generic/file/src/filesrc/imp.rs
+++ b/generic/file/src/filesrc/imp.rs
@@ -174,7 +174,7 @@ impl ObjectImpl for FileSrc {
     fn constructed(&self) {
         self.parent_constructed();
 
-        self.instance().set_format(gst::Format::Bytes);
+        self.obj().set_format(gst::Format::Bytes);
     }
 }
 
diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs
index 14eb003ff..1e0fd5f7a 100644
--- a/generic/sodium/src/decrypter/imp.rs
+++ b/generic/sodium/src/decrypter/imp.rs
@@ -300,7 +300,7 @@ impl Decrypter {
             }
             QueryViewMut::Duration(q) => {
                 if q.format() != gst::Format::Bytes {
-                    return gst::Pad::query_default(pad, Some(&*self.instance()), query);
+                    return gst::Pad::query_default(pad, Some(&*self.obj()), query);
                 }
 
                 /* First let's query the bytes duration upstream */
@@ -341,7 +341,7 @@ impl Decrypter {
 
                 true
             }
-            _ => gst::Pad::query_default(pad, Some(&*self.instance()), query),
+            _ => gst::Pad::query_default(pad, Some(&*self.obj()), query),
         }
     }
 
@@ -594,7 +594,7 @@ impl ObjectImpl for Decrypter {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/generic/sodium/src/encrypter/imp.rs b/generic/sodium/src/encrypter/imp.rs
index a6a96dd4c..ac1ea1013 100644
--- a/generic/sodium/src/encrypter/imp.rs
+++ b/generic/sodium/src/encrypter/imp.rs
@@ -243,9 +243,9 @@ impl Encrypter {
                     }
                 }
 
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -256,7 +256,7 @@ impl Encrypter {
 
         match event.view() {
             EventView::Seek(_) => false,
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -278,7 +278,7 @@ impl Encrypter {
             }
             QueryViewMut::Duration(q) => {
                 if q.format() != gst::Format::Bytes {
-                    return gst::Pad::query_default(pad, Some(&*self.instance()), query);
+                    return gst::Pad::query_default(pad, Some(&*self.obj()), query);
                 }
 
                 /* First let's query the bytes duration upstream */
@@ -318,7 +318,7 @@ impl Encrypter {
 
                 true
             }
-            _ => gst::Pad::query_default(pad, Some(&*self.instance()), query),
+            _ => gst::Pad::query_default(pad, Some(&*self.obj()), query),
         }
     }
 }
@@ -406,7 +406,7 @@ impl ObjectImpl for Encrypter {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/generic/threadshare/examples/standalone/sink/imp.rs b/generic/threadshare/examples/standalone/sink/imp.rs
index 0b51ac641..88cd2aef3 100644
--- a/generic/threadshare/examples/standalone/sink/imp.rs
+++ b/generic/threadshare/examples/standalone/sink/imp.rs
@@ -610,7 +610,7 @@ impl TestSink {
 
         // Enable backpressure for items
         let (item_sender, item_receiver) = flume::bounded(0);
-        let task_impl = TestSinkTask::new(&*self.instance(), item_receiver);
+        let task_impl = TestSinkTask::new(&*self.obj(), item_receiver);
         self.task.prepare(task_impl, context).block_on()?;
 
         *self.item_sender.lock().unwrap() = Some(item_sender);
@@ -794,7 +794,7 @@ impl ObjectImpl for TestSink {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(self.sink_pad.gst_pad()).unwrap();
         obj.set_element_flags(gst::ElementFlags::SINK);
     }
diff --git a/generic/threadshare/examples/standalone/src/imp.rs b/generic/threadshare/examples/standalone/src/imp.rs
index 3d575f32d..521d63c10 100644
--- a/generic/threadshare/examples/standalone/src/imp.rs
+++ b/generic/threadshare/examples/standalone/src/imp.rs
@@ -337,7 +337,7 @@ impl TestSrc {
         drop(settings);
 
         self.task
-            .prepare(SrcTask::new(self.instance().clone()), context)
+            .prepare(SrcTask::new(self.obj().clone()), context)
             .block_on()?;
 
         if raise_log_level {
@@ -528,7 +528,7 @@ impl ObjectImpl for TestSrc {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(self.src_pad.gst_pad()).unwrap();
         obj.set_element_flags(gst::ElementFlags::SOURCE);
     }
diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs
index f525c9a07..fb32ddf75 100644
--- a/generic/threadshare/src/appsrc/imp.rs
+++ b/generic/threadshare/src/appsrc/imp.rs
@@ -315,7 +315,7 @@ impl AppSrc {
 
         let do_timestamp = self.settings.lock().unwrap().do_timestamp;
         if do_timestamp {
-            let elem = self.instance();
+            let elem = self.obj();
             if let Some(clock) = elem.clock() {
                 let base_time = elem.base_time();
                 let now = clock.time();
@@ -384,7 +384,7 @@ impl AppSrc {
         *self.sender.lock().unwrap() = Some(sender);
 
         self.task
-            .prepare(AppSrcTask::new(self.instance().clone(), receiver), context)
+            .prepare(AppSrcTask::new(self.obj().clone(), receiver), context)
             .block_on()?;
 
         gst::debug!(CAT, imp: self, "Prepared");
@@ -556,7 +556,7 @@ impl ObjectImpl for AppSrc {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(self.src_pad.gst_pad()).unwrap();
         obj.set_element_flags(gst::ElementFlags::SOURCE);
     }
diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs
index 2f2523319..e16c52cc8 100644
--- a/generic/threadshare/src/inputselector/imp.rs
+++ b/generic/threadshare/src/inputselector/imp.rs
@@ -470,7 +470,7 @@ impl ObjectImpl for InputSelector {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(self.src_pad.gst_pad()).unwrap();
         obj.set_element_flags(gst::ElementFlags::PROVIDE_CLOCK | gst::ElementFlags::REQUIRE_CLOCK);
     }
@@ -554,7 +554,7 @@ impl ElementImpl for InputSelector {
             gst::Pad::from_template(templ, Some(format!("sink_{}", pads.pad_serial).as_str()));
         pads.pad_serial += 1;
         sink_pad.set_active(true).unwrap();
-        self.instance().add_pad(&sink_pad).unwrap();
+        self.obj().add_pad(&sink_pad).unwrap();
         let sink_pad = PadSink::new(sink_pad, InputSelectorPadSinkHandler::default());
         let ret = sink_pad.gst_pad().clone();
 
@@ -567,11 +567,9 @@ impl ElementImpl for InputSelector {
         drop(pads);
         drop(state);
 
-        let _ = self.instance().post_message(
-            gst::message::Latency::builder()
-                .src(&*self.instance())
-                .build(),
-        );
+        let _ = self
+            .obj()
+            .post_message(gst::message::Latency::builder().src(&*self.obj()).build());
 
         Some(ret)
     }
@@ -580,14 +578,12 @@ impl ElementImpl for InputSelector {
         let mut pads = self.pads.lock().unwrap();
         let sink_pad = pads.sink_pads.remove(pad).unwrap();
         drop(sink_pad);
-        self.instance().remove_pad(pad).unwrap();
+        self.obj().remove_pad(pad).unwrap();
         drop(pads);
 
-        let _ = self.instance().post_message(
-            gst::message::Latency::builder()
-                .src(&*self.instance())
-                .build(),
-        );
+        let _ = self
+            .obj()
+            .post_message(gst::message::Latency::builder().src(&*self.obj()).build());
     }
 
     fn provide_clock(&self) -> Option<gst::Clock> {
diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs
index 5614aae92..44fd54de8 100644
--- a/generic/threadshare/src/jitterbuffer/imp.rs
+++ b/generic/threadshare/src/jitterbuffer/imp.rs
@@ -341,7 +341,7 @@ impl SinkHandler {
             pt
         );
 
-        let element = jb.instance();
+        let element = jb.obj();
 
         if dts.is_none() {
             dts = pts;
@@ -523,7 +523,7 @@ impl SinkHandler {
         // Reschedule if needed
         let (_, next_wakeup) =
             jb.src_pad_handler
-                .next_wakeup(&jb.instance(), &state, latency, context_wait);
+                .next_wakeup(&jb.obj(), &state, latency, context_wait);
         if let Some((next_wakeup, _)) = next_wakeup {
             if let Some((previous_next_wakeup, ref abort_handle)) = state.wait_handle {
                 if previous_next_wakeup.is_none()
@@ -1262,11 +1262,7 @@ impl JitterBuffer {
 
         self.task
             .prepare(
-                JitterBufferTask::new(
-                    &*self.instance(),
-                    &self.src_pad_handler,
-                    &self.sink_pad_handler,
-                ),
+                JitterBufferTask::new(&*self.obj(), &self.src_pad_handler, &self.sink_pad_handler),
                 context,
             )
             .block_on()?;
@@ -1407,11 +1403,9 @@ impl ObjectImpl for JitterBuffer {
                 let state = self.state.lock().unwrap();
                 state.jbuf.set_delay(latency);
 
-                let _ = self.instance().post_message(
-                    gst::message::Latency::builder()
-                        .src(&*self.instance())
-                        .build(),
-                );
+                let _ = self
+                    .obj()
+                    .post_message(gst::message::Latency::builder().src(&*self.obj()).build());
             }
             "do-lost" => {
                 let mut settings = self.settings.lock().unwrap();
@@ -1484,7 +1478,7 @@ impl ObjectImpl for JitterBuffer {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(self.sink_pad.gst_pad()).unwrap();
         obj.add_pad(self.src_pad.gst_pad()).unwrap();
         obj.set_element_flags(gst::ElementFlags::PROVIDE_CLOCK | gst::ElementFlags::REQUIRE_CLOCK);
diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs
index 404824173..177d9350b 100644
--- a/generic/threadshare/src/proxy/imp.rs
+++ b/generic/threadshare/src/proxy/imp.rs
@@ -588,7 +588,7 @@ impl ObjectImpl for ProxySink {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(self.sink_pad.gst_pad()).unwrap();
         obj.set_element_flags(gst::ElementFlags::SINK);
     }
@@ -957,7 +957,7 @@ impl ProxySrc {
         })?;
 
         let dataqueue = DataQueue::new(
-            &self.instance().clone().upcast(),
+            &self.obj().clone().upcast(),
             self.src_pad.gst_pad(),
             if settings.max_size_buffers == 0 {
                 None
@@ -989,10 +989,7 @@ impl ProxySrc {
         *self.dataqueue.lock().unwrap() = Some(dataqueue.clone());
 
         self.task
-            .prepare(
-                ProxySrcTask::new(self.instance().clone(), dataqueue),
-                ts_ctx,
-            )
+            .prepare(ProxySrcTask::new(self.obj().clone(), dataqueue), ts_ctx)
             .block_on()?;
 
         gst::debug!(SRC_CAT, imp: self, "Prepared");
@@ -1150,7 +1147,7 @@ impl ObjectImpl for ProxySrc {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(self.src_pad.gst_pad()).unwrap();
         obj.set_element_flags(gst::ElementFlags::SOURCE);
     }
diff --git a/generic/threadshare/src/queue/imp.rs b/generic/threadshare/src/queue/imp.rs
index 3de4930f2..826ca3241 100644
--- a/generic/threadshare/src/queue/imp.rs
+++ b/generic/threadshare/src/queue/imp.rs
@@ -559,7 +559,7 @@ impl Queue {
         let settings = self.settings.lock().unwrap().clone();
 
         let dataqueue = DataQueue::new(
-            &self.instance().clone().upcast(),
+            &self.obj().clone().upcast(),
             self.src_pad.gst_pad(),
             if settings.max_size_buffers == 0 {
                 None
@@ -589,7 +589,7 @@ impl Queue {
             })?;
 
         self.task
-            .prepare(QueueTask::new(self.instance().clone(), dataqueue), context)
+            .prepare(QueueTask::new(self.obj().clone(), dataqueue), context)
             .block_on()?;
 
         gst::debug!(CAT, imp: self, "Prepared");
@@ -729,7 +729,7 @@ impl ObjectImpl for Queue {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(self.sink_pad.gst_pad()).unwrap();
         obj.add_pad(self.src_pad.gst_pad()).unwrap();
     }
diff --git a/generic/threadshare/src/runtime/pad.rs b/generic/threadshare/src/runtime/pad.rs
index 9889ad5e8..d53187225 100644
--- a/generic/threadshare/src/runtime/pad.rs
+++ b/generic/threadshare/src/runtime/pad.rs
@@ -163,7 +163,7 @@ pub trait PadSrcHandler: Clone + Send + Sync + 'static {
     fn src_event(&self, pad: &PadSrcRef, imp: &Self::ElementImpl, event: gst::Event) -> bool {
         gst::log!(RUNTIME_CAT, obj: pad.gst_pad(), "Handling {:?}", event);
 
-        let elem = imp.instance();
+        let elem = imp.obj();
         // FIXME with GAT on `Self::ElementImpl`, we should be able to
         // use `.upcast::<gst::Element>()`
         //
@@ -199,7 +199,7 @@ pub trait PadSrcHandler: Clone + Send + Sync + 'static {
         } else {
             gst::log!(RUNTIME_CAT, obj: pad.gst_pad(), "Handling {:?}", query);
 
-            let elem = imp.instance();
+            let elem = imp.obj();
             // FIXME with GAT on `Self::ElementImpl`, we should be able to
             // use `.upcast::<gst::Element>()`
             //
@@ -571,7 +571,7 @@ pub trait PadSinkHandler: Clone + Send + Sync + 'static {
         assert!(!event.is_serialized());
         gst::log!(RUNTIME_CAT, obj: pad.gst_pad(), "Handling {:?}", event);
 
-        let elem = imp.instance();
+        let elem = imp.obj();
         // FIXME with GAT on `Self::ElementImpl`, we should be able to
         // use `.upcast::<gst::Element>()`
         //
@@ -646,7 +646,7 @@ pub trait PadSinkHandler: Clone + Send + Sync + 'static {
         } else {
             gst::log!(RUNTIME_CAT, obj: pad.gst_pad(), "Handling {:?}", query);
 
-            let elem = imp.instance();
+            let elem = imp.obj();
             // FIXME with GAT on `Self::ElementImpl`, we should be able to
             // use `.upcast::<gst::Element>()`
             //
@@ -845,7 +845,7 @@ impl PadSink {
                         || Err(FlowError::Error),
                         move |imp| {
                             let this_weak = PadSinkWeak(Arc::downgrade(&inner_arc));
-                            let elem = imp.instance().clone();
+                            let elem = imp.obj().clone();
 
                             if let Some((ctx, task_id)) = Context::current_task() {
                                 let delayed_fut = async move {
@@ -874,7 +874,7 @@ impl PadSink {
                         || Err(FlowError::Error),
                         move |imp| {
                             let this_weak = PadSinkWeak(Arc::downgrade(&inner_arc));
-                            let elem = imp.instance().clone();
+                            let elem = imp.obj().clone();
 
                             if let Some((ctx, task_id)) = Context::current_task() {
                                 let delayed_fut = async move {
@@ -907,7 +907,7 @@ impl PadSink {
                         move |imp| {
                             if event.is_serialized() {
                                 let this_weak = PadSinkWeak(Arc::downgrade(&inner_arc));
-                                let elem = imp.instance().clone();
+                                let elem = imp.obj().clone();
 
                                 if let Some((ctx, task_id)) = Context::current_task() {
                                     let delayed_fut = async move {
diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs
index 8b4d57be2..ebc2f86b1 100644
--- a/generic/threadshare/src/tcpclientsrc/imp.rs
+++ b/generic/threadshare/src/tcpclientsrc/imp.rs
@@ -437,7 +437,7 @@ impl TcpClientSrc {
         let _ = self
             .task
             .prepare(
-                TcpClientSrcTask::new(self.instance().clone(), saddr, buffer_pool),
+                TcpClientSrcTask::new(self.obj().clone(), saddr, buffer_pool),
                 context,
             )
             .check()?;
@@ -582,7 +582,7 @@ impl ObjectImpl for TcpClientSrc {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(self.src_pad.gst_pad()).unwrap();
         obj.set_element_flags(gst::ElementFlags::SOURCE);
     }
diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs
index a3e1bb96f..bb1825d03 100644
--- a/generic/threadshare/src/udpsink/imp.rs
+++ b/generic/threadshare/src/udpsink/imp.rs
@@ -840,7 +840,7 @@ impl UdpSink {
         // Enable backpressure for items
         let (item_sender, item_receiver) = flume::bounded(0);
         let (cmd_sender, cmd_receiver) = flume::unbounded();
-        let task_impl = UdpSinkTask::new(&*self.instance(), item_receiver, cmd_receiver);
+        let task_impl = UdpSinkTask::new(&*self.obj(), item_receiver, cmd_receiver);
         self.task.prepare(task_impl, context).block_on()?;
 
         *self.item_sender.lock().unwrap() = Some(item_sender);
@@ -1248,7 +1248,7 @@ impl ObjectImpl for UdpSink {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(self.sink_pad.gst_pad()).unwrap();
         obj.set_element_flags(gst::ElementFlags::SINK);
     }
diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs
index e1a700525..c3079c24c 100644
--- a/generic/threadshare/src/udpsrc/imp.rs
+++ b/generic/threadshare/src/udpsrc/imp.rs
@@ -575,7 +575,7 @@ impl UdpSrc {
 
         *self.configured_caps.lock().unwrap() = None;
         self.task
-            .prepare(UdpSrcTask::new(self.instance().clone()), context)
+            .prepare(UdpSrcTask::new(self.obj().clone()), context)
             .block_on()?;
 
         gst::debug!(CAT, imp: self, "Prepared");
@@ -775,7 +775,7 @@ impl ObjectImpl for UdpSrc {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(self.src_pad.gst_pad()).unwrap();
         obj.set_element_flags(gst::ElementFlags::SOURCE);
     }
diff --git a/generic/threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs
index 72d75109e..dcb41579e 100644
--- a/generic/threadshare/tests/pad.rs
+++ b/generic/threadshare/tests/pad.rs
@@ -237,7 +237,7 @@ mod imp_src {
 
             self.task
                 .prepare(
-                    ElementSrcTestTask::new(self.instance().clone(), receiver),
+                    ElementSrcTestTask::new(self.obj().clone(), receiver),
                     context,
                 )
                 .block_on()?;
@@ -325,7 +325,7 @@ mod imp_src {
         fn constructed(&self) {
             self.parent_constructed();
 
-            let obj = self.instance();
+            let obj = self.obj();
             obj.add_pad(self.src_pad.gst_pad()).unwrap();
             obj.set_element_flags(gst::ElementFlags::SOURCE);
         }
@@ -617,7 +617,7 @@ mod imp_sink {
         fn constructed(&self) {
             self.parent_constructed();
 
-            let obj = self.instance();
+            let obj = self.obj();
             obj.add_pad(self.sink_pad.gst_pad()).unwrap();
             obj.set_element_flags(gst::ElementFlags::SINK);
         }