diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2022-10-23 23:03:22 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2022-10-23 23:08:46 +0300 |
commit | 9a68f6e221576f94e153f5f20e499b22745621ec (patch) | |
tree | 776a587d54578bc7dff1fe432bf3008308bffb79 /net/aws | |
parent | 86776be58c5d7e8607653edcd719ac1f0ba8d992 (diff) |
Move from `imp.instance()` to `imp.obj()`
It's doing the same thing and is shorter.
Diffstat (limited to 'net/aws')
-rw-r--r-- | net/aws/src/aws_transcribe_parse/imp.rs | 8 | ||||
-rw-r--r-- | net/aws/src/aws_transcriber/imp.rs | 14 | ||||
-rw-r--r-- | net/aws/src/s3hlssink/imp.rs | 6 | ||||
-rw-r--r-- | net/aws/src/s3src/imp.rs | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/net/aws/src/aws_transcribe_parse/imp.rs b/net/aws/src/aws_transcribe_parse/imp.rs index 3da0d670..c686bbf8 100644 --- a/net/aws/src/aws_transcribe_parse/imp.rs +++ b/net/aws/src/aws_transcribe_parse/imp.rs @@ -223,10 +223,10 @@ impl TranscribeParse { EventView::FlushStop(..) => { let mut state = self.state.lock().unwrap(); *state = State::default(); - gst::Pad::event_default(pad, Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.obj()), event) } EventView::Eos(..) => match self.drain() { - Ok(()) => gst::Pad::event_default(pad, Some(&*self.instance()), event), + Ok(()) => gst::Pad::event_default(pad, Some(&*self.obj()), event), Err(err) => { gst::error!(CAT, imp: self, "failed to drain on EOS: {}", err); element_imp_error!( @@ -239,7 +239,7 @@ impl TranscribeParse { } }, EventView::Segment(..) | EventView::Caps(..) => true, - _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.obj()), event), } } } @@ -284,7 +284,7 @@ impl ObjectImpl for TranscribeParse { 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/net/aws/src/aws_transcriber/imp.rs b/net/aws/src/aws_transcriber/imp.rs index 44980d8b..0e5f2faf 100644 --- a/net/aws/src/aws_transcriber/imp.rs +++ b/net/aws/src/aws_transcriber/imp.rs @@ -223,7 +223,7 @@ impl Transcriber { /* First, check our pending buffers */ let mut items = vec![]; - let now = match self.instance().current_running_time() { + let now = match self.obj().current_running_time() { Some(now) => now, None => { return true; @@ -645,7 +645,7 @@ impl Transcriber { false } } - _ => gst::Pad::query_default(pad, Some(&*self.instance()), query), + _ => gst::Pad::query_default(pad, Some(&*self.obj()), query), } } @@ -664,7 +664,7 @@ impl Transcriber { }, EventView::FlushStart(_) => { gst::info!(CAT, imp: self, "Received flush start, disconnecting"); - let mut ret = gst::Pad::event_default(pad, Some(&*self.instance()), event); + let mut ret = gst::Pad::event_default(pad, Some(&*self.obj()), event); match self.srcpad.stop_task() { Err(err) => { @@ -684,7 +684,7 @@ impl Transcriber { EventView::FlushStop(_) => { gst::info!(CAT, imp: self, "Received flush stop, restarting task"); - if gst::Pad::event_default(pad, Some(&*self.instance()), event) { + if gst::Pad::event_default(pad, Some(&*self.obj()), event) { match self.start_task() { Err(err) => { gst::error!(CAT, imp: self, "Failed to start srcpad task: {}", err); @@ -722,7 +722,7 @@ impl Transcriber { true } EventView::StreamStart(_) => true, - _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.obj()), event), } } @@ -737,7 +737,7 @@ impl Transcriber { if let Some(buffer) = &buffer { let running_time = state.in_segment.to_running_time(buffer.pts()); - let now = self.instance().current_running_time(); + let now = self.obj().current_running_time(); delay = running_time.opt_checked_sub(now).ok().flatten(); } @@ -1202,7 +1202,7 @@ impl ObjectImpl for Transcriber { 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(); obj.set_element_flags(gst::ElementFlags::PROVIDE_CLOCK | gst::ElementFlags::REQUIRE_CLOCK); diff --git a/net/aws/src/s3hlssink/imp.rs b/net/aws/src/s3hlssink/imp.rs index f724145f..0cc7aa1c 100644 --- a/net/aws/src/s3hlssink/imp.rs +++ b/net/aws/src/s3hlssink/imp.rs @@ -576,7 +576,7 @@ impl ObjectImpl for S3HlsSink { fn constructed(&self) { self.parent_constructed(); - self.instance().add(&self.hlssink).unwrap(); + self.obj().add(&self.hlssink).unwrap(); let mut settings = self.settings.lock().unwrap(); @@ -830,7 +830,7 @@ impl ElementImpl for S3HlsSink { let sink_pad = gst::GhostPad::from_template_with_target(templ, Some("audio"), &audio_pad) .unwrap(); - self.instance().add_pad(&sink_pad).unwrap(); + self.obj().add_pad(&sink_pad).unwrap(); sink_pad.set_active(true).unwrap(); settings.audio_sink = true; @@ -850,7 +850,7 @@ impl ElementImpl for S3HlsSink { let sink_pad = gst::GhostPad::from_template_with_target(templ, Some("video"), &video_pad) .unwrap(); - self.instance().add_pad(&sink_pad).unwrap(); + self.obj().add_pad(&sink_pad).unwrap(); sink_pad.set_active(true).unwrap(); settings.video_sink = true; diff --git a/net/aws/src/s3src/imp.rs b/net/aws/src/s3src/imp.rs index 93308ccd..8a6c677a 100644 --- a/net/aws/src/s3src/imp.rs +++ b/net/aws/src/s3src/imp.rs @@ -412,7 +412,7 @@ impl ObjectImpl for S3Src { fn constructed(&self) { self.parent_constructed(); - let obj = self.instance(); + let obj = self.obj(); obj.set_format(gst::Format::Bytes); /* Set a larger default blocksize to make read more efficient */ obj.set_blocksize(256 * 1024); |