rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

Add Bus::add_watch_local() without Send bound on the closure

Browse source 
This panics if not called from the thread that owns the main context.
This commit is contained in:
Sebastian Dröge 2019-02-10 11:43:55 +02:00
parent ae1455e4d6
commit 09ad177315
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gstreamer/src/bus.rs
View file

@ -20,25 +20,23 @@ use Bus;
use BusSyncReply; use BusSyncReply;
use Message; use Message;
unsafe extern "C" fn trampoline_watch<F: FnMut(&Bus, &Message) -> Continue + Send + 'static>( unsafe extern "C" fn trampoline_watch<F: FnMut(&Bus, &Message) -> Continue + 'static>(
bus: *mut ffi::GstBus, bus: *mut ffi::GstBus,
msg: *mut ffi::GstMessage, msg: *mut ffi::GstMessage,
func: gpointer, func: gpointer,
) -> gboolean { ) -> gboolean {
#[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))] #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))]
let func: &RefCell<F> = transmute(func); let func: &RefCell<F> = &*(func as *const RefCell<F>);
(&mut *func.borrow_mut())(&from_glib_borrow(bus), &Message::from_glib_borrow(msg)).to_glib() (&mut *func.borrow_mut())(&from_glib_borrow(bus), &Message::from_glib_borrow(msg)).to_glib()
} }
unsafe extern "C" fn destroy_closure_watch< unsafe extern "C" fn destroy_closure_watch<F: FnMut(&Bus, &Message) -> Continue + 'static>(
F: FnMut(&Bus, &Message) -> Continue + Send + 'static,
>(
ptr: gpointer, ptr: gpointer,
) { ) {
Box::<RefCell<F>>::from_raw(ptr as *mut _); Box::<RefCell<F>>::from_raw(ptr as *mut _);
} }
fn into_raw_watch<F: FnMut(&Bus, &Message) -> Continue + Send + 'static>(func: F) -> gpointer { fn into_raw_watch<F: FnMut(&Bus, &Message) -> Continue + 'static>(func: F) -> gpointer {
#[cfg_attr(feature = "cargo-clippy", allow(type_complexity))] #[cfg_attr(feature = "cargo-clippy", allow(type_complexity))]
let func: Box<RefCell<F>> = Box::new(RefCell::new(func)); let func: Box<RefCell<F>> = Box::new(RefCell::new(func));
Box::into_raw(func) as gpointer Box::into_raw(func) as gpointer
@ -52,7 +50,7 @@ unsafe extern "C" fn trampoline_sync<
func: gpointer, func: gpointer,
) -> ffi::GstBusSyncReply { ) -> ffi::GstBusSyncReply {
#[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))] #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))]
let f: &F = transmute(func); let f: &F = &*(func as *const F);
let res = f(&from_glib_borrow(bus), &Message::from_glib_borrow(msg)).to_glib(); let res = f(&from_glib_borrow(bus), &Message::from_glib_borrow(msg)).to_glib();
if res == ffi::GST_BUS_DROP { if res == ffi::GST_BUS_DROP {
@ -128,6 +126,23 @@ impl Bus {
} }
} }
pub fn add_watch_local<F>(&self, func: F) -> SourceId
where
F: FnMut(&Bus, &Message) -> Continue + 'static,
{
unsafe {
assert!(glib::MainContext::ref_thread_default().is_owner());
from_glib(ffi::gst_bus_add_watch_full(
self.to_glib_none().0,
glib_ffi::G_PRIORITY_DEFAULT,
Some(trampoline_watch::<F>),
into_raw_watch(func),
Some(destroy_closure_watch::<F>),
))
}
}
pub fn set_sync_handler<F>(&self, func: F) pub fn set_sync_handler<F>(&self, func: F)
where where
F: Fn(&Bus, &Message) -> BusSyncReply + Send + Sync + 'static, F: Fn(&Bus, &Message) -> BusSyncReply + Send + Sync + 'static,