diff options
Diffstat (limited to 'generic')
30 files changed, 212 insertions, 220 deletions
diff --git a/generic/file/src/filesink/imp.rs b/generic/file/src/filesink/imp.rs index 05253cf95..b9bfe15a7 100644 --- a/generic/file/src/filesink/imp.rs +++ b/generic/file/src/filesink/imp.rs @@ -136,7 +136,7 @@ impl ObjectImpl for FileSink { value: &glib::Value, pspec: &glib::ParamSpec, ) { - match pspec.get_name() { + match pspec.name() { "location" => { let res = match value.get::<String>() { Ok(Some(location)) => FileLocation::try_from_path_str(location) @@ -154,7 +154,7 @@ impl ObjectImpl for FileSink { } fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { - match pspec.get_name() { + match pspec.name() { "location" => { let settings = self.settings.lock().unwrap(); let location = settings diff --git a/generic/file/src/filesrc/imp.rs b/generic/file/src/filesrc/imp.rs index 4a7e11720..36a5137bb 100644 --- a/generic/file/src/filesrc/imp.rs +++ b/generic/file/src/filesrc/imp.rs @@ -150,7 +150,7 @@ impl ObjectImpl for FileSrc { value: &glib::Value, pspec: &glib::ParamSpec, ) { - match pspec.get_name() { + match pspec.name() { "location" => { let res = match value.get::<String>() { Ok(Some(location)) => FileLocation::try_from_path_str(location) @@ -168,7 +168,7 @@ impl ObjectImpl for FileSrc { } fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { - match pspec.get_name() { + match pspec.name() { "location" => { let settings = self.settings.lock().unwrap(); let location = settings diff --git a/generic/sodium/examples/decrypt_example.rs b/generic/sodium/examples/decrypt_example.rs index 08cd1519f..e8a1566d1 100644 --- a/generic/sodium/examples/decrypt_example.rs +++ b/generic/sodium/examples/decrypt_example.rs @@ -68,7 +68,7 @@ fn main() -> Result<(), Box<dyn Error>> { .required(true) .takes_value(true), ) - .get_matches(); + .matches(); gst::init()?; gstsodium::plugin_register_static().expect("Failed to register sodium plugin"); @@ -123,17 +123,17 @@ fn main() -> Result<(), Box<dyn Error>> { .set_state(gst::State::Playing) .expect("Unable to set the pipeline to the `Playing` state"); - let bus = pipeline.get_bus().unwrap(); + let bus = pipeline.bus().unwrap(); for msg in bus.iter_timed(gst::CLOCK_TIME_NONE) { use gst::MessageView; match msg.view() { MessageView::Error(err) => { eprintln!( "Error received from element {:?}: {}", - err.get_src().map(|s| s.get_path_string()), - err.get_error() + err.src().map(|s| s.path_string()), + err.error() ); - eprintln!("Debugging information: {:?}", err.get_debug()); + eprintln!("Debugging information: {:?}", err.debug()); break; } MessageView::Eos(..) => break, diff --git a/generic/sodium/examples/encrypt_example.rs b/generic/sodium/examples/encrypt_example.rs index 4da6c0254..ec57ecc33 100644 --- a/generic/sodium/examples/encrypt_example.rs +++ b/generic/sodium/examples/encrypt_example.rs @@ -68,7 +68,7 @@ fn main() -> Result<(), Box<dyn Error>> { .required(true) .takes_value(true), ) - .get_matches(); + .matches(); gst::init()?; gstsodium::plugin_register_static().expect("Failed to register sodium plugin"); @@ -120,17 +120,17 @@ fn main() -> Result<(), Box<dyn Error>> { pipeline.set_state(gst::State::Playing)?; - let bus = pipeline.get_bus().unwrap(); + let bus = pipeline.bus().unwrap(); for msg in bus.iter_timed(gst::CLOCK_TIME_NONE) { use gst::MessageView; match msg.view() { MessageView::Error(err) => { eprintln!( "Error received from element {:?}: {}", - err.get_src().map(|s| s.get_path_string()), - err.get_error() + err.src().map(|s| s.path_string()), + err.error() ); - eprintln!("Debugging information: {:?}", err.get_debug()); + eprintln!("Debugging information: {:?}", err.debug()); break; } MessageView::Eos(..) => break, diff --git a/generic/sodium/examples/generate_keys.rs b/generic/sodium/examples/generate_keys.rs index fa5e137b8..cf184e93f 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"), ) - .get_matches(); + .matches(); let keys = Keys::new(); diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs index c5c5bda7b..80e1a774e 100644 --- a/generic/sodium/src/decrypter/imp.rs +++ b/generic/sodium/src/decrypter/imp.rs @@ -301,16 +301,16 @@ impl Decrypter { gst_log!(CAT, obj: pad, "Upstream returned {:?}", peer_query); - let (flags, min, max, align) = peer_query.get_result(); + let (flags, min, max, align) = peer_query.result(); q.set(flags, min, max, align); q.add_scheduling_modes(&[gst::PadMode::Pull]); - gst_log!(CAT, obj: pad, "Returning {:?}", q.get_mut_query()); + gst_log!(CAT, obj: pad, "Returning {:?}", q.query_mut()); true } QueryView::Duration(ref mut q) => { use std::convert::TryInto; - if q.get_format() != gst::Format::Bytes { + if q.format() != gst::Format::Bytes { return pad.query_default(Some(element), query); } @@ -322,7 +322,7 @@ impl Decrypter { return false; } - let size = match peer_query.get_result().try_into().unwrap() { + let size = match peer_query.result().try_into().unwrap() { gst::format::Bytes(Some(size)) => size, gst::format::Bytes(None) => { gst_error!(CAT, "Failed to query upstream duration"); @@ -381,7 +381,7 @@ impl Decrypter { err })?; - if buffer.get_size() != crate::HEADERS_SIZE { + if buffer.size() != crate::HEADERS_SIZE { let err = gst::loggable_error!(CAT, "Headers buffer has wrong size"); err.log_with_object(element); return Err(err); @@ -636,7 +636,7 @@ impl ObjectImpl for Decrypter { value: &glib::Value, pspec: &glib::ParamSpec, ) { - match pspec.get_name() { + match pspec.name() { "sender-key" => { let mut props = self.props.lock().unwrap(); props.sender_key = value.get().expect("type checked upstream"); @@ -652,7 +652,7 @@ impl ObjectImpl for Decrypter { } fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { - match pspec.get_name() { + match pspec.name() { "receiver-key" => { let props = self.props.lock().unwrap(); props.receiver_key.to_value() diff --git a/generic/sodium/src/encrypter/imp.rs b/generic/sodium/src/encrypter/imp.rs index a53f6fc71..415c8a4db 100644 --- a/generic/sodium/src/encrypter/imp.rs +++ b/generic/sodium/src/encrypter/imp.rs @@ -275,19 +275,19 @@ impl Encrypter { match query.view_mut() { QueryView::Seeking(mut q) => { - let format = q.get_format(); + let format = q.format(); q.set( false, gst::GenericFormattedValue::Other(format, -1), gst::GenericFormattedValue::Other(format, -1), ); - gst_log!(CAT, obj: pad, "Returning {:?}", q.get_mut_query()); + gst_log!(CAT, obj: pad, "Returning {:?}", q.query_mut()); true } QueryView::Duration(ref mut q) => { use std::convert::TryInto; - if q.get_format() != gst::Format::Bytes { + if q.format() != gst::Format::Bytes { return pad.query_default(Some(element), query); } @@ -299,7 +299,7 @@ impl Encrypter { return false; } - let size = match peer_query.get_result().try_into().unwrap() { + let size = match peer_query.result().try_into().unwrap() { gst::format::Bytes(Some(size)) => size, gst::format::Bytes(None) => { gst_error!(CAT, "Failed to query upstream duration"); @@ -436,7 +436,7 @@ impl ObjectImpl for Encrypter { value: &glib::Value, pspec: &glib::ParamSpec, ) { - match pspec.get_name() { + match pspec.name() { "sender-key" => { let mut props = self.props.lock().unwrap(); props.sender_key = value.get().expect("type checked upstream"); @@ -457,7 +457,7 @@ impl ObjectImpl for Encrypter { } fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { - match pspec.get_name() { + match pspec.name() { "receiver-key" => { let props = self.props.lock().unwrap(); props.receiver_key.to_value() diff --git a/generic/sodium/tests/decrypter.rs b/generic/sodium/tests/decrypter.rs index cab580dd2..164de4809 100644 --- a/generic/sodium/tests/decrypter.rs +++ b/generic/sodium/tests/decrypter.rs @@ -104,7 +104,7 @@ fn test_pipeline() { .new_sample(move |appsink| { // Pull the sample in question out of the appsink's buffer. let sample = appsink.pull_sample().map_err(|_| gst::FlowError::Eos)?; - let buffer = sample.get_buffer().ok_or(gst::FlowError::Error)?; + let buffer = sample.buffer().ok_or(gst::FlowError::Error)?; let mut adapter = adapter_clone.lock().unwrap(); adapter.push(buffer.to_owned()); @@ -118,17 +118,17 @@ fn test_pipeline() { .set_state(gst::State::Playing) .expect("Unable to set the pipeline to the `Playing` state"); - let bus = pipeline.get_bus().unwrap(); + let bus = pipeline.bus().unwrap(); for msg in bus.iter_timed(gst::CLOCK_TIME_NONE) { use gst::MessageView; match msg.view() { MessageView::Error(err) => { eprintln!( "Error received from element {:?}: {}", - err.get_src().map(|s| s.get_path_string()), - err.get_error() + err.src().map(|s| s.path_string()), + err.error() ); - eprintln!("Debugging information: {:?}", err.get_debug()); + eprintln!("Debugging information: {:?}", err.debug()); unreachable!(); } MessageView::Eos(..) => break, @@ -196,7 +196,7 @@ fn test_pull_range() { srcpad.query(&mut q); // get the seeking capabilities - let (seekable, start, stop) = q.get_result(); + let (seekable, start, stop) = q.result(); assert_eq!(seekable, true); assert_eq!( start, @@ -214,7 +214,7 @@ fn test_pull_range() { 61, 70, 175, 103, 127, 28, 0, ]; let buf1 = srcpad.get_range(0, 50).unwrap(); - assert_eq!(buf1.get_size(), 50); + assert_eq!(buf1.size(), 50); let map1 = buf1.map_readable().unwrap(); assert_eq!(&map1[..], &expected_array_1[..]); @@ -226,7 +226,7 @@ fn test_pull_range() { 120, 121, 232, 0, 0, 12, 252, 195, 195, 199, 128, 0, 0, 0, ]; let buf2 = srcpad.get_range(0, 100).unwrap(); - assert_eq!(buf2.get_size(), 100); + assert_eq!(buf2.size(), 100); let map2 = buf2.map_readable().unwrap(); assert_eq!(&map2[..], &expected_array_2[..]); @@ -237,20 +237,20 @@ fn test_pull_range() { // request in the middle of a block let buf = srcpad.get_range(853, 100).unwrap(); // result size doesn't include the block macs, - assert_eq!(buf.get_size(), 100); + assert_eq!(buf.size(), 100); // read till eos, this also will pull multiple blocks let buf = srcpad.get_range(853, 42000).unwrap(); // 6031 (size of file) - 883 (requersted offset) - headers size - (numbler of blcks * block mac) - assert_eq!(buf.get_size(), 5054); + assert_eq!(buf.size(), 5054); // read 0 bytes from the start let buf = srcpad.get_range(0, 0).unwrap(); - assert_eq!(buf.get_size(), 0); + assert_eq!(buf.size(), 0); // read 0 bytes somewhere in the middle let buf = srcpad.get_range(4242, 0).unwrap(); - assert_eq!(buf.get_size(), 0); + assert_eq!(buf.size(), 0); // read 0 bytes to eos let res = srcpad.get_range(6003, 0); @@ -266,7 +266,7 @@ fn test_pull_range() { // read 10 bytes at eos -1, should return a single byte let buf = srcpad.get_range(5906, 10).unwrap(); - assert_eq!(buf.get_size(), 1); + assert_eq!(buf.size(), 1); pipeline .set_state(gst::State::Null) diff --git a/generic/threadshare/examples/benchmark.rs b/generic/threadshare/examples/benchmark.rs index e393491e8..49ef3d4fb 100644 --- a/generic/threadshare/examples/benchmark.rs +++ b/generic/threadshare/examples/benchmark.rs @@ -167,7 +167,7 @@ fn main() { source.link(&sink).unwrap(); } - let bus = pipeline.get_bus().unwrap(); + let bus = pipeline.bus().unwrap(); let l_clone = l.clone(); bus.add_watch(move |_, msg| { use gst::MessageView; @@ -177,9 +177,9 @@ fn main() { MessageView::Error(err) => { println!( "Error from {:?}: {} ({:?})", - err.get_src().map(|s| s.get_path_string()), - err.get_error(), - err.get_debug() + err.src().map(|s| s.path_string()), + err.error(), + err.debug() ); l_clone.quit(); } diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs index ba4596593..932c6801b 100644 --- a/generic/threadshare/src/appsrc/imp.rs +++ b/generic/threadshare/src/appsrc/imp.rs @@ -235,11 +235,11 @@ impl PadSrcHandler for AppSrcPadHandler { } QueryView::Caps(ref mut q) => { let caps = if let Some(caps) = self.0.configured_caps.lock().unwrap().as_ref() { - q.get_filter() + q.filter() .map(|f| f.intersect_with_mode(caps, gst::CapsIntersectMode::First)) .unwrap_or_else(|| caps.clone()) } else { - q.get_filter() + q.filter() .map(|f| f.to_owned()) .unwrap_or_else(gst::Caps::new_any) }; @@ -386,9 +386,9 @@ impl AppSrc { let do_timestamp = self.settings.lock().unwrap().do_timestamp; if do_timestamp { - if let Some(clock) = element.get_clock() { - let base_time = element.get_base_time(); - let now = clock.get_time(); + if let Some(clock) = element.clock() { + let base_time = element.base_time(); + let now = clock.time(); let buffer = buffer.make_mut(); buffer.set_dts(now - base_time); @@ -623,7 +623,7 @@ impl ObjectImpl for AppSrc { pspec: &glib::ParamSpec, ) { let mut settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "context" => { settings.context = value .get() @@ -648,7 +648,7 @@ impl ObjectImpl for AppSrc { fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { let settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "context" => settings.context.to_value(), "context-wait" => settings.context_wait.to_value(), "caps" => settings.caps.to_value(), diff --git a/generic/threadshare/src/dataqueue.rs b/generic/threadshare/src/dataqueue.rs index 4f4fc6a0a..263a25cf8 100644 --- a/generic/threadshare/src/dataqueue.rs +++ b/generic/threadshare/src/dataqueue.rs @@ -45,10 +45,10 @@ pub enum DataQueueItem { impl DataQueueItem { fn size(&self) -> (u32, u32) { match *self { - DataQueueItem::Buffer(ref buffer) => (1, buffer.get_size() as u32), + DataQueueItem::Buffer(ref buffer) => (1, buffer.size() as u32), DataQueueItem::BufferList(ref list) => ( list.len() as u32, - list.iter().map(|b| b.get_size() as u32).sum::<u32>(), + list.iter().map(|b| b.size() as u32).sum::<u32>(), ), DataQueueItem::Event(_) => (0, 0), } @@ -56,9 +56,9 @@ impl DataQueueItem { fn timestamp(&self) -> Option<u64> { match *self { - DataQueueItem::Buffer(ref buffer) => buffer.get_dts_or_pts().0, + DataQueueItem::Buffer(ref buffer) => buffer.dts_or_pts().0, DataQueueItem::BufferList(ref list) => { - list.iter().filter_map(|b| b.get_dts_or_pts().0).next() + list.iter().filter_map(|b| b.dts_or_pts().0).next() } DataQueueItem::Event(_) => None, } @@ -156,8 +156,8 @@ impl DataQueue { for item in inner.queue.drain(..) { if let DataQueueItem::Event(event) = item { if event.is_sticky() - && event.get_type() != gst::EventType::Segment - && event.get_type() != gst::EventType::Eos + && event.type_() != gst::EventType::Segment + && event.type_() != gst::EventType::Eos { let _ = src_pad.store_sticky_event(&event); } diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs index c3016a5c9..352dfda2a 100644 --- a/generic/threadshare/src/inputselector/imp.rs +++ b/generic/threadshare/src/inputselector/imp.rs @@ -77,7 +77,7 @@ struct InputSelectorPadSinkHandler(Arc<Mutex<InputSelectorPadSinkHandlerInner>>) impl InputSelectorPadSinkHandler { /* Wait until specified time */ async fn sync(&self, element: &super::InputSelector, running_time: gst::ClockTime) { - let now = element.get_current_running_time(); + let now = element.current_running_time(); if let Some(delay) = running_time .saturating_sub(now) @@ -104,7 +104,7 @@ impl InputSelectorPadSinkHandler { if let Some(segment) = &inner.segment { if let Some(segment) = segment.downcast_ref::<gst::format::Time>() { - let rtime = segment.to_running_time(buffer.get_pts()); + let rtime = segment.to_running_time(buffer.pts()); let (sync_fut, abort_handle) = abortable(self.sync(&element, rtime)); inner.abort_handle = Some(abort_handle); sync_future = Some(sync_fut.map_err(|_| gst::FlowError::Flushing)); @@ -142,7 +142,7 @@ impl InputSelectorPadSinkHandler { if is_active { gst_log!(CAT, obj: pad.gst_pad(), "Forwarding {:?}", buffer); - if switched_pad && !buffer.get_flags().contains(gst::BufferFlags::DISCONT) { + if switched_pad && !buffer.flags().contains(gst::BufferFlags::DISCONT) { let buffer = buffer.make_mut(); buffer.set_flags(gst::BufferFlags::DISCONT); } @@ -211,7 +211,7 @@ impl PadSinkHandler for InputSelectorPadSinkHandler { // Remember the segment for later use if let gst::EventView::Segment(e) = event.view() { - inner.segment = Some(e.get_segment().clone()); + inner.segment = Some(e.segment().clone()); } // We sent sticky events together with the next buffer once it becomes @@ -307,7 +307,7 @@ impl PadSrcHandler for InputSelectorPadSrcHandler { ret = pad.peer_query(&mut peer_query); if ret { - let (live, min, max) = peer_query.get_result(); + let (live, min, max) = peer_query.result(); if live { min_latency = min.max(min_latency).unwrap_or(min_latency); max_latency = max.min(max_latency).unwrap_or(max); @@ -449,7 +449,7 @@ impl ObjectImpl for InputSelector { value: &glib::Value, pspec: &glib::ParamSpec, ) { - match pspec.get_name() { + match pspec.name() { "context" => { let mut settings = self.settings.lock().unwrap(); settings.context = value @@ -494,7 +494,7 @@ impl ObjectImpl for InputSelector { } fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { - match pspec.get_name() { + match pspec.name() { "context" => { let settings = self.settings.lock().unwrap(); settings.context.to_value() diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs index c3e3eda8c..4aa055527 100644 --- a/generic/threadshare/src/jitterbuffer/imp.rs +++ b/generic/threadshare/src/jitterbuffer/imp.rs @@ -81,8 +81,8 @@ struct GapPacket { impl GapPacket { fn new(buffer: gst::Buffer) -> Self { let rtp_buffer = RTPBuffer::from_buffer_readable(&buffer).unwrap(); - let seq = rtp_buffer.get_seq(); - let pt = rtp_buffer.get_payload_type(); + let seq = rtp_buffer.seq(); + let pt = rtp_buffer.payload_type(); drop(rtp_buffer); Self { buffer, seq, pt } @@ -318,14 +318,14 @@ impl SinkHandler { let rtp_buffer = RTPBuffer::from_buffer_readable(&buffer).map_err(|_| gst::FlowError::Error)?; ( - rtp_buffer.get_seq(), - rtp_buffer.get_timestamp(), - rtp_buffer.get_payload_type(), + rtp_buffer.seq(), + rtp_buffer.timestamp(), + rtp_buffer.payload_type(), ) }; - let mut pts = buffer.get_pts(); - let mut dts = buffer.get_dts(); + let mut pts = buffer.pts(); + let mut dts = buffer.dts(); let mut estimated_dts = false; gst_log!( @@ -344,7 +344,7 @@ impl SinkHandler { } if dts.is_none() { - dts = element.get_current_running_time(); + dts = element.current_running_time(); pts = dts; estimated_dts = state.clock_rate.is_some(); @@ -363,7 +363,7 @@ impl SinkHandler { gst_debug!(CAT, obj: pad, "New payload type: {}", pt); - if let Some(caps) = pad.get_current_caps() { + if let Some(caps) = pad.current_caps() { /* Ignore errors at this point, as we want to emit request-pt-map */ let _ = self.parse_caps(inner, &mut state, element, &caps, pt); } @@ -400,7 +400,7 @@ impl SinkHandler { dts, estimated_dts, rtptime, - element.get_base_time(), + element.base_time(), 0, false, ); @@ -626,11 +626,7 @@ impl PadSinkHandler for SinkHandler { match event.view() { EventView::Segment(e) => { let mut state = jb.state.lock().unwrap(); - state.segment = e - .get_segment() - .clone() - .downcast::<gst::format::Time>() - .unwrap(); + state.segment = e.segment().clone().downcast::<gst::format::Time>().unwrap(); } EventView::FlushStop(..) => { if let Err(err) = jb.task.flush_stop() { @@ -797,9 +793,9 @@ impl SrcHandler { Some(item) => item, }; - let dts = jb_item.get_dts(); - let pts = jb_item.get_pts(); - let seq = jb_item.get_seqnum(); + let dts = jb_item.dts(); + let pts = jb_item.pts(); + let seq = jb_item.seqnum(); let mut buffer = jb_item.into_buffer(); let lost_events = { @@ -808,7 +804,7 @@ impl SrcHandler { buffer.set_dts(state.segment.to_running_time(dts)); buffer.set_pts(state.segment.to_running_time(pts)); - if state.last_popped_pts.is_some() && buffer.get_pts() < state.last_popped_pts { + if state.last_popped_pts.is_some() && buffer.pts() < state.last_popped_pts { buffer.set_pts(state.last_popped_pts) } @@ -830,7 +826,7 @@ impl SrcHandler { lost_events }; - state.last_popped_pts = buffer.get_pts(); + state.last_popped_pts = buffer.pts(); if let Some(pts) = state.last_popped_pts.nseconds() { state.position = pts.into(); } @@ -858,7 +854,7 @@ impl SrcHandler { latency: gst::ClockTime, context_wait: gst::ClockTime, ) -> (gst::ClockTime, Option<(gst::ClockTime, Duration)>) { - let now = element.get_current_running_time(); + let now = element.current_running_time(); gst_debug!( CAT, @@ -965,7 +961,7 @@ impl PadSrcHandler for SrcHandler { if ret { let settings = jb.settings.lock().unwrap(); - let (_, mut min_latency, _) = peer_query.get_result(); + let (_, mut min_latency, _) = peer_query.result(); min_latency += (settings.latency_ms as u64) * gst::SECOND; let max_latency = gst::CLOCK_TIME_NONE; @@ -975,7 +971,7 @@ impl PadSrcHandler for SrcHandler { ret } QueryView::Position(ref mut q) => { - if q.get_format() != gst::Format::Time { + if q.format() != gst::Format::Time { jb.sink_pad.gst_pad().peer_query(query) } else { let state = jb.state.lock().unwrap(); @@ -1459,7 +1455,7 @@ impl ObjectImpl for JitterBuffer { value: &glib::Value, pspec: &glib::ParamSpec, ) { - match pspec.get_name() { + match pspec.name() { "latency" => { let latency_ms = { let mut settings = self.settings.lock().unwrap(); @@ -1500,7 +1496,7 @@ impl ObjectImpl for JitterBuffer { } fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { - match pspec.get_name() { + match pspec.name() { "latency" => { let settings = self.settings.lock().unwrap(); settings.latency_ms.to_value() diff --git a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs index 3b59ce45e..93c70fddb 100644 --- a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs +++ b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs @@ -112,7 +112,7 @@ impl RTPJitterBufferItem { } } - pub fn get_dts(&self) -> gst::ClockTime { + pub fn dts(&self) -> gst::ClockTime { unsafe { let item = self.0.as_ref().expect("Invalid wrapper"); if item.as_ref().dts == gst::ffi::GST_CLOCK_TIME_NONE { @@ -123,7 +123,7 @@ impl RTPJitterBufferItem { } } - pub fn get_pts(&self) -> gst::ClockTime { + pub fn pts(&self) -> gst::ClockTime { unsafe { let item = self.0.as_ref().expect("Invalid wrapper"); if item.as_ref().pts == gst::ffi::GST_CLOCK_TIME_NONE { @@ -134,7 +134,7 @@ impl RTPJitterBufferItem { } } - pub fn get_seqnum(&self) -> Option<u16> { + pub fn seqnum(&self) -> Option<u16> { unsafe { let item = self.0.as_ref().expect("Invalid wrapper"); if item.as_ref().seqnum == std::u32::MAX { @@ -146,7 +146,7 @@ impl RTPJitterBufferItem { } #[allow(dead_code)] - pub fn get_rtptime(&self) -> u32 { + pub fn rtptime(&self) -> u32 { unsafe { let item = self.0.as_ref().expect("Invalid wrapper"); item.as_ref().rtptime @@ -223,7 +223,7 @@ impl RTPJitterBuffer { } #[allow(dead_code)] - pub fn get_mode(&self) -> RTPJitterBufferMode { + pub fn mode(&self) -> RTPJitterBufferMode { unsafe { from_glib(ffi::rtp_jitter_buffer_get_mode(self.to_glib_none().0)) } } @@ -233,7 +233,7 @@ impl RTPJitterBuffer { } #[allow(dead_code)] - pub fn get_delay(&self) -> gst::ClockTime { + pub fn delay(&self) -> gst::ClockTime { unsafe { from_glib(ffi::rtp_jitter_buffer_get_delay(self.to_glib_none().0)) } } @@ -246,7 +246,7 @@ impl RTPJitterBuffer { } #[allow(dead_code)] - pub fn get_clock_rate(&self) -> u32 { + pub fn clock_rate(&self) -> u32 { unsafe { ffi::rtp_jitter_buffer_get_clock_rate(self.to_glib_none().0) } } diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs index 2eeb73262..0c9358fbf 100644 --- a/generic/threadshare/src/proxy/imp.rs +++ b/generic/threadshare/src/proxy/imp.rs @@ -456,9 +456,7 @@ impl ProxySink { let pending_queue = shared_ctx.pending_queue.as_mut().unwrap(); let schedule_now = match item { - DataQueueItem::Event(ref ev) if ev.get_type() != gst::EventType::Eos => { - false - } + DataQueueItem::Event(ref ev) if ev.type_() != gst::EventType::Eos => false, _ => true, }; @@ -612,7 +610,7 @@ impl ObjectImpl for ProxySink { pspec: &glib::ParamSpec, ) { let mut settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "proxy-context" => { settings.proxy_context = value .get() @@ -625,7 +623,7 @@ impl ObjectImpl for ProxySink { fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { let settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "proxy-context" => settings.proxy_context.to_value(), _ => unimplemented!(), } @@ -823,12 +821,12 @@ impl PadSrcHandler for ProxySrcPadHandler { true } QueryView::Caps(ref mut q) => { - let caps = if let Some(ref caps) = pad.gst_pad().get_current_caps() { - q.get_filter() + let caps = if let Some(ref caps) = pad.gst_pad().current_caps() { + q.filter() .map(|f| f.intersect_with_mode(caps, gst::CapsIntersectMode::First)) .unwrap_or_else(|| caps.clone()) } else { - q.get_filter() + q.filter() .map(|f| f.to_owned()) .unwrap_or_else(gst::Caps::new_any) }; @@ -1196,7 +1194,7 @@ impl ObjectImpl for ProxySrc { pspec: &glib::ParamSpec, ) { let mut settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "max-size-buffers" => { settings.max_size_buffers = value.get_some().expect("type checked upstream"); } @@ -1227,7 +1225,7 @@ impl ObjectImpl for ProxySrc { fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { let settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "max-size-buffers" => settings.max_size_buffers.to_value(), "max-size-bytes" => settings.max_size_bytes.to_value(), "max-size-time" => settings.max_size_time.to_value(), diff --git a/generic/threadshare/src/queue/imp.rs b/generic/threadshare/src/queue/imp.rs index ba3c0ae2a..cff65e292 100644 --- a/generic/threadshare/src/queue/imp.rs +++ b/generic/threadshare/src/queue/imp.rs @@ -300,17 +300,17 @@ impl PadSrcHandler for QueuePadSrcHandler { gst_log!(CAT, obj: pad.gst_pad(), "Upstream returned {:?}", new_query); - let (flags, min, max, align) = new_query.get_result(); + let (flags, min, max, align) = new_query.result(); q.set(flags, min, max, align); q.add_scheduling_modes( &new_query - .get_scheduling_modes() + .scheduling_modes() .iter() .cloned() .filter(|m| m != &gst::PadMode::Pull) .collect::<Vec<_>>(), ); - gst_log!(CAT, obj: pad.gst_pad(), "Returning {:?}", q.get_mut_query()); + gst_log!(CAT, obj: pad.gst_pad(), "Returning {:?}", q.query_mut()); return true; } @@ -573,9 +573,7 @@ impl Queue { } let schedule_now = match item { - DataQueueItem::Event(ref ev) if ev.get_type() != gst::EventType::Eos => { - false - } + DataQueueItem::Event(ref ev) if ev.type_() != gst::EventType::Eos => false, _ => true, }; @@ -777,7 +775,7 @@ impl ObjectImpl for Queue { pspec: &glib::ParamSpec, ) { let mut settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "max-size-buffers" => { settings.max_size_buffers = value.get_some().expect("type checked upstream"); } @@ -802,7 +800,7 @@ impl ObjectImpl for Queue { fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { let settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "max-size-buffers" => settings.max_size_buffers.to_value(), "max-size-bytes" => settings.max_size_bytes.to_value(), "max-size-time" => settings.max_size_time.to_value(), diff --git a/generic/threadshare/src/runtime/pad.rs b/generic/threadshare/src/runtime/pad.rs index 9cd18c663..b0fc816e9 100644 --- a/generic/threadshare/src/runtime/pad.rs +++ b/generic/threadshare/src/runtime/pad.rs @@ -131,7 +131,7 @@ pub trait PadSrcHandler: Clone + Send + Sync + 'static { RUNTIME_CAT, obj: gst_pad, "Already activated in {:?} mode ", - gst_pad.get_mode() + gst_pad.mode() ); return Ok(()); } @@ -180,7 +180,7 @@ pub trait PadSrcHandler: Clone + Send + Sync + 'static { ) -> Result<FlowSuccess, FlowError> { // default is to dispatch to `src_event` // (as implemented in `gst_pad_send_event_unchecked`) - let event_type = event.get_type(); + let event_type = event.type_(); event_to_event_full(self.src_event(pad, imp, element, event), event_type) } @@ -209,7 +209,7 @@ pub struct PadSrcInner { impl PadSrcInner { fn new(gst_pad: gst::Pad) -> Self { - if gst_pad.get_direction() != gst::PadDirection::Src { + if gst_pad.direction() != gst::PadDirection::Src { panic!("Wrong pad direction for PadSrc"); } @@ -542,7 +542,7 @@ pub trait PadSinkHandler: Clone + Send + Sync + 'static { RUNTIME_CAT, obj: gst_pad, "Already activated in {:?} mode ", - gst_pad.get_mode() + gst_pad.mode() ); return Ok(()); } @@ -633,7 +633,7 @@ pub trait PadSinkHandler: Clone + Send + Sync + 'static { assert!(!event.is_serialized()); // default is to dispatch to `sink_event` // (as implemented in `gst_pad_send_event_unchecked`) - let event_type = event.get_type(); + let event_type = event.type_(); event_to_event_full(self.sink_event(pad, imp, element, event), event_type) } @@ -647,7 +647,7 @@ pub trait PadSinkHandler: Clone + Send + Sync + 'static { assert!(event.is_serialized()); // default is to dispatch to `sink_event` // (as implemented in `gst_pad_send_event_unchecked`) - let event_type = event.get_type(); + let event_type = event.type_(); event_to_event_full_serialized( self.sink_event_serialized(pad, imp, element, event), event_type, @@ -680,7 +680,7 @@ pub struct PadSinkInner { impl PadSinkInner { fn new(gst_pad: gst::Pad) -> Self { - if gst_pad.get_direction() != gst::PadDirection::Sink { + if gst_pad.direction() != gst::PadDirection::Sink { panic!("Wrong pad direction for PadSink"); } diff --git a/generic/threadshare/src/socket.rs b/generic/threadshare/src/socket.rs index 522725d30..2e7046749 100644 --- a/generic/threadshare/src/socket.rs +++ b/generic/threadshare/src/socket.rs @@ -141,7 +141,7 @@ impl<T: SocketRead> Socket<T> { { Ok((len, saddr)) => { let dts = if T::DO_TIMESTAMP { - let time = self.clock.as_ref().unwrap().get_time(); + let time = self.clock.as_ref().unwrap().time(); let running_time = time - self.base_time.unwrap(); gst_debug!( SOCKET_CAT, @@ -160,7 +160,7 @@ impl<T: SocketRead> Socket<T> { let mut buffer = self.mapped_buffer.take().unwrap().into_buffer(); { let buffer = buffer.get_mut().unwrap(); - if len < buffer.get_size() { + if len < buffer.size() { buffer.set_size(len); } buffer.set_dts(dts); @@ -226,7 +226,7 @@ impl GioSocketWrapper { socket.set_option(IPPROTO_IP, IP_TOS, tos)?; - if socket.get_family() == gio::SocketFamily::Ipv6 { + if socket.family() == gio::SocketFamily::Ipv6 { socket.set_option(IPPROTO_IPV6, IPV6_TCLASS, tos)?; } diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs index b0d4999d8..86ed5b69a 100644 --- a/generic/threadshare/src/tcpclientsrc/imp.rs +++ b/generic/threadshare/src/tcpclientsrc/imp.rs @@ -174,7 +174,7 @@ impl TcpClientSrcPadHandler { self.push_prelude(pad, element).await; - if buffer.get_size() == 0 { + if buffer.size() == 0 { pad.push_event(gst::event::Eos::new()).await; return Ok(gst::FlowSuccess::Ok); } @@ -236,11 +236,11 @@ impl PadSrcHandler for TcpClientSrcPadHandler { } QueryView::Caps(ref mut q) => { let caps = if let Some(caps) = self.0.configured_caps.lock().unwrap().as_ref() { - q.get_filter() + q.filter() .map(|f| f.intersect_with_mode(caps, gst::CapsIntersectMode::First)) .unwrap_or_else(|| caps.clone()) } else { - q.get_filter() + q.filter() .map(|f| f.to_owned()) .unwrap_or_else(gst::Caps::new_any) }; @@ -480,7 +480,7 @@ impl TcpClientSrc { let port = settings.port; let buffer_pool = gst::BufferPool::new(); - let mut config = buffer_pool.get_config(); + let mut config = buffer_pool.config(); config.set_params(None, settings.blocksize, 0, 0); buffer_pool.set_config(config).map_err(|_| { gst::error_msg!( @@ -631,7 +631,7 @@ impl ObjectImpl for TcpClientSrc { pspec: &glib::ParamSpec, ) { let mut settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "host" => { settings.host = value.get().expect("type checked upstream"); } @@ -659,7 +659,7 @@ impl ObjectImpl for TcpClientSrc { fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { let settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "host" => settings.host.to_value(), "port" => settings.port.to_value(), "caps" => settings.caps.to_value(), diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs index c9a1e519a..93b556bad 100644 --- a/generic/threadshare/src/udpsink/imp.rs +++ b/generic/threadshare/src/udpsink/imp.rs @@ -256,7 +256,7 @@ impl UdpSinkPadHandler { self.0.write().unwrap().add_client(gst_pad, addr); } - fn get_clients(&self) -> Vec<SocketAddr> { + fn clients(&self) -> Vec<SocketAddr> { (*self.0.read().unwrap().clients).clone() } @@ -411,7 +411,7 @@ impl UdpSinkPadHandler { if let Some(segment) = &inner.segment { if let Some(segment) = segment.downcast_ref::<gst::format::Time>() { - rtime = segment.to_running_time(buffer.get_pts()); + rtime = segment.to_running_time(buffer.pts()); if inner.latency.is_some() { rtime += inner.latency; } @@ -522,7 +522,7 @@ impl UdpSinkPadHandler { /* Wait until specified time */ async fn sync(&self, element: &super::UdpSink, running_time: gst::ClockTime) { - let now = element.get_current_running_time(); + let now = element.current_running_time(); if let Some(delay) = running_time .saturating_sub(now) @@ -538,10 +538,10 @@ impl UdpSinkPadHandler { let _ = element.post_message(gst::message::Eos::builder().src(element).build()); } EventView::Segment(e) => { - self.0.write().unwrap().segment = Some(e.get_segment().clone()); + self.0.write().unwrap().segment = Some(e.segment().clone()); } EventView::SinkMessage(e) => { - let _ = element.post_message(e.get_message()); + let _ = element.post_message(e.message()); } _ => (), } @@ -1193,7 +1193,7 @@ impl ObjectImpl for UdpSink { pspec: &glib::ParamSpec, ) { let mut settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "sync" => { settings.sync = value.get_some().expect("type checked upstream"); } @@ -1288,7 +1288,7 @@ impl ObjectImpl for UdpSink { fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { let settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "sync" => settings.sync.to_value(), "bind-address" => settings.bind_address.to_value(), "bind-port" => settings.bind_port.to_value(), @@ -1324,7 +1324,7 @@ impl ObjectImpl for UdpSink { let clients: Vec<String> = self .sink_pad_handler - .get_clients() + .clients() .iter() .map(ToString::to_string) .collect(); @@ -1410,7 +1410,7 @@ impl ElementImpl for UdpSink { fn send_event(&self, _element: &Self::Type, event: gst::Event) -> bool { match event.view() { EventView::Latency(ev) => { - self.sink_pad_handler.set_latency(ev.get_latency()); + self.sink_pad_handler.set_latency(ev.latency()); self.sink_pad.gst_pad().push_event(event) } EventView::Step(..) => false, diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs index 8e0e63f93..107bd50c6 100644 --- a/generic/threadshare/src/udpsrc/imp.rs +++ b/generic/threadshare/src/udpsrc/imp.rs @@ -249,11 +249,11 @@ impl PadSrcHandler for UdpSrcPadHandler { } QueryView::Caps(ref mut q) => { let caps = if let Some(caps) = self.0.configured_caps.lock().unwrap().as_ref() { - q.get_filter() + q.filter() .map(|f| f.intersect_with_mode(caps, gst::CapsIntersectMode::First)) .unwrap_or_else(|| caps.clone()) } else { - q.get_filter() + q.filter() .map(|f| f.to_owned()) .unwrap_or_else(gst::Caps::new_any) }; @@ -303,7 +303,7 @@ impl TaskImpl for UdpSrcTask { async move { gst_log!(CAT, obj: &self.element, "Starting task"); self.socket - .set_clock(self.element.get_clock(), Some(self.element.get_base_time())); + .set_clock(self.element.clock(), Some(self.element.base_time())); gst_log!(CAT, obj: &self.element, "Task started"); Ok(()) } @@ -609,7 +609,7 @@ impl UdpSrc { }; let buffer_pool = gst::BufferPool::new(); - let mut config = buffer_pool.get_config(); + let mut config = buffer_pool.config(); config.set_params(None, settings.mtu, 0, 0); buffer_pool.set_config(config).map_err(|err| { gst::error_msg!( @@ -806,7 +806,7 @@ impl ObjectImpl for UdpSrc { pspec: &glib::ParamSpec, ) { let mut settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "address" => { settings.address = value.get().expect("type checked upstream"); } @@ -849,7 +849,7 @@ impl ObjectImpl for UdpSrc { fn get_property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { let settings = self.settings.lock().unwrap(); - match pspec.get_name() { + match pspec.name() { "address" => settings.address.to_value(), "port" => settings.port.to_value(), "reuse" => settings.reuse.to_value(), diff --git a/generic/threadshare/tests/appsrc.rs b/generic/threadshare/tests/appsrc.rs index 1d99246fa..f11aae1a6 100644 --- a/generic/threadshare/tests/appsrc.rs +++ b/generic/threadshare/tests/appsrc.rs @@ -36,7 +36,7 @@ fn push() { let caps = gst::Caps::new_simple("foo/bar", &[]); { - let appsrc = h.get_element().unwrap(); + let appsrc = h.element().unwrap(); appsrc.set_property("caps", &caps).unwrap(); appsrc.set_property("do-timestamp", &true).unwrap(); appsrc.set_property("context", &"appsrc-push").unwrap(); @@ -45,7 +45,7 @@ fn push() { h.play(); { - let appsrc = h.get_element().unwrap(); + let appsrc = h.element().unwrap(); for _ in 0..3 { assert!(appsrc .emit_by_name("push-buffer", &[&gst::Buffer::new()]) @@ -78,7 +78,7 @@ fn push() { } EventView::Caps(ev) => { assert_eq!(n_events, 1); - let event_caps = ev.get_caps(); + let event_caps = ev.caps(); assert_eq!(caps.as_ref(), event_caps); } EventView::Segment(..) => { @@ -102,7 +102,7 @@ fn pause_regular() { let caps = gst::Caps::new_simple("foo/bar", &[]); { - let appsrc = h.get_element().unwrap(); + let appsrc = h.element().unwrap(); appsrc.set_property("caps", &caps).unwrap(); appsrc.set_property("do-timestamp", &true).unwrap(); appsrc.set_property("context", &"appsrc-pause").unwrap(); @@ -110,7 +110,7 @@ fn pause_regular() { h.play(); - let appsrc = h.get_element().unwrap(); + let appsrc = h.element().unwrap(); // Initial buffer assert!(appsrc @@ -172,7 +172,7 @@ fn flush_regular() { let caps = gst::Caps::new_simple("foo/bar", &[]); { - let appsrc = h.get_element().unwrap(); + let appsrc = h.element().unwrap(); appsrc.set_property("caps", &caps).unwrap(); appsrc.set_property("do-timestamp", &true).unwrap(); appsrc.set_property("context", &"appsrc-flush").unwrap(); @@ -180,7 +180,7 @@ fn flush_regular() { h.play(); - let appsrc = h.get_element().unwrap(); + let appsrc = h.element().unwrap(); // Initial buffer assert!(appsrc @@ -231,7 +231,7 @@ fn pause_flush() { let caps = gst::Caps::new_simple("foo/bar", &[]); { - let appsrc = h.get_element().unwrap(); + let appsrc = h.element().unwrap(); appsrc.set_property("caps", &caps).unwrap(); appsrc.set_property("do-timestamp", &true).unwrap(); appsrc @@ -241,7 +241,7 @@ fn pause_flush() { h.play(); - let appsrc = h.get_element().unwrap(); + let appsrc = h.element().unwrap(); // Initial buffer assert!(appsrc diff --git a/generic/threadshare/tests/inputselector.rs b/generic/threadshare/tests/inputselector.rs index cc7489f37..0af82fb4a 100644 --- a/generic/threadshare/tests/inputselector.rs +++ b/generic/threadshare/tests/inputselector.rs @@ -42,16 +42,16 @@ fn test_active_pad() { .unwrap() .get::<gst::Pad>() .unwrap(); - assert_eq!(active_pad, h1.get_srcpad().unwrap().get_peer()); + assert_eq!(active_pad, h1.srcpad().unwrap().peer()); - is.set_property("active-pad", &h2.get_srcpad().unwrap().get_peer()) + is.set_property("active-pad", &h2.srcpad().unwrap().peer()) .unwrap(); let active_pad = is .get_property("active-pad") .unwrap() .get::<gst::Pad>() .unwrap(); - assert_eq!(active_pad, h2.get_srcpad().unwrap().get_peer()); + assert_eq!(active_pad, h2.srcpad().unwrap().peer()); h1.set_src_caps_str("foo/bar"); h2.set_src_caps_str("foo/bar"); @@ -71,11 +71,11 @@ fn test_active_pad() { assert_eq!(h1.events_received(), 3); let event = h1.pull_event().unwrap(); - assert_eq!(event.get_type(), gst::EventType::StreamStart); + assert_eq!(event.type_(), gst::EventType::StreamStart); let event = h1.pull_event().unwrap(); - assert_eq!(event.get_type(), gst::EventType::Caps); + assert_eq!(event.type_(), gst::EventType::Caps); let event = h1.pull_event().unwrap(); - assert_eq!(event.get_type(), gst::EventType::Segment); + assert_eq!(event.type_(), gst::EventType::Segment); /* Push another buffer on the active pad, there should be no new events */ let buf = gst::Buffer::new(); @@ -86,17 +86,17 @@ fn test_active_pad() { /* Switch the active pad and push a buffer, we should receive stream-start, segment and caps * again */ let buf = gst::Buffer::new(); - is.set_property("active-pad", &h1.get_srcpad().unwrap().get_peer()) + is.set_property("active-pad", &h1.srcpad().unwrap().peer()) .unwrap(); assert_eq!(h1.push(buf), Ok(gst::FlowSuccess::Ok)); assert_eq!(h1.buffers_received(), 3); assert_eq!(h1.events_received(), 6); let event = h1.pull_event().unwrap(); - assert_eq!(event.get_type(), gst::EventType::StreamStart); + assert_eq!(event.type_(), gst::EventType::StreamStart); let event = h1.pull_event().unwrap(); - assert_eq!(event.get_type(), gst::EventType::Caps); + assert_eq!(event.type_(), gst::EventType::Caps); let event = h1.pull_event().unwrap(); - assert_eq!(event.get_type(), gst::EventType::Segment); + assert_eq!(event.type_(), gst::EventType::Segment); let _ = is.set_state(gst::State::Null); } diff --git a/generic/threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs index f4b949bba..d76731fa2 100644 --- a/generic/threadshare/tests/pad.rs +++ b/generic/threadshare/tests/pad.rs @@ -342,7 +342,7 @@ mod imp_src { value: &glib::Value, pspec: &glib::ParamSpec, ) { - match pspec.get_name() { + match pspec.name() { "context" => { let context = value .get() @@ -672,7 +672,7 @@ mod imp_sink { value: &glib::Value, pspec: &glib::ParamSpec, ) { - match pspec.get_name() { + match pspec.name() { "sender" => { let ItemSender { sender } = value .get::<&ItemSender>() diff --git a/generic/threadshare/tests/pipeline.rs b/generic/threadshare/tests/pipeline.rs index 7512f3048..df8175b7c 100644 --- a/generic/threadshare/tests/pipeline.rs +++ b/generic/threadshare/tests/pipeline.rs @@ -131,17 +131,17 @@ fn multiple_contexts_queue() { l_clone.quit(); }); - let bus = pipeline.get_bus().unwrap(); + let bus = pipeline.bus().unwrap(); let l_clone = l.clone(); bus.add_watch(move |_, msg| { use gst::MessageView; match msg.view() { MessageView::StateChanged(state_changed) => { - if let Some(source) = state_changed.get_src() { - if source.get_type() == gst::Pipeline::static_type() - && state_changed.get_old() == gst::State::Paused - && state_changed.get_current() == gst::State::Playing + if let Some(source) = state_changed.src() { + if source.type_() == gst::Pipeline::static_type() + && state_changed.old() == gst::State::Paused + && state_changed.current() == gst::State::Playing { if let Some(test_scenario) = test_scenario.take() { std::thread::spawn(test_scenario); @@ -153,9 +153,9 @@ fn multiple_contexts_queue() { gst_error!( CAT, "multiple_contexts_queue: Error from {:?}: {} ({:?})", - err.get_src().map(|s| s.get_path_string()), - err.get_error(), - err.get_debug() + err.src().map(|s| s.path_string()), + err.error(), + err.debug() ); l_clone.quit(); } @@ -290,17 +290,17 @@ fn multiple_contexts_proxy() { l_clone.quit(); }); - let bus = pipeline.get_bus().unwrap(); + let bus = pipeline.bus().unwrap(); let l_clone = l.clone(); bus.add_watch(move |_, msg| { use gst::MessageView; match msg.view() { MessageView::StateChanged(state_changed) => { - if let Some(source) = state_changed.get_src() { - if source.get_type() == gst::Pipeline::static_type() - && state_changed.get_old() == gst::State::Paused - && state_changed.get_current() == gst::State::Playing + if let Some(source) = state_changed.src() { + if source.type_() == gst::Pipeline::static_type() + && state_changed.old() == gst::State::Paused + && state_changed.current() == gst::State::Playing { if let Some(test_scenario) = test_scenario.take() { std::thread::spawn(test_scenario); @@ -312,9 +312,9 @@ fn multiple_contexts_proxy() { gst_error!( CAT, "multiple_contexts_proxy: Error from {:?}: {} ({:?})", - err.get_src().map(|s| s.get_path_string()), - err.get_error(), - err.get_debug() + err.src().map(|s| s.path_string()), + err.error(), + err.debug() ); l_clone.quit(); } @@ -422,19 +422,19 @@ fn eos() { let l_clone = l.clone(); pipeline - .get_bus() + .bus() .unwrap() .add_watch(move |_, msg| { use gst::MessageView; match msg.view() { MessageView::StateChanged(state_changed) => { - if let Some(source) = state_changed.get_src() { - if source.get_type() != gst::Pipeline::static_type() { + if let Some(source) = state_changed.src() { + if source.type_() != gst::Pipeline::static_type() { return glib::Continue(true); } - if state_changed.get_old() == gst::State::Paused - && state_changed.get_current() == gst::State::Playing + if state_changed.old() == gst::State::Paused + && state_changed.current() == gst::State::Playing { if let Some(scenario) = scenario.take() { std::thread::spawn(scenario); @@ -446,9 +446,9 @@ fn eos() { gst_error!( CAT, "eos: Error from {:?}: {} ({:?})", - err.get_src().map(|s| s.get_path_string()), - err.get_error(), - err.get_debug() + err.src().map(|s| s.path_string()), + err.error(), + err.debug() ); l_clone.quit(); } @@ -582,19 +582,19 @@ fn premature_shutdown() { let l_clone = l.clone(); pipeline - .get_bus() + .bus() .unwrap() .add_watch(move |_, msg| { use gst::MessageView; match msg.view() { MessageView::StateChanged(state_changed) => { - if let Some(source) = state_changed.get_src() { - if source.get_type() != gst::Pipeline::static_type() { + if let Some(source) = state_changed.src() { + if source.type_() != gst::Pipeline::static_type() { return glib::Continue(true); } - if state_changed.get_old() == gst::State::Paused - && state_changed.get_current() == gst::State::Playing + if state_changed.old() == gst::State::Paused + && state_changed.current() == gst::State::Playing { if let Some(scenario) = scenario.take() { std::thread::spawn(scenario); @@ -606,9 +606,9 @@ fn premature_shutdown() { gst_error!( CAT, "premature_shutdown: Error from {:?}: {} ({:?})", - err.get_src().map(|s| s.get_path_string()), - err.get_error(), - err.get_debug() + err.src().map(|s| s.path_string()), + err.error(), + err.debug() ); l_clone.quit(); } diff --git a/generic/threadshare/tests/proxy.rs b/generic/threadshare/tests/proxy.rs index 807175fc8..7e1b64e8b 100644 --- a/generic/threadshare/tests/proxy.rs +++ b/generic/threadshare/tests/proxy.rs @@ -73,7 +73,7 @@ fn test_push() { pipeline.set_state(gst::State::Playing).unwrap(); let mut eos = false; - let bus = pipeline.get_bus().unwrap(); + let bus = pipeline.bus().unwrap(); while let Some(msg) = bus.timed_pop(5 * gst::SECOND) { use gst::MessageView; match msg.view() { @@ -91,7 +91,7 @@ fn test_push() { assert_eq!(samples.len(), 3); for sample in samples.iter() { - assert!(sample.get_buffer().is_some()); + assert!(sample.buffer().is_some()); } pipeline.set_state(gst::State::Null).unwrap(); @@ -121,8 +121,8 @@ fn test_from_pipeline_to_pipeline() { pipe_1.set_state(gst::State::Paused).unwrap(); pipe_2.set_state(gst::State::Paused).unwrap(); - let _ = pipe_1.get_state(gst::CLOCK_TIME_NONE); - let _ = pipe_2.get_state(gst::CLOCK_TIME_NONE); + let _ = pipe_1.state(gst::CLOCK_TIME_NONE); + let _ = pipe_2.state(gst::CLOCK_TIME_NONE); pipe_1.set_state(gst::State::Null).unwrap(); diff --git a/generic/threadshare/tests/queue.rs b/generic/threadshare/tests/queue.rs index cb8535026..4d6e3e6ca 100644 --- a/generic/threadshare/tests/queue.rs +++ b/generic/threadshare/tests/queue.rs @@ -68,7 +68,7 @@ fn test_push() { pipeline.set_state(gst::State::Playing).unwrap(); let mut eos = false; - let bus = pipeline.get_bus().unwrap(); + let bus = pipeline.bus().unwrap(); while let Some(msg) = bus.timed_pop(5 * gst::SECOND) { use gst::MessageView; match msg.view() { @@ -86,7 +86,7 @@ fn test_push() { assert_eq!(samples.len(), 3); for sample in samples.iter() { - assert!(sample.get_buffer().is_some()); + assert!(sample.buffer().is_some()); } pipeline.set_state(gst::State::Null).unwrap(); diff --git a/generic/threadshare/tests/tcpclientsrc.rs b/generic/threadshare/tests/tcpclientsrc.rs index 7ad030261..83e0f91ab 100644 --- a/generic/threadshare/tests/tcpclientsrc.rs +++ b/generic/threadshare/tests/tcpclientsrc.rs @@ -92,7 +92,7 @@ fn test_push() { pipeline.set_state(gst::State::Playing).unwrap(); let mut eos = false; - let bus = pipeline.get_bus().unwrap(); + let bus = pipeline.bus().unwrap(); while let Some(msg) = bus.timed_pop(5 * gst::SECOND) { use gst::MessageView; match msg.view() { @@ -108,12 +108,12 @@ fn test_push() { assert!(eos); let samples = samples.lock().unwrap(); for sample in samples.iter() { - assert_eq!(Some(caps.as_ref()), sample.get_caps()); + assert_eq!(Some(caps.as_ref()), sample.caps()); } - let total_received_size = samples.iter().fold(0, |acc, sample| { - acc + sample.get_buffer().unwrap().get_size() - }); + let total_received_size = samples + .iter() + .fold(0, |acc, sample| acc + sample.buffer().unwrap().size()); assert_eq!(total_received_size, 3 * 160); pipeline.set_state(gst::State::Null).unwrap(); diff --git a/generic/threadshare/tests/udpsink.rs b/generic/threadshare/tests/udpsink.rs index ec04207dd..823ede1cb 100644 --- a/generic/threadshare/tests/udpsink.rs +++ b/generic/threadshare/tests/udpsink.rs @@ -34,7 +34,7 @@ fn test_client_management() { init(); let h = gst_check::Harness::new("ts-udpsink"); - let udpsink = h.get_element().unwrap(); + let udpsink = h.element().unwrap(); let clients = udpsink .get_property("clients") @@ -132,7 +132,7 @@ fn test_chain() { let mut h = gst_check::Harness::new("ts-udpsink"); h.set_src_caps_str(&"foo/bar"); { - let udpsink = h.get_element().unwrap(); + let udpsink = h.element().unwrap(); udpsink.set_property("clients", &"127.0.0.1:5005").unwrap(); } diff --git a/generic/threadshare/tests/udpsrc.rs b/generic/threadshare/tests/udpsrc.rs index 18c074bce..cb05581d7 100644 --- a/generic/threadshare/tests/udpsrc.rs +++ b/generic/threadshare/tests/udpsrc.rs @@ -37,7 +37,7 @@ fn test_push() { let caps = gst::Caps::new_simple("foo/bar", &[]); { - let udpsrc = h.get_element().unwrap(); + let udpsrc = h.element().unwrap(); udpsrc.set_property("caps", &caps).unwrap(); udpsrc.set_property("port", &5000i32).unwrap(); udpsrc.set_property("context", &"test-push").unwrap(); @@ -66,7 +66,7 @@ fn test_push() { for _ in 0..3 { let buffer = h.pull().unwrap(); - assert_eq!(buffer.get_size(), 160); + assert_eq!(buffer.size(), 160); } let mut n_events = 0; @@ -80,7 +80,7 @@ fn test_push() { } EventView::Caps(ev) => { assert_eq!(n_events, 1); - let event_caps = ev.get_caps(); + let event_caps = ev.caps(); assert_eq!(caps.as_ref(), event_caps); } EventView::Segment(..) => { @@ -104,7 +104,7 @@ fn test_socket_reuse() { let mut ts_src_h2 = gst_check::Harness::new("ts-udpsrc"); { - let udpsrc = ts_src_h.get_element().unwrap(); + let udpsrc = ts_src_h.element().unwrap(); udpsrc.set_property("port", &6000i32).unwrap(); udpsrc .set_property("context", &"test-socket-reuse") @@ -113,14 +113,14 @@ fn test_socket_reuse() { ts_src_h.play(); { - let udpsrc = ts_src_h.get_element().unwrap(); + let udpsrc = ts_src_h.element().unwrap(); let socket = udpsrc .get_property("used-socket") .unwrap() .get::<gio::Socket>() .unwrap(); - let udpsink = sink_h.get_element().unwrap(); + let udpsink = sink_h.element().unwrap(); udpsink.set_property("socket", &socket).unwrap(); udpsink.set_property("host", &"127.0.0.1").unwrap(); udpsink.set_property("port", &6001i32).unwrap(); @@ -129,7 +129,7 @@ fn test_socket_reuse() { sink_h.set_src_caps_str("application/test"); { - let udpsrc = ts_src_h2.get_element().unwrap(); + let udpsrc = ts_src_h2.element().unwrap(); udpsrc.set_property("port", &6001i32).unwrap(); udpsrc .set_property("context", &"test-socket-reuse") @@ -161,6 +161,6 @@ fn test_socket_reuse() { sink_h.push(buffer).unwrap(); let buffer = ts_src_h2.pull().unwrap(); - assert_eq!(buffer.get_size(), 160); + assert_eq!(buffer.size(), 160); } } |