mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2025-09-02 09:53:49 +00:00
Code Issues Projects Releases Wiki Activity

gst: fixes for Clock non-optional return types

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1739>
This commit is contained in:
François Laignel 2025-06-17 15:11:23 +02:00
parent d2bc24f085
commit 3a67d56d78
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gstreamer/src/clock.rs
View file

@ -569,7 +569,7 @@ mod tests {
crate::init().unwrap(); crate::init().unwrap();
let clock = SystemClock::obtain(); let clock = SystemClock::obtain();
let now = clock.time().unwrap(); let now = clock.time();
let id = clock.new_single_shot_id(now + 20 * ClockTime::MSECOND); let id = clock.new_single_shot_id(now + 20 * ClockTime::MSECOND);
let (res, _) = id.wait(); let (res, _) = id.wait();
@ -583,7 +583,7 @@ mod tests {
let (sender, receiver) = channel(); let (sender, receiver) = channel();
let clock = SystemClock::obtain(); let clock = SystemClock::obtain();
let now = clock.time().unwrap(); let now = clock.time();
let id = clock.new_single_shot_id(now + 20 * ClockTime::MSECOND); let id = clock.new_single_shot_id(now + 20 * ClockTime::MSECOND);
let res = id.wait_async(move |_, _, _| { let res = id.wait_async(move |_, _, _| {
sender.send(()).unwrap(); sender.send(()).unwrap();
@ -599,7 +599,7 @@ mod tests {
crate::init().unwrap(); crate::init().unwrap();
let clock = SystemClock::obtain(); let clock = SystemClock::obtain();
let now = clock.time().unwrap(); let now = clock.time();
let id = clock.new_periodic_id(now + 20 * ClockTime::MSECOND, 20 * ClockTime::MSECOND); let id = clock.new_periodic_id(now + 20 * ClockTime::MSECOND, 20 * ClockTime::MSECOND);
let (res, _) = id.wait(); let (res, _) = id.wait();
@ -616,7 +616,7 @@ mod tests {
let (sender, receiver) = channel(); let (sender, receiver) = channel();
let clock = SystemClock::obtain(); let clock = SystemClock::obtain();
let now = clock.time().unwrap(); let now = clock.time();
let id = clock.new_periodic_id(now + 20 * ClockTime::MSECOND, 20 * ClockTime::MSECOND); let id = clock.new_periodic_id(now + 20 * ClockTime::MSECOND, 20 * ClockTime::MSECOND);
let res = id.wait_async(move |_, _, _| { let res = id.wait_async(move |_, _, _| {
let _ = sender.send(()); let _ = sender.send(());

6
gstreamer/src/element.rs
View file

@ -701,11 +701,7 @@ pub trait ElementExtManual: IsA<Element> + 'static {
#[doc(alias = "get_current_clock_time")] #[doc(alias = "get_current_clock_time")]
#[doc(alias = "gst_element_get_current_clock_time")] #[doc(alias = "gst_element_get_current_clock_time")]
fn current_clock_time(&self) -> Option<crate::ClockTime> { fn current_clock_time(&self) -> Option<crate::ClockTime> {
if let Some(clock) = self.clock() { self.clock().as_ref().map(crate::Clock::time)
clock.time()
} else {
crate::ClockTime::NONE
}
} }
#[doc(alias = "gst_element_get_request_pad")] #[doc(alias = "gst_element_get_request_pad")]