From 95cdd43f4ff02e12fd6079051294029b4aae653a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= Date: Tue, 20 Apr 2021 17:28:38 +0200 Subject: [PATCH] manual fixes remove get prefix round 2 --- audio/csound/src/filter/imp.rs | 14 +++++++------- generic/sodium/examples/decrypt_example.rs | 2 +- generic/sodium/examples/encrypt_example.rs | 2 +- generic/sodium/examples/generate_keys.rs | 2 +- .../threadshare/src/jitterbuffer/jitterbuffer.rs | 2 +- net/reqwest/src/reqwesthttpsrc/imp.rs | 4 ++-- net/reqwest/tests/reqwesthttpsrc.rs | 4 ++-- net/rusoto/src/s3src/imp.rs | 2 +- .../fallbackswitch/src/base/subclass/aggregator.rs | 6 +++--- utils/togglerecord/tests/tests.rs | 4 ++-- video/cdg/src/cdgdec/imp.rs | 2 +- video/dav1d/src/dav1ddec/imp.rs | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/audio/csound/src/filter/imp.rs b/audio/csound/src/filter/imp.rs index 23269dad..054275f4 100644 --- a/audio/csound/src/filter/imp.rs +++ b/audio/csound/src/filter/imp.rs @@ -128,8 +128,8 @@ impl State { impl CsoundFilter { fn process(&self, csound: &mut Csound, idata: &[f64], odata: &mut [f64]) -> bool { - let spin = csound.spin().unwrap(); - let spout = csound.spout().unwrap(); + let spin = csound.get_spin().unwrap(); + let spout = csound.get_spout().unwrap(); let in_chunks = idata.chunks_exact(spin.len()); let out_chuncks = odata.chunks_exact_mut(spout.len()); @@ -190,8 +190,8 @@ impl CsoundFilter { return Ok(gst::FlowSuccess::Ok); } - let mut spin = csound.spin().unwrap(); - let spout = csound.spout().unwrap(); + let mut spin = csound.get_spin().unwrap(); + let spout = csound.get_spout().unwrap(); let out_bytes = (avail / state.in_info.channels() as usize) * state.out_info.channels() as usize; @@ -547,7 +547,7 @@ impl BaseTransformImpl for CsoundFilter { if compiled { let csound = self.csound.lock().unwrap(); // Use the sample rate and channels configured in the csound score - let sr = csound.sample_rate() as i32; + let sr = csound.get_sample_rate() as i32; let ichannels = csound.input_channels() as i32; let ochannels = csound.output_channels() as i32; for s in new_caps.make_mut().iter_mut() { @@ -608,7 +608,7 @@ impl BaseTransformImpl for CsoundFilter { let rate = in_info.rate(); // Check if the negotiated caps are the right ones - if rate != out_info.rate() || rate != csound.sample_rate() as u32 { + if rate != out_info.rate() || rate != csound.get_sample_rate() as u32 { return Err(loggable_error!( CAT, "Failed to negotiate caps: invalid sample rate {}", @@ -628,7 +628,7 @@ impl BaseTransformImpl for CsoundFilter { )); } - let ksmps = csound.ksmps(); + let ksmps = csound.get_ksmps(); let adapter = gst_base::UniqueAdapter::new(); diff --git a/generic/sodium/examples/decrypt_example.rs b/generic/sodium/examples/decrypt_example.rs index e8a1566d..78817e44 100644 --- a/generic/sodium/examples/decrypt_example.rs +++ b/generic/sodium/examples/decrypt_example.rs @@ -68,7 +68,7 @@ fn main() -> Result<(), Box> { .required(true) .takes_value(true), ) - .matches(); + .get_matches(); gst::init()?; gstsodium::plugin_register_static().expect("Failed to register sodium plugin"); diff --git a/generic/sodium/examples/encrypt_example.rs b/generic/sodium/examples/encrypt_example.rs index ec57ecc3..c4e6f66b 100644 --- a/generic/sodium/examples/encrypt_example.rs +++ b/generic/sodium/examples/encrypt_example.rs @@ -68,7 +68,7 @@ fn main() -> Result<(), Box> { .required(true) .takes_value(true), ) - .matches(); + .get_matches(); gst::init()?; gstsodium::plugin_register_static().expect("Failed to register sodium plugin"); diff --git a/generic/sodium/examples/generate_keys.rs b/generic/sodium/examples/generate_keys.rs index cf184e93..fa5e137b 100644 --- a/generic/sodium/examples/generate_keys.rs +++ b/generic/sodium/examples/generate_keys.rs @@ -92,7 +92,7 @@ fn main() { .short("j") .help("Write a JSON file instead of a key.prv/key.pub pair"), ) - .matches(); + .get_matches(); let keys = Keys::new(); diff --git a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs index efb2fbe4..6957c1a7 100644 --- a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs +++ b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs @@ -28,7 +28,7 @@ glib::wrapper! { pub struct RTPJitterBuffer(Object); match fn { - get_type => || ffi::rtp_jitter_buffer_get_type(), + type_ => || ffi::rtp_jitter_buffer_get_type(), } } diff --git a/net/reqwest/src/reqwesthttpsrc/imp.rs b/net/reqwest/src/reqwesthttpsrc/imp.rs index 5b67d995..6565ea74 100644 --- a/net/reqwest/src/reqwesthttpsrc/imp.rs +++ b/net/reqwest/src/reqwesthttpsrc/imp.rs @@ -475,11 +475,11 @@ impl ReqwestHttpSrc { s.set("content-type", &content_type.as_ref()); } else if content_type.type_() == "audio" && content_type.subtype() == "L16" { let channels = content_type - .param("channels") + .get_param("channels") .and_then(|s| s.as_ref().parse::().ok()) .unwrap_or(2); let rate = content_type - .param("rate") + .get_param("rate") .and_then(|s| s.as_ref().parse::().ok()) .unwrap_or(44_100); diff --git a/net/reqwest/tests/reqwesthttpsrc.rs b/net/reqwest/tests/reqwesthttpsrc.rs index 11cb5d9a..2705f7d7 100644 --- a/net/reqwest/tests/reqwesthttpsrc.rs +++ b/net/reqwest/tests/reqwesthttpsrc.rs @@ -459,7 +459,7 @@ fn test_extra_headers() { assert_eq!(headers.get("baz").unwrap(), "1"); assert_eq!( headers - .all("list") + .get_all("list") .iter() .map(|v| v.to_str().unwrap()) .collect::>(), @@ -467,7 +467,7 @@ fn test_extra_headers() { ); assert_eq!( headers - .all("array") + .get_all("array") .iter() .map(|v| v.to_str().unwrap()) .collect::>(), diff --git a/net/rusoto/src/s3src/imp.rs b/net/rusoto/src/s3src/imp.rs index 72f328d3..07cb4ab0 100644 --- a/net/rusoto/src/s3src/imp.rs +++ b/net/rusoto/src/s3src/imp.rs @@ -175,7 +175,7 @@ impl S3Src { offset + length - 1 ); - let response = client.object(request); + let response = client.get_object(request); let output = s3utils::wait(&self.canceller, response).map_err(|err| match err { WaitError::FutureError(err) => Some(gst::error_msg!( diff --git a/utils/fallbackswitch/src/base/subclass/aggregator.rs b/utils/fallbackswitch/src/base/subclass/aggregator.rs index d0acb9e7..54ed2443 100644 --- a/utils/fallbackswitch/src/base/subclass/aggregator.rs +++ b/utils/fallbackswitch/src/base/subclass/aggregator.rs @@ -111,7 +111,7 @@ pub trait AggregatorImpl: AggregatorImplExt + ElementImpl { } fn next_time(&self, aggregator: &Self::Type) -> gst::ClockTime { - self.parent_get_next_time(aggregator) + self.parent_next_time(aggregator) } fn create_new_pad( @@ -214,7 +214,7 @@ pub trait AggregatorImplExt: ObjectSubclass { fn parent_stop(&self, aggregator: &Self::Type) -> Result<(), gst::ErrorMessage>; - fn parent_get_next_time(&self, aggregator: &Self::Type) -> gst::ClockTime; + fn parent_next_time(&self, aggregator: &Self::Type) -> gst::ClockTime; fn parent_create_new_pad( &self, @@ -498,7 +498,7 @@ impl AggregatorImplExt for T { } } - fn parent_get_next_time(&self, aggregator: &Self::Type) -> gst::ClockTime { + fn parent_next_time(&self, aggregator: &Self::Type) -> gst::ClockTime { unsafe { let data = T::type_data(); let parent_class = data.as_ref().parent_class() as *mut ffi::GstAggregatorClass; diff --git a/utils/togglerecord/tests/tests.rs b/utils/togglerecord/tests/tests.rs index dbb2ff8e..f40e1d27 100644 --- a/utils/togglerecord/tests/tests.rs +++ b/utils/togglerecord/tests/tests.rs @@ -66,7 +66,7 @@ fn setup_sender_receiver( togglerecord.static_pad("sink").unwrap(), ) } else { - let sinkpad = togglerecord.request_pad("sink_%u").unwrap(); + let sinkpad = togglerecord.request_pad_simple("sink_%u").unwrap(); let srcpad = sinkpad.iterate_internal_links().next().unwrap().unwrap(); (srcpad, sinkpad) }; @@ -263,7 +263,7 @@ fn test_create_pads() { init(); let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); - let sinkpad = togglerecord.request_pad("sink_%u").unwrap(); + let sinkpad = togglerecord.request_pad_simple("sink_%u").unwrap(); let srcpad = sinkpad.iterate_internal_links().next().unwrap().unwrap(); assert_eq!(sinkpad.name(), "sink_0"); diff --git a/video/cdg/src/cdgdec/imp.rs b/video/cdg/src/cdgdec/imp.rs index b46903df..e4e57664 100644 --- a/video/cdg/src/cdgdec/imp.rs +++ b/video/cdg/src/cdgdec/imp.rs @@ -181,7 +181,7 @@ impl VideoDecoderImpl for CdgDec { .take(CDG_WIDTH as usize) .enumerate() { - let p = cdg_inter.pixel(x as u32, y as u32); + let p = cdg_inter.get_pixel(x as u32, y as u32); pixel.copy_from_slice(&p.0); } } diff --git a/video/dav1d/src/dav1ddec/imp.rs b/video/dav1d/src/dav1ddec/imp.rs index a08721bd..15c10d6b 100644 --- a/video/dav1d/src/dav1ddec/imp.rs +++ b/video/dav1d/src/dav1ddec/imp.rs @@ -278,7 +278,7 @@ impl Dav1dDec { fn drop_decoded_pictures(&self) { let mut decoder = self.decoder.lock().unwrap(); - while let Ok(pic) = decoder.picture() { + while let Ok(pic) = decoder.get_picture() { gst_debug!(CAT, "Dropping picture"); drop(pic); } @@ -289,7 +289,7 @@ impl Dav1dDec { ) -> Result, gst::FlowError> { let mut decoder = self.decoder.lock().unwrap(); let mut pictures = vec![]; - while let Ok(pic) = decoder.picture() { + while let Ok(pic) = decoder.get_picture() { let format = self.gst_video_format_from_dav1d_picture(&pic); if format == gst_video::VideoFormat::Unknown { return Err(gst::FlowError::NotNegotiated);