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

It's doing the same thing and is shorter.

5 files changed, 25 insertions, 29 deletions

diff --git a/text/ahead/src/textahead/imp.rs b/text/ahead/src/textahead/imp.rs
index de158094b..cec374239 100644
--- a/text/ahead/src/textahead/imp.rs
+++ b/text/ahead/src/textahead/imp.rs
@@ -183,7 +183,7 @@ impl ObjectImpl for TextAhead {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sink_pad).unwrap();
         obj.add_pad(&self.src_pad).unwrap();
     }
@@ -304,11 +304,11 @@ impl TextAhead {
                 while !state.pending.is_empty() {
                     let _ = self.push_pending(&mut state);
                 }
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             gst::EventView::Caps(_caps) => {
                 // set caps on src pad
-                let element = self.instance();
+                let element = self.obj();
                 let templ = element.class().pad_template("src").unwrap();
                 let _ = self.src_pad.push_event(gst::event::Caps::new(templ.caps()));
                 true
@@ -326,9 +326,9 @@ impl TextAhead {
                     }
                 }
 
-                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),
         }
     }
 
diff --git a/text/json/src/jsongstenc/imp.rs b/text/json/src/jsongstenc/imp.rs
index fd3676785..84b81e6c5 100644
--- a/text/json/src/jsongstenc/imp.rs
+++ b/text/json/src/jsongstenc/imp.rs
@@ -169,8 +169,8 @@ impl JsonGstEnc {
                 let caps = gst::Caps::builder("application/x-json").build();
                 self.srcpad.push_event(gst::event::Caps::new(&caps))
             }
-            EventView::Eos(_) => gst::Pad::event_default(pad, Some(&*self.instance()), event),
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            EventView::Eos(_) => gst::Pad::event_default(pad, Some(&*self.obj()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 }
@@ -215,7 +215,7 @@ impl ObjectImpl for JsonGstEnc {
     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/text/json/src/jsongstparse/imp.rs b/text/json/src/jsongstparse/imp.rs
index 1e6c48b36..8d9393980 100644
--- a/text/json/src/jsongstparse/imp.rs
+++ b/text/json/src/jsongstparse/imp.rs
@@ -39,9 +39,7 @@ impl PullState {
     fn new(imp: &JsonGstParse, pad: &gst::Pad) -> Self {
         Self {
             need_stream_start: true,
-            stream_id: pad
-                .create_stream_id(&*imp.instance(), Some("src"))
-                .to_string(),
+            stream_id: pad.create_stream_id(&*imp.obj(), Some("src")).to_string(),
             offset: 0,
             duration: None,
         }
@@ -633,14 +631,14 @@ impl JsonGstParse {
                 self.flush(&mut state);
                 drop(state);
 
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             EventView::Eos(_) => {
                 gst::log!(CAT, obj: pad, "Draining");
                 if let Err(err) = self.handle_buffer(None) {
                     gst::error!(CAT, obj: pad, "Failed to drain parser: {:?}", err);
                 }
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             _ => {
                 if event.is_sticky()
@@ -652,7 +650,7 @@ impl JsonGstParse {
                     state.pending_events.push(event);
                     true
                 } else {
-                    gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                    gst::Pad::event_default(pad, Some(&*self.obj()), event)
                 }
             }
         }
@@ -757,7 +755,7 @@ impl JsonGstParse {
         gst::log!(CAT, obj: pad, "Handling event {:?}", event);
         match event.view() {
             EventView::Seek(e) => self.perform_seek(e),
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -811,7 +809,7 @@ impl JsonGstParse {
                     self.sinkpad.peer_query(query)
                 }
             }
-            _ => gst::Pad::query_default(pad, Some(&*self.instance()), query),
+            _ => gst::Pad::query_default(pad, Some(&*self.obj()), query),
         }
     }
 }
@@ -890,7 +888,7 @@ impl ObjectImpl for JsonGstParse {
     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/text/regex/src/gstregex/imp.rs b/text/regex/src/gstregex/imp.rs
index 73a3c9692..06f9ed4a7 100644
--- a/text/regex/src/gstregex/imp.rs
+++ b/text/regex/src/gstregex/imp.rs
@@ -159,7 +159,7 @@ impl ObjectImpl for RegEx {
     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/text/wrap/src/gsttextwrap/imp.rs b/text/wrap/src/gsttextwrap/imp.rs
index cf779937a..1820a92c9 100644
--- a/text/wrap/src/gsttextwrap/imp.rs
+++ b/text/wrap/src/gsttextwrap/imp.rs
@@ -324,7 +324,7 @@ impl TextWrap {
                 if state.start_ts.is_some() {
                     true
                 } else {
-                    gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                    gst::Pad::event_default(pad, Some(&*self.obj()), event)
                 }
             }
             EventView::FlushStart(_) => {
@@ -333,7 +333,7 @@ impl TextWrap {
                 *state = State::default();
                 state.options = options;
                 drop(state);
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             EventView::Eos(_) => {
                 let mut state = self.state.lock().unwrap();
@@ -357,9 +357,9 @@ impl TextWrap {
                 } else {
                     drop(state);
                 }
-                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),
         }
     }
 
@@ -388,7 +388,7 @@ impl TextWrap {
                 }
                 ret
             }
-            _ => gst::Pad::query_default(pad, Some(&*self.instance()), query),
+            _ => gst::Pad::query_default(pad, Some(&*self.obj()), query),
         }
     }
 }
@@ -483,7 +483,7 @@ impl ObjectImpl for TextWrap {
     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();
     }
@@ -518,11 +518,9 @@ impl ObjectImpl for TextWrap {
                         settings.accumulate_time.display(),
                     );
                     drop(settings);
-                    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());
                 }
             }
             _ => unimplemented!(),