diff --git a/gstreamer/src/clock.rs b/gstreamer/src/clock.rs index ecd0fa66f..b494f6c48 100644 --- a/gstreamer/src/clock.rs +++ b/gstreamer/src/clock.rs @@ -88,7 +88,7 @@ impl ClockId { #[doc(alias = "GST_CLOCK_ENTRY_TYPE")] pub fn type_(&self) -> ClockEntryType { unsafe { - let ptr: *mut ffi::GstClockEntry = self.to_glib_none().0 as *mut _; + let ptr = self.as_ptr() as *mut ffi::GstClockEntry; from_glib((*ptr).type_) } } @@ -97,7 +97,7 @@ impl ClockId { #[doc(alias = "GST_CLOCK_ENTRY_STATUS")] pub fn status(&self) -> &AtomicClockReturn { unsafe { - let ptr: *mut ffi::GstClockEntry = self.to_glib_none().0 as *mut _; + let ptr = self.as_ptr() as *mut ffi::GstClockEntry; &*((&(*ptr).status) as *const i32 as *const AtomicClockReturn) } } @@ -249,7 +249,7 @@ impl PeriodicClockId { #[doc(alias = "GST_CLOCK_ENTRY_INTERVAL")] pub fn interval(&self) -> ClockTime { unsafe { - let ptr: *mut ffi::GstClockEntry = self.to_glib_none().0 as *mut _; + let ptr = self.as_ptr() as *mut ffi::GstClockEntry; try_from_glib((*ptr).interval).expect("undefined interval") } } diff --git a/gstreamer/src/param_spec.rs b/gstreamer/src/param_spec.rs index ed4243dce..ad323ccb5 100644 --- a/gstreamer/src/param_spec.rs +++ b/gstreamer/src/param_spec.rs @@ -72,7 +72,7 @@ impl ParamSpecFraction { pub fn minimum(&self) -> crate::Fraction { unsafe { - let ptr = self.to_glib_none().0; + let ptr = self.as_ptr(); crate::Fraction::new((*ptr).min_num, (*ptr).min_den) } @@ -80,7 +80,7 @@ impl ParamSpecFraction { pub fn maximum(&self) -> crate::Fraction { unsafe { - let ptr = self.to_glib_none().0; + let ptr = self.as_ptr(); crate::Fraction::new((*ptr).max_num, (*ptr).max_den) } @@ -88,14 +88,19 @@ impl ParamSpecFraction { pub fn default_value(&self) -> crate::Fraction { unsafe { - let ptr = self.to_glib_none().0; + let ptr = self.as_ptr(); crate::Fraction::new((*ptr).def_num, (*ptr).def_den) } } pub fn upcast(self) -> ParamSpec { - unsafe { from_glib_full(self.to_glib_full() as *mut gobject_ffi::GParamSpec) } + unsafe { + from_glib_full( + IntoGlibPtr::<*mut ffi::GstParamSpecFraction>::into_glib_ptr(self) + as *mut gobject_ffi::GParamSpec, + ) + } } pub fn upcast_ref(&self) -> &ParamSpec { @@ -238,14 +243,19 @@ impl ParamSpecArray { pub fn element_spec(&self) -> Option { unsafe { - let ptr = self.to_glib_none().0; + let ptr = self.as_ptr(); from_glib_none((*ptr).element_spec) } } pub fn upcast(self) -> ParamSpec { - unsafe { from_glib_full(self.to_glib_full() as *mut gobject_ffi::GParamSpec) } + unsafe { + from_glib_full( + IntoGlibPtr::<*mut ffi::GstParamSpecArray>::into_glib_ptr(self) + as *mut gobject_ffi::GParamSpec, + ) + } } pub fn upcast_ref(&self) -> &ParamSpec { diff --git a/gstreamer/src/subclass/clock.rs b/gstreamer/src/subclass/clock.rs index 3480c415f..e3f9d0a50 100644 --- a/gstreamer/src/subclass/clock.rs +++ b/gstreamer/src/subclass/clock.rs @@ -151,7 +151,7 @@ impl ClockImplExt for T { .map(|f| { f( clock.unsafe_cast_ref::().to_glib_none().0, - id.to_glib_none().0 as *mut ffi::GstClockEntry, + id.as_ptr() as *mut ffi::GstClockEntry, &mut jitter, ) }) @@ -176,7 +176,7 @@ impl ClockImplExt for T { .map(|f| { f( clock.unsafe_cast_ref::().to_glib_none().0, - id.to_glib_none().0 as *mut ffi::GstClockEntry, + id.as_ptr() as *mut ffi::GstClockEntry, ) }) .unwrap_or(ffi::GST_CLOCK_UNSUPPORTED), @@ -191,7 +191,7 @@ impl ClockImplExt for T { if let Some(func) = (*parent_class).unschedule { func( clock.unsafe_cast_ref::().to_glib_none().0, - id.to_glib_none().0 as *mut ffi::GstClockEntry, + id.as_ptr() as *mut ffi::GstClockEntry, ); } } @@ -209,14 +209,14 @@ impl ClockImplExt for T { assert!(id.uses_clock(&clock)); } else { unsafe { - let ptr: *mut ffi::GstClockEntry = id.to_glib_none().0 as *mut _; + let ptr = id.as_ptr() as *mut ffi::GstClockEntry; assert_eq!((*ptr).clock, clock.as_ref().to_glib_none().0); } } } unsafe { - let ptr: *mut ffi::GstClockEntry = id.to_glib_none().0 as *mut _; + let ptr = id.as_ptr() as *mut ffi::GstClockEntry; if let Some(func) = (*ptr).func { func( clock.as_ref().to_glib_none().0,