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

It's doing the same thing and is shorter.

8 files changed, 27 insertions, 29 deletions

diff --git a/audio/audiofx/src/audioloudnorm/imp.rs b/audio/audiofx/src/audioloudnorm/imp.rs
index b439db207..233982a23 100644
--- a/audio/audiofx/src/audioloudnorm/imp.rs
+++ b/audio/audiofx/src/audioloudnorm/imp.rs
@@ -1655,7 +1655,7 @@ impl AudioLoudNorm {
             _ => (),
         }
 
-        gst::Pad::event_default(pad, Some(&*self.instance()), event)
+        gst::Pad::event_default(pad, Some(&*self.obj()), event)
     }
 
     #[allow(clippy::single_match)]
@@ -1678,7 +1678,7 @@ impl AudioLoudNorm {
                     false
                 }
             }
-            _ => gst::Pad::query_default(pad, Some(&*self.instance()), query),
+            _ => gst::Pad::query_default(pad, Some(&*self.obj()), query),
         }
     }
 }
@@ -1767,7 +1767,7 @@ impl ObjectImpl for AudioLoudNorm {
     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/audio/audiofx/src/audiornnoise/imp.rs b/audio/audiofx/src/audiornnoise/imp.rs
index b6641e35b..b238963f5 100644
--- a/audio/audiofx/src/audiornnoise/imp.rs
+++ b/audio/audiofx/src/audiornnoise/imp.rs
@@ -154,7 +154,7 @@ impl AudioRNNoise {
             state.process(in_data, out_data);
         }
 
-        self.instance().src_pad().push(buffer)
+        self.obj().src_pad().push(buffer)
     }
 
     fn generate_output(&self, state: &mut State) -> Result<GenerateOutputSuccess, gst::FlowError> {
@@ -329,7 +329,7 @@ impl BaseTransformImpl for AudioRNNoise {
         if direction == gst::PadDirection::Src {
             if let gst::QueryViewMut::Latency(q) = query.view_mut() {
                 let mut upstream_query = gst::query::Latency::new();
-                if self.instance().sink_pad().peer_query(&mut upstream_query) {
+                if self.obj().sink_pad().peer_query(&mut upstream_query) {
                     let (live, mut min, mut max) = upstream_query.result();
                     gst::debug!(
                         CAT,
diff --git a/audio/audiofx/src/ebur128level/imp.rs b/audio/audiofx/src/ebur128level/imp.rs
index c8b1f115e..2d9a98e10 100644
--- a/audio/audiofx/src/ebur128level/imp.rs
+++ b/audio/audiofx/src/ebur128level/imp.rs
@@ -412,7 +412,7 @@ impl BaseTransformImpl for EbuR128Level {
         })?;
 
         let mut timestamp = buf.pts();
-        let segment = self.instance().segment().downcast::<gst::ClockTime>().ok();
+        let segment = self.obj().segment().downcast::<gst::ClockTime>().ok();
 
         let buf = gst_audio::AudioBufferRef::from_buffer_ref_readable(buf, &state.info).map_err(
             |_| {
@@ -563,14 +563,12 @@ impl BaseTransformImpl for EbuR128Level {
 
                     gst::debug!(CAT, imp: self, "Posting message {}", s);
 
-                    let msg = gst::message::Element::builder(s)
-                        .src(&*self.instance())
-                        .build();
+                    let msg = gst::message::Element::builder(s).src(&*self.obj()).build();
 
                     // Release lock while posting the message to avoid deadlocks
                     drop(state_guard);
 
-                    let _ = self.instance().post_message(msg);
+                    let _ = self.obj().post_message(msg);
 
                     state_guard = self.state.borrow_mut();
                     state = state_guard.as_mut().ok_or_else(|| {
diff --git a/audio/audiofx/src/hrtfrender/imp.rs b/audio/audiofx/src/hrtfrender/imp.rs
index 386965883..feccf888f 100644
--- a/audio/audiofx/src/hrtfrender/imp.rs
+++ b/audio/audiofx/src/hrtfrender/imp.rs
@@ -394,7 +394,7 @@ impl HrtfRender {
         state.reset_processors();
 
         drop(state_guard);
-        self.instance().src_pad().push(outbuf)
+        self.obj().src_pad().push(outbuf)
     }
 }
 
diff --git a/audio/claxon/src/claxondec/imp.rs b/audio/claxon/src/claxondec/imp.rs
index e48f0d99e..0e7521bd2 100644
--- a/audio/claxon/src/claxondec/imp.rs
+++ b/audio/claxon/src/claxondec/imp.rs
@@ -136,7 +136,7 @@ impl AudioDecoderImpl for ClaxonDec {
                     } else if let Ok(tstreaminfo) = claxon_streaminfo(&inmap[13..]) {
                         if let Ok(taudio_info) = gstaudioinfo(&tstreaminfo) {
                             // To speed up negotiation
-                            let element = self.instance();
+                            let element = self.obj();
                             if element.set_output_format(&taudio_info).is_err()
                                 || element.negotiate().is_err()
                             {
@@ -198,7 +198,7 @@ impl AudioDecoderImpl for ClaxonDec {
             );
         }
 
-        self.instance().finish_frame(None, 1)
+        self.obj().finish_frame(None, 1)
     }
 }
 
@@ -225,7 +225,7 @@ impl ClaxonDec {
             audio_info
         );
 
-        let element = self.instance();
+        let element = self.obj();
         element.set_output_format(&audio_info)?;
         element.negotiate()?;
 
@@ -260,10 +260,10 @@ impl ClaxonDec {
         let mut reader = claxon::frame::FrameReader::new(&mut cursor);
         let result = match reader.read_next_or_eof(buffer) {
             Ok(Some(result)) => result,
-            Ok(None) => return self.instance().finish_frame(None, 1),
+            Ok(None) => return self.obj().finish_frame(None, 1),
             Err(err) => {
                 return gst_audio::audio_decoder_error!(
-                    self.instance(),
+                    self.obj(),
                     1,
                     gst::StreamError::Decode,
                     ["Failed to decode packet: {:?}", err]
@@ -288,7 +288,7 @@ impl ClaxonDec {
 
         let depth_adjusted = depth.adjust_samples(v);
         let outbuf = gst::Buffer::from_mut_slice(depth_adjusted);
-        self.instance().finish_frame(Some(outbuf), 1)
+        self.obj().finish_frame(Some(outbuf), 1)
     }
 }
 
diff --git a/audio/csound/src/filter/imp.rs b/audio/csound/src/filter/imp.rs
index 060278828..83c276be7 100644
--- a/audio/csound/src/filter/imp.rs
+++ b/audio/csound/src/filter/imp.rs
@@ -230,7 +230,7 @@ impl CsoundFilter {
         drop(state_lock);
         drop(csound);
 
-        self.instance().src_pad().push(buffer)
+        self.obj().src_pad().push(buffer)
     }
 
     fn generate_output(&self, state: &mut State) -> Result<GenerateOutputSuccess, gst::FlowError> {
diff --git a/audio/lewton/src/lewtondec/imp.rs b/audio/lewton/src/lewtondec/imp.rs
index eb6e63f45..18579b681 100644
--- a/audio/lewton/src/lewtondec/imp.rs
+++ b/audio/lewton/src/lewtondec/imp.rs
@@ -186,7 +186,7 @@ impl AudioDecoderImpl for LewtonDec {
 
         // Ignore empty packets unless we have no headers yet
         if inmap.len() == 0 {
-            self.instance().finish_frame(None, 1)?;
+            self.obj().finish_frame(None, 1)?;
 
             if state.headerset.is_some() {
                 return Ok(gst::FlowSuccess::Ok);
@@ -243,7 +243,7 @@ impl LewtonDec {
             }
         }
 
-        self.instance().finish_frame(None, 1)
+        self.obj().finish_frame(None, 1)
     }
 
     fn initialize(&self, state: &mut State) -> Result<(), gst::FlowError> {
@@ -351,8 +351,8 @@ impl LewtonDec {
         state.audio_info = Some(audio_info.clone());
         state.reorder_map = reorder_map;
 
-        self.instance().set_output_format(&audio_info)?;
-        self.instance().negotiate()?;
+        self.obj().set_output_format(&audio_info)?;
+        self.obj().negotiate()?;
 
         Ok(())
     }
@@ -374,7 +374,7 @@ impl LewtonDec {
             Ok(decoded) => decoded,
             Err(err) => {
                 return audio_decoder_error!(
-                    self.instance(),
+                    self.obj(),
                     1,
                     gst::StreamError::Decode,
                     ["Failed to decode packet: {:?}", err]
@@ -384,7 +384,7 @@ impl LewtonDec {
 
         if decoded.channel_count != audio_info.channels() as usize {
             return audio_decoder_error!(
-                self.instance(),
+                self.obj(),
                 1,
                 gst::StreamError::Decode,
                 [
@@ -399,12 +399,12 @@ impl LewtonDec {
         gst::debug!(CAT, imp: self, "Got {} decoded samples", sample_count);
 
         if sample_count == 0 {
-            return self.instance().finish_frame(None, 1);
+            return self.obj().finish_frame(None, 1);
         }
 
         let outbuf = if let Some(ref reorder_map) = state.reorder_map {
             let mut outbuf = self
-                .instance()
+                .obj()
                 .allocate_output_buffer(sample_count as usize * audio_info.bpf() as usize);
             {
                 // And copy the decoded data into our output buffer while reordering the channels to the
@@ -451,7 +451,7 @@ impl LewtonDec {
             gst::Buffer::from_mut_slice(CastVec(decoded.samples))
         };
 
-        self.instance().finish_frame(Some(outbuf), 1)
+        self.obj().finish_frame(Some(outbuf), 1)
     }
 }
 
diff --git a/audio/spotify/src/spotifyaudiosrc/imp.rs b/audio/spotify/src/spotifyaudiosrc/imp.rs
index 9c102cec6..c168fc3db 100644
--- a/audio/spotify/src/spotifyaudiosrc/imp.rs
+++ b/audio/spotify/src/spotifyaudiosrc/imp.rs
@@ -442,7 +442,7 @@ impl URIHandlerImpl for SpotifyAudioSrc {
         for (key, value) in url.query_pairs() {
             match key.as_ref() {
                 "username" | "password" | "cache-credentials" | "cache-files" => {
-                    self.instance().set_property(&key, value.as_ref());
+                    self.obj().set_property(&key, value.as_ref());
                 }
                 _ => {
                     gst::warning!(CAT, imp: self, "unsupported query: {}={}", key, value);
@@ -450,7 +450,7 @@ impl URIHandlerImpl for SpotifyAudioSrc {
             }
         }
 
-        self.instance()
+        self.obj()
             .set_property("track", format!("{}:{}", url.scheme(), url.path()));
 
         Ok(())