diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2020-11-22 17:24:55 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2020-11-23 11:28:33 +0300 |
commit | 1c9c22df0c6a6aeb7071f52efbba03d8f1d9a2cd (patch) | |
tree | ec5781a5940259a9f443fa5d12424b54a9cea220 /generic/threadshare/src/lib.rs | |
parent | 684f52b7d4b262079d819bf61ddc287ae325151c (diff) |
generic: Update to 2018 edition
Diffstat (limited to 'generic/threadshare/src/lib.rs')
-rw-r--r-- | generic/threadshare/src/lib.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/generic/threadshare/src/lib.rs b/generic/threadshare/src/lib.rs index 1264cbf56..438d36c2e 100644 --- a/generic/threadshare/src/lib.rs +++ b/generic/threadshare/src/lib.rs @@ -41,10 +41,8 @@ mod proxy; mod queue; use glib::translate::*; -use glib_sys as glib_ffi; use gst::gst_plugin_define; -use gstreamer_sys as gst_ffi; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { udpsrc::register(plugin)?; @@ -76,19 +74,19 @@ pub fn set_element_flags<T: glib::IsA<gst::Object> + glib::IsA<gst::Element>>( flags: gst::ElementFlags, ) { unsafe { - let ptr: *mut gst_ffi::GstObject = element.as_ptr() as *mut _; + let ptr: *mut gst::ffi::GstObject = element.as_ptr() as *mut _; let _guard = MutexGuard::lock(&(*ptr).lock); (*ptr).flags |= flags.to_glib(); } } #[must_use = "if unused the Mutex will immediately unlock"] -struct MutexGuard<'a>(&'a glib_ffi::GMutex); +struct MutexGuard<'a>(&'a glib::ffi::GMutex); impl<'a> MutexGuard<'a> { - pub fn lock(mutex: &'a glib_ffi::GMutex) -> Self { + pub fn lock(mutex: &'a glib::ffi::GMutex) -> Self { unsafe { - glib_ffi::g_mutex_lock(mut_override(mutex)); + glib::ffi::g_mutex_lock(mut_override(mutex)); } MutexGuard(mutex) } @@ -97,7 +95,7 @@ impl<'a> MutexGuard<'a> { impl<'a> Drop for MutexGuard<'a> { fn drop(&mut self) { unsafe { - glib_ffi::g_mutex_unlock(mut_override(self.0)); + glib::ffi::g_mutex_unlock(mut_override(self.0)); } } } |