mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-12-22 08:07:07 +00:00
Code Issues Projects Releases Wiki Activity

net: fix faillible PtpClock::new()

Browse source 
`PtpClock::new()` can fail in which case it panicked due to an assertion
failure. This commit makes it return a `Result` instead.

Also sets the `name` argument optional, similar to what is done for `NtpClock`.

See also: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6251

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1405>
This commit is contained in:
François Laignel 2024-03-01 17:39:39 +01:00
parent 353e3d1611
commit ffad1188b9
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gstreamer-net/Gir.toml
View file

@ -57,3 +57,14 @@ final_type = true
name = "GstNet.PtpClock"
status = "generate"
final_type = true
[[object.function]]
name = "new"
[[object.function.parameter]]
name = "name"
# See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6251
nullable = true
[object.function.return]
# See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6251
nullable = true
nullable_return_is_error = "Can't create gst::PtpClock"

10
gstreamer-net/src/auto/ptp_clock.rs
View file

@ -21,11 +21,15 @@ glib::wrapper! {
impl PtpClock {
#[doc(alias = "gst_ptp_clock_new")]
pub fn new(name: &str, domain: u32) -> PtpClock {
pub fn new(name: Option<&str>, domain: u32) -> Result<PtpClock, glib::BoolError> {
assert_initialized_main_thread!();
unsafe {
gst::Clock::from_glib_full(ffi::gst_ptp_clock_new(name.to_glib_none().0, domain))
.unsafe_cast()
Option::<gst::Clock>::from_glib_full(ffi::gst_ptp_clock_new(
name.to_glib_none().0,
domain,
))
.map(|o| o.unsafe_cast())
.ok_or_else(|| glib::bool_error!("Can't create gst::PtpClock"))
}
}