From 3b0e6843e26da4975e7643446da9ec60516d6017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 9 Sep 2017 16:01:32 +0300 Subject: [PATCH] Regenerate everything with latest GIR --- gstreamer-app/src/app_sink.rs | 6 +- gstreamer-app/src/app_src.rs | 6 +- gstreamer-app/src/auto/app_sink.rs | 43 +++--- gstreamer-app/src/auto/app_src.rs | 67 +++++----- gstreamer-app/src/auto/enums.rs | 2 +- gstreamer-app/src/auto/flags.rs | 2 +- gstreamer-app/src/auto/mod.rs | 2 +- gstreamer-audio/src/auto/enums.rs | 2 +- gstreamer-audio/src/auto/flags.rs | 2 +- gstreamer-audio/src/auto/mod.rs | 2 +- gstreamer-audio/src/auto/stream_volume.rs | 15 ++- gstreamer-player/src/auto/enums.rs | 2 +- gstreamer-player/src/auto/flags.rs | 2 +- gstreamer-player/src/auto/mod.rs | 2 +- gstreamer-player/src/auto/player.rs | 123 +++++++++--------- .../src/auto/player_audio_info.rs | 2 +- ...player_g_main_context_signal_dispatcher.rs | 7 +- .../src/auto/player_media_info.rs | 2 +- .../src/auto/player_signal_dispatcher.rs | 2 +- .../src/auto/player_stream_info.rs | 2 +- .../src/auto/player_subtitle_info.rs | 2 +- .../src/auto/player_video_info.rs | 2 +- .../player_video_overlay_video_renderer.rs | 11 +- .../src/auto/player_video_renderer.rs | 2 +- .../src/auto/player_visualization.rs | 2 +- gstreamer-video/src/auto/enums.rs | 2 +- gstreamer-video/src/auto/flags.rs | 2 +- gstreamer-video/src/auto/mod.rs | 2 +- gstreamer-video/src/auto/video_overlay.rs | 2 +- gstreamer/src/auto/alias.rs | 2 +- gstreamer/src/auto/bin.rs | 45 +++---- gstreamer/src/auto/bus.rs | 15 ++- gstreamer/src/auto/child_proxy.rs | 15 ++- gstreamer/src/auto/clock.rs | 27 ++-- gstreamer/src/auto/date_time.rs | 2 +- gstreamer/src/auto/device.rs | 33 ++--- gstreamer/src/auto/device_monitor.rs | 9 +- gstreamer/src/auto/device_provider.rs | 15 ++- gstreamer/src/auto/device_provider_factory.rs | 2 +- gstreamer/src/auto/element.rs | 21 +-- gstreamer/src/auto/element_factory.rs | 2 +- gstreamer/src/auto/enums.rs | 2 +- gstreamer/src/auto/flags.rs | 2 +- gstreamer/src/auto/functions.rs | 2 +- gstreamer/src/auto/ghost_pad.rs | 2 +- gstreamer/src/auto/mod.rs | 2 +- gstreamer/src/auto/object.rs | 19 +-- gstreamer/src/auto/pad.rs | 39 +++--- gstreamer/src/auto/pad_template.rs | 23 ++-- gstreamer/src/auto/pipeline.rs | 21 +-- gstreamer/src/auto/plugin.rs | 2 +- gstreamer/src/auto/preset.rs | 2 +- gstreamer/src/auto/proxy_pad.rs | 2 +- gstreamer/src/auto/stream.rs | 23 ++-- gstreamer/src/auto/stream_collection.rs | 9 +- gstreamer/src/auto/system_clock.rs | 9 +- gstreamer/src/auto/tag_setter.rs | 2 +- gstreamer/src/auto/toc_setter.rs | 2 +- gstreamer/src/auto/u_r_i_handler.rs | 2 +- gstreamer/src/bus.rs | 4 +- gstreamer/src/clock.rs | 2 +- gstreamer/src/pad.rs | 4 +- 62 files changed, 352 insertions(+), 331 deletions(-) diff --git a/gstreamer-app/src/app_sink.rs b/gstreamer-app/src/app_sink.rs index 275f66ac0..ba131389b 100644 --- a/gstreamer-app/src/app_sink.rs +++ b/gstreamer-app/src/app_sink.rs @@ -54,7 +54,7 @@ unsafe extern "C" fn trampoline_eos(appsink: *mut ffi::GstAppSink, callbacks: gp let _guard = CallbackGuard::new(); let callbacks = &*(callbacks as *const AppSinkCallbacks); - (callbacks.eos)(&from_glib_none(appsink)); + (callbacks.eos)(&from_glib_borrow(appsink)); } unsafe extern "C" fn trampoline_new_preroll( @@ -64,7 +64,7 @@ unsafe extern "C" fn trampoline_new_preroll( let _guard = CallbackGuard::new(); let callbacks = &*(callbacks as *const AppSinkCallbacks); - (callbacks.new_preroll)(&from_glib_none(appsink)).to_glib() + (callbacks.new_preroll)(&from_glib_borrow(appsink)).to_glib() } unsafe extern "C" fn trampoline_new_sample( @@ -74,7 +74,7 @@ unsafe extern "C" fn trampoline_new_sample( let _guard = CallbackGuard::new(); let callbacks = &*(callbacks as *const AppSinkCallbacks); - (callbacks.new_sample)(&from_glib_none(appsink)).to_glib() + (callbacks.new_sample)(&from_glib_borrow(appsink)).to_glib() } unsafe extern "C" fn destroy_callbacks(ptr: gpointer) { diff --git a/gstreamer-app/src/app_src.rs b/gstreamer-app/src/app_src.rs index 9d23afa57..cbfaad82e 100644 --- a/gstreamer-app/src/app_src.rs +++ b/gstreamer-app/src/app_src.rs @@ -57,14 +57,14 @@ unsafe extern "C" fn trampoline_need_data( let _guard = CallbackGuard::new(); let callbacks = &*(callbacks as *const AppSrcCallbacks); - (callbacks.need_data)(&from_glib_none(appsrc), length); + (callbacks.need_data)(&from_glib_borrow(appsrc), length); } unsafe extern "C" fn trampoline_enough_data(appsrc: *mut ffi::GstAppSrc, callbacks: gpointer) { let _guard = CallbackGuard::new(); let callbacks = &*(callbacks as *const AppSrcCallbacks); - (callbacks.enough_data)(&from_glib_none(appsrc)); + (callbacks.enough_data)(&from_glib_borrow(appsrc)); } unsafe extern "C" fn trampoline_seek_data( @@ -75,7 +75,7 @@ unsafe extern "C" fn trampoline_seek_data( let _guard = CallbackGuard::new(); let callbacks = &*(callbacks as *const AppSrcCallbacks); - (callbacks.seek_data)(&from_glib_none(appsrc), offset).to_glib() + (callbacks.seek_data)(&from_glib_borrow(appsrc), offset).to_glib() } unsafe extern "C" fn destroy_callbacks(ptr: gpointer) { diff --git a/gstreamer-app/src/auto/app_sink.rs b/gstreamer-app/src/auto/app_sink.rs index ac64ef2a5..94cd38f19 100644 --- a/gstreamer-app/src/auto/app_sink.rs +++ b/gstreamer-app/src/auto/app_sink.rs @@ -1,8 +1,9 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; use glib::Value; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -158,7 +159,7 @@ impl AppSink { value.get().unwrap() } - pub fn connect_eos(&self, f: F) -> u64 { + pub fn connect_eos(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "eos", @@ -166,7 +167,7 @@ impl AppSink { } } - pub fn connect_new_preroll gst::FlowReturn + Send + Sync + 'static>(&self, f: F) -> u64 { + pub fn connect_new_preroll gst::FlowReturn + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_ gst::FlowReturn + Send + Sync + 'static>> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "new-preroll", @@ -174,7 +175,7 @@ impl AppSink { } } - pub fn connect_new_sample gst::FlowReturn + Send + Sync + 'static>(&self, f: F) -> u64 { + pub fn connect_new_sample gst::FlowReturn + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_ gst::FlowReturn + Send + Sync + 'static>> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "new-sample", @@ -182,7 +183,7 @@ impl AppSink { } } - pub fn connect_property_buffer_list_notify(&self, f: F) -> u64 { + pub fn connect_property_buffer_list_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::buffer-list", @@ -190,7 +191,7 @@ impl AppSink { } } - pub fn connect_property_caps_notify(&self, f: F) -> u64 { + pub fn connect_property_caps_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::caps", @@ -198,7 +199,7 @@ impl AppSink { } } - pub fn connect_property_drop_notify(&self, f: F) -> u64 { + pub fn connect_property_drop_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::drop", @@ -206,7 +207,7 @@ impl AppSink { } } - pub fn connect_property_emit_signals_notify(&self, f: F) -> u64 { + pub fn connect_property_emit_signals_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::emit-signals", @@ -214,7 +215,7 @@ impl AppSink { } } - pub fn connect_property_eos_notify(&self, f: F) -> u64 { + pub fn connect_property_eos_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::eos", @@ -222,7 +223,7 @@ impl AppSink { } } - pub fn connect_property_max_buffers_notify(&self, f: F) -> u64 { + pub fn connect_property_max_buffers_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::max-buffers", @@ -230,7 +231,7 @@ impl AppSink { } } - pub fn connect_property_wait_on_eos_notify(&self, f: F) -> u64 { + pub fn connect_property_wait_on_eos_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::wait-on-eos", @@ -245,59 +246,59 @@ unsafe impl Sync for AppSink {} unsafe extern "C" fn eos_trampoline(this: *mut ffi::GstAppSink, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn new_preroll_trampoline(this: *mut ffi::GstAppSink, f: glib_ffi::gpointer) -> gst_ffi::GstFlowReturn { callback_guard!(); let f: &&(Fn(&AppSink) -> gst::FlowReturn + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)).to_glib() + f(&from_glib_borrow(this)).to_glib() } unsafe extern "C" fn new_sample_trampoline(this: *mut ffi::GstAppSink, f: glib_ffi::gpointer) -> gst_ffi::GstFlowReturn { callback_guard!(); let f: &&(Fn(&AppSink) -> gst::FlowReturn + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)).to_glib() + f(&from_glib_borrow(this)).to_glib() } unsafe extern "C" fn notify_buffer_list_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_caps_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_drop_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_emit_signals_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_eos_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_max_buffers_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_wait_on_eos_trampoline(this: *mut ffi::GstAppSink, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } diff --git a/gstreamer-app/src/auto/app_src.rs b/gstreamer-app/src/auto/app_src.rs index 88059e963..56bde8588 100644 --- a/gstreamer-app/src/auto/app_src.rs +++ b/gstreamer-app/src/auto/app_src.rs @@ -1,9 +1,10 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use AppStreamType; use ffi; use glib::Value; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -246,7 +247,7 @@ impl AppSrc { } } - pub fn connect_enough_data(&self, f: F) -> u64 { + pub fn connect_enough_data(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "enough-data", @@ -254,7 +255,7 @@ impl AppSrc { } } - pub fn connect_need_data(&self, f: F) -> u64 { + pub fn connect_need_data(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "need-data", @@ -262,7 +263,7 @@ impl AppSrc { } } - pub fn connect_seek_data bool + Send + Sync + 'static>(&self, f: F) -> u64 { + pub fn connect_seek_data bool + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_ bool + Send + Sync + 'static>> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "seek-data", @@ -270,7 +271,7 @@ impl AppSrc { } } - pub fn connect_property_block_notify(&self, f: F) -> u64 { + pub fn connect_property_block_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::block", @@ -278,7 +279,7 @@ impl AppSrc { } } - pub fn connect_property_caps_notify(&self, f: F) -> u64 { + pub fn connect_property_caps_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::caps", @@ -286,7 +287,7 @@ impl AppSrc { } } - pub fn connect_property_current_level_bytes_notify(&self, f: F) -> u64 { + pub fn connect_property_current_level_bytes_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::current-level-bytes", @@ -294,7 +295,7 @@ impl AppSrc { } } - pub fn connect_property_duration_notify(&self, f: F) -> u64 { + pub fn connect_property_duration_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::duration", @@ -302,7 +303,7 @@ impl AppSrc { } } - pub fn connect_property_emit_signals_notify(&self, f: F) -> u64 { + pub fn connect_property_emit_signals_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::emit-signals", @@ -310,7 +311,7 @@ impl AppSrc { } } - pub fn connect_property_format_notify(&self, f: F) -> u64 { + pub fn connect_property_format_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::format", @@ -318,7 +319,7 @@ impl AppSrc { } } - pub fn connect_property_is_live_notify(&self, f: F) -> u64 { + pub fn connect_property_is_live_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::is-live", @@ -326,7 +327,7 @@ impl AppSrc { } } - pub fn connect_property_max_bytes_notify(&self, f: F) -> u64 { + pub fn connect_property_max_bytes_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::max-bytes", @@ -334,7 +335,7 @@ impl AppSrc { } } - pub fn connect_property_max_latency_notify(&self, f: F) -> u64 { + pub fn connect_property_max_latency_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::max-latency", @@ -342,7 +343,7 @@ impl AppSrc { } } - pub fn connect_property_min_latency_notify(&self, f: F) -> u64 { + pub fn connect_property_min_latency_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::min-latency", @@ -350,7 +351,7 @@ impl AppSrc { } } - pub fn connect_property_min_percent_notify(&self, f: F) -> u64 { + pub fn connect_property_min_percent_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::min-percent", @@ -358,7 +359,7 @@ impl AppSrc { } } - pub fn connect_property_size_notify(&self, f: F) -> u64 { + pub fn connect_property_size_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::size", @@ -366,7 +367,7 @@ impl AppSrc { } } - pub fn connect_property_stream_type_notify(&self, f: F) -> u64 { + pub fn connect_property_stream_type_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::stream-type", @@ -381,95 +382,95 @@ unsafe impl Sync for AppSrc {} unsafe extern "C" fn enough_data_trampoline(this: *mut ffi::GstAppSrc, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn need_data_trampoline(this: *mut ffi::GstAppSrc, length: libc::c_uint, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc, u32) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this), length) + f(&from_glib_borrow(this), length) } unsafe extern "C" fn seek_data_trampoline(this: *mut ffi::GstAppSrc, offset: u64, f: glib_ffi::gpointer) -> glib_ffi::gboolean { callback_guard!(); let f: &&(Fn(&AppSrc, u64) -> bool + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this), offset).to_glib() + f(&from_glib_borrow(this), offset).to_glib() } unsafe extern "C" fn notify_block_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_caps_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_current_level_bytes_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_duration_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_emit_signals_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_format_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_is_live_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_max_bytes_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_max_latency_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_min_latency_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_min_percent_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_size_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_stream_type_trampoline(this: *mut ffi::GstAppSrc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } diff --git a/gstreamer-app/src/auto/enums.rs b/gstreamer-app/src/auto/enums.rs index 1be2097b6..acd29dac0 100644 --- a/gstreamer-app/src/auto/enums.rs +++ b/gstreamer-app/src/auto/enums.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-app/src/auto/flags.rs b/gstreamer-app/src/auto/flags.rs index 14bc7d3d9..bb0dc44cf 100644 --- a/gstreamer-app/src/auto/flags.rs +++ b/gstreamer-app/src/auto/flags.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-app/src/auto/mod.rs b/gstreamer-app/src/auto/mod.rs index dbeb87a83..cd6bf322b 100644 --- a/gstreamer-app/src/auto/mod.rs +++ b/gstreamer-app/src/auto/mod.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT mod app_sink; diff --git a/gstreamer-audio/src/auto/enums.rs b/gstreamer-audio/src/auto/enums.rs index f02861a0a..7e7f6c4ff 100644 --- a/gstreamer-audio/src/auto/enums.rs +++ b/gstreamer-audio/src/auto/enums.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-audio/src/auto/flags.rs b/gstreamer-audio/src/auto/flags.rs index 67917e831..91361ad3a 100644 --- a/gstreamer-audio/src/auto/flags.rs +++ b/gstreamer-audio/src/auto/flags.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-audio/src/auto/mod.rs b/gstreamer-audio/src/auto/mod.rs index 7fa43a604..9c68e62ab 100644 --- a/gstreamer-audio/src/auto/mod.rs +++ b/gstreamer-audio/src/auto/mod.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT mod stream_volume; diff --git a/gstreamer-audio/src/auto/stream_volume.rs b/gstreamer-audio/src/auto/stream_volume.rs index 5a745fcdc..85d0f7632 100644 --- a/gstreamer-audio/src/auto/stream_volume.rs +++ b/gstreamer-audio/src/auto/stream_volume.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use StreamVolumeFormat; @@ -6,6 +6,7 @@ use ffi; use glib; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -44,9 +45,9 @@ pub trait StreamVolumeExt { fn set_volume(&self, format: StreamVolumeFormat, val: f64); - fn connect_property_mute_notify(&self, f: F) -> u64; + fn connect_property_mute_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_volume_notify(&self, f: F) -> u64; + fn connect_property_volume_notify(&self, f: F) -> SignalHandlerId; } impl + IsA> StreamVolumeExt for O { @@ -74,7 +75,7 @@ impl + IsA> StreamVolumeExt for O { } } - fn connect_property_mute_notify(&self, f: F) -> u64 { + fn connect_property_mute_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::mute", @@ -82,7 +83,7 @@ impl + IsA> StreamVolumeExt for O { } } - fn connect_property_volume_notify(&self, f: F) -> u64 { + fn connect_property_volume_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::volume", @@ -95,12 +96,12 @@ unsafe extern "C" fn notify_mute_trampoline

(this: *mut ffi::GstStreamVolume, where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&StreamVolume::from_glib_none(this).downcast_unchecked()) + f(&StreamVolume::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_volume_trampoline

(this: *mut ffi::GstStreamVolume, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&StreamVolume::from_glib_none(this).downcast_unchecked()) + f(&StreamVolume::from_glib_borrow(this).downcast_unchecked()) } diff --git a/gstreamer-player/src/auto/enums.rs b/gstreamer-player/src/auto/enums.rs index 5c75cf6fc..f49da3bdf 100644 --- a/gstreamer-player/src/auto/enums.rs +++ b/gstreamer-player/src/auto/enums.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-player/src/auto/flags.rs b/gstreamer-player/src/auto/flags.rs index 14bc7d3d9..bb0dc44cf 100644 --- a/gstreamer-player/src/auto/flags.rs +++ b/gstreamer-player/src/auto/flags.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-player/src/auto/mod.rs b/gstreamer-player/src/auto/mod.rs index 36244180f..446f61693 100644 --- a/gstreamer-player/src/auto/mod.rs +++ b/gstreamer-player/src/auto/mod.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT mod player; diff --git a/gstreamer-player/src/auto/player.rs b/gstreamer-player/src/auto/player.rs index a5fc28c28..2942a3a1e 100644 --- a/gstreamer-player/src/auto/player.rs +++ b/gstreamer-player/src/auto/player.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Error; @@ -12,6 +12,7 @@ use PlayerVideoInfo; use PlayerVisualization; use ffi; use glib::Value; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -385,7 +386,7 @@ impl Player { } } - pub fn connect_buffering(&self, f: F) -> u64 { + pub fn connect_buffering(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "buffering", @@ -393,7 +394,7 @@ impl Player { } } - pub fn connect_duration_changed(&self, f: F) -> u64 { + pub fn connect_duration_changed(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "duration-changed", @@ -401,7 +402,7 @@ impl Player { } } - pub fn connect_end_of_stream(&self, f: F) -> u64 { + pub fn connect_end_of_stream(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "end-of-stream", @@ -409,7 +410,7 @@ impl Player { } } - pub fn connect_error(&self, f: F) -> u64 { + pub fn connect_error(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "error", @@ -417,7 +418,7 @@ impl Player { } } - pub fn connect_media_info_updated(&self, f: F) -> u64 { + pub fn connect_media_info_updated(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "media-info-updated", @@ -425,7 +426,7 @@ impl Player { } } - pub fn connect_mute_changed(&self, f: F) -> u64 { + pub fn connect_mute_changed(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "mute-changed", @@ -433,7 +434,7 @@ impl Player { } } - pub fn connect_position_updated(&self, f: F) -> u64 { + pub fn connect_position_updated(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "position-updated", @@ -441,7 +442,7 @@ impl Player { } } - pub fn connect_seek_done(&self, f: F) -> u64 { + pub fn connect_seek_done(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "seek-done", @@ -449,7 +450,7 @@ impl Player { } } - pub fn connect_state_changed(&self, f: F) -> u64 { + pub fn connect_state_changed(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "state-changed", @@ -457,7 +458,7 @@ impl Player { } } - pub fn connect_uri_loaded(&self, f: F) -> u64 { + pub fn connect_uri_loaded(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "uri-loaded", @@ -465,7 +466,7 @@ impl Player { } } - pub fn connect_video_dimensions_changed(&self, f: F) -> u64 { + pub fn connect_video_dimensions_changed(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "video-dimensions-changed", @@ -473,7 +474,7 @@ impl Player { } } - pub fn connect_volume_changed(&self, f: F) -> u64 { + pub fn connect_volume_changed(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "volume-changed", @@ -481,7 +482,7 @@ impl Player { } } - pub fn connect_warning(&self, f: F) -> u64 { + pub fn connect_warning(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "warning", @@ -489,7 +490,7 @@ impl Player { } } - pub fn connect_property_audio_video_offset_notify(&self, f: F) -> u64 { + pub fn connect_property_audio_video_offset_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::audio-video-offset", @@ -497,7 +498,7 @@ impl Player { } } - pub fn connect_property_current_audio_track_notify(&self, f: F) -> u64 { + pub fn connect_property_current_audio_track_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::current-audio-track", @@ -505,7 +506,7 @@ impl Player { } } - pub fn connect_property_current_subtitle_track_notify(&self, f: F) -> u64 { + pub fn connect_property_current_subtitle_track_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::current-subtitle-track", @@ -513,7 +514,7 @@ impl Player { } } - pub fn connect_property_current_video_track_notify(&self, f: F) -> u64 { + pub fn connect_property_current_video_track_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::current-video-track", @@ -521,7 +522,7 @@ impl Player { } } - pub fn connect_property_duration_notify(&self, f: F) -> u64 { + pub fn connect_property_duration_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::duration", @@ -529,7 +530,7 @@ impl Player { } } - pub fn connect_property_media_info_notify(&self, f: F) -> u64 { + pub fn connect_property_media_info_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::media-info", @@ -537,7 +538,7 @@ impl Player { } } - pub fn connect_property_mute_notify(&self, f: F) -> u64 { + pub fn connect_property_mute_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::mute", @@ -545,7 +546,7 @@ impl Player { } } - pub fn connect_property_pipeline_notify(&self, f: F) -> u64 { + pub fn connect_property_pipeline_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::pipeline", @@ -553,7 +554,7 @@ impl Player { } } - pub fn connect_property_position_notify(&self, f: F) -> u64 { + pub fn connect_property_position_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::position", @@ -561,7 +562,7 @@ impl Player { } } - pub fn connect_property_rate_notify(&self, f: F) -> u64 { + pub fn connect_property_rate_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::rate", @@ -569,7 +570,7 @@ impl Player { } } - pub fn connect_property_signal_dispatcher_notify(&self, f: F) -> u64 { + pub fn connect_property_signal_dispatcher_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::signal-dispatcher", @@ -577,7 +578,7 @@ impl Player { } } - pub fn connect_property_suburi_notify(&self, f: F) -> u64 { + pub fn connect_property_suburi_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::suburi", @@ -585,7 +586,7 @@ impl Player { } } - pub fn connect_property_uri_notify(&self, f: F) -> u64 { + pub fn connect_property_uri_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::uri", @@ -593,7 +594,7 @@ impl Player { } } - pub fn connect_property_video_multiview_flags_notify(&self, f: F) -> u64 { + pub fn connect_property_video_multiview_flags_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::video-multiview-flags", @@ -601,7 +602,7 @@ impl Player { } } - pub fn connect_property_video_multiview_mode_notify(&self, f: F) -> u64 { + pub fn connect_property_video_multiview_mode_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::video-multiview-mode", @@ -609,7 +610,7 @@ impl Player { } } - pub fn connect_property_video_renderer_notify(&self, f: F) -> u64 { + pub fn connect_property_video_renderer_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::video-renderer", @@ -617,7 +618,7 @@ impl Player { } } - pub fn connect_property_volume_notify(&self, f: F) -> u64 { + pub fn connect_property_volume_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::volume", @@ -632,179 +633,179 @@ unsafe impl Sync for Player {} unsafe extern "C" fn buffering_trampoline(this: *mut ffi::GstPlayer, object: libc::c_int, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player, i32) + Send + 'static) = transmute(f); - f(&from_glib_none(this), object) + f(&from_glib_borrow(this), object) } unsafe extern "C" fn duration_changed_trampoline(this: *mut ffi::GstPlayer, object: u64, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player, u64) + Send + 'static) = transmute(f); - f(&from_glib_none(this), object) + f(&from_glib_borrow(this), object) } unsafe extern "C" fn end_of_stream_trampoline(this: *mut ffi::GstPlayer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn error_trampoline(this: *mut ffi::GstPlayer, object: *mut glib_ffi::GError, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player, &Error) + Send + 'static) = transmute(f); - f(&from_glib_none(this), &from_glib_none(object)) + f(&from_glib_borrow(this), &from_glib_borrow(object)) } unsafe extern "C" fn media_info_updated_trampoline(this: *mut ffi::GstPlayer, object: *mut ffi::GstPlayerMediaInfo, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player, &PlayerMediaInfo) + Send + 'static) = transmute(f); - f(&from_glib_none(this), &from_glib_none(object)) + f(&from_glib_borrow(this), &from_glib_borrow(object)) } unsafe extern "C" fn mute_changed_trampoline(this: *mut ffi::GstPlayer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn position_updated_trampoline(this: *mut ffi::GstPlayer, object: u64, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player, u64) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this), object) + f(&from_glib_borrow(this), object) } unsafe extern "C" fn seek_done_trampoline(this: *mut ffi::GstPlayer, object: u64, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player, u64) + Send + 'static) = transmute(f); - f(&from_glib_none(this), object) + f(&from_glib_borrow(this), object) } unsafe extern "C" fn state_changed_trampoline(this: *mut ffi::GstPlayer, object: ffi::GstPlayerState, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player, PlayerState) + Send + 'static) = transmute(f); - f(&from_glib_none(this), from_glib(object)) + f(&from_glib_borrow(this), from_glib(object)) } unsafe extern "C" fn uri_loaded_trampoline(this: *mut ffi::GstPlayer, object: *mut libc::c_char, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player, &str) + Send + 'static) = transmute(f); - f(&from_glib_none(this), &String::from_glib_none(object)) + f(&from_glib_borrow(this), &String::from_glib_none(object)) } unsafe extern "C" fn video_dimensions_changed_trampoline(this: *mut ffi::GstPlayer, object: libc::c_int, p0: libc::c_int, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player, i32, i32) + Send + 'static) = transmute(f); - f(&from_glib_none(this), object, p0) + f(&from_glib_borrow(this), object, p0) } unsafe extern "C" fn volume_changed_trampoline(this: *mut ffi::GstPlayer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn warning_trampoline(this: *mut ffi::GstPlayer, object: *mut glib_ffi::GError, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player, &Error) + Send + 'static) = transmute(f); - f(&from_glib_none(this), &from_glib_none(object)) + f(&from_glib_borrow(this), &from_glib_borrow(object)) } unsafe extern "C" fn notify_audio_video_offset_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_current_audio_track_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_current_subtitle_track_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_current_video_track_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_duration_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_media_info_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_mute_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_pipeline_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_position_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_rate_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_signal_dispatcher_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_suburi_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_uri_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_video_multiview_flags_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_video_multiview_mode_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_video_renderer_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_volume_trampoline(this: *mut ffi::GstPlayer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Player) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } diff --git a/gstreamer-player/src/auto/player_audio_info.rs b/gstreamer-player/src/auto/player_audio_info.rs index 450778017..73300af0f 100644 --- a/gstreamer-player/src/auto/player_audio_info.rs +++ b/gstreamer-player/src/auto/player_audio_info.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use PlayerStreamInfo; diff --git a/gstreamer-player/src/auto/player_g_main_context_signal_dispatcher.rs b/gstreamer-player/src/auto/player_g_main_context_signal_dispatcher.rs index f727e83a8..bf5e1387d 100644 --- a/gstreamer-player/src/auto/player_g_main_context_signal_dispatcher.rs +++ b/gstreamer-player/src/auto/player_g_main_context_signal_dispatcher.rs @@ -1,10 +1,11 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use PlayerSignalDispatcher; use ffi; use glib; use glib::Value; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -40,7 +41,7 @@ impl PlayerGMainContextSignalDispatcher { } } - pub fn connect_property_application_context_notify(&self, f: F) -> u64 { + pub fn connect_property_application_context_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::application-context", @@ -55,5 +56,5 @@ unsafe impl Sync for PlayerGMainContextSignalDispatcher {} unsafe extern "C" fn notify_application_context_trampoline(this: *mut ffi::GstPlayerGMainContextSignalDispatcher, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&PlayerGMainContextSignalDispatcher) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } diff --git a/gstreamer-player/src/auto/player_media_info.rs b/gstreamer-player/src/auto/player_media_info.rs index 46d14120b..9ea4851b0 100644 --- a/gstreamer-player/src/auto/player_media_info.rs +++ b/gstreamer-player/src/auto/player_media_info.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use PlayerAudioInfo; diff --git a/gstreamer-player/src/auto/player_signal_dispatcher.rs b/gstreamer-player/src/auto/player_signal_dispatcher.rs index 84e3f6eb9..68356d91d 100644 --- a/gstreamer-player/src/auto/player_signal_dispatcher.rs +++ b/gstreamer-player/src/auto/player_signal_dispatcher.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-player/src/auto/player_stream_info.rs b/gstreamer-player/src/auto/player_stream_info.rs index d74c854dc..d13adb019 100644 --- a/gstreamer-player/src/auto/player_stream_info.rs +++ b/gstreamer-player/src/auto/player_stream_info.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-player/src/auto/player_subtitle_info.rs b/gstreamer-player/src/auto/player_subtitle_info.rs index 4fdea17e8..ed84906da 100644 --- a/gstreamer-player/src/auto/player_subtitle_info.rs +++ b/gstreamer-player/src/auto/player_subtitle_info.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use PlayerStreamInfo; diff --git a/gstreamer-player/src/auto/player_video_info.rs b/gstreamer-player/src/auto/player_video_info.rs index 16bf4df7f..8e75e0004 100644 --- a/gstreamer-player/src/auto/player_video_info.rs +++ b/gstreamer-player/src/auto/player_video_info.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use PlayerStreamInfo; diff --git a/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs b/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs index de5ed1185..6d6bea19c 100644 --- a/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs +++ b/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use PlayerVideoRenderer; @@ -6,6 +6,7 @@ use ffi; use glib; use glib::Value; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -78,7 +79,7 @@ impl PlayerVideoOverlayVideoRenderer { // unsafe { TODO: call ffi::gst_player_video_overlay_video_renderer_new_with_sink() } //} - pub fn connect_property_video_sink_notify(&self, f: F) -> u64 { + pub fn connect_property_video_sink_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::video-sink", @@ -86,7 +87,7 @@ impl PlayerVideoOverlayVideoRenderer { } } - pub fn connect_property_window_handle_notify(&self, f: F) -> u64 { + pub fn connect_property_window_handle_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::window-handle", @@ -101,11 +102,11 @@ unsafe impl Sync for PlayerVideoOverlayVideoRenderer {} unsafe extern "C" fn notify_video_sink_trampoline(this: *mut ffi::GstPlayerVideoOverlayVideoRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&PlayerVideoOverlayVideoRenderer) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_window_handle_trampoline(this: *mut ffi::GstPlayerVideoOverlayVideoRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&PlayerVideoOverlayVideoRenderer) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } diff --git a/gstreamer-player/src/auto/player_video_renderer.rs b/gstreamer-player/src/auto/player_video_renderer.rs index d0ba83886..74e29d736 100644 --- a/gstreamer-player/src/auto/player_video_renderer.rs +++ b/gstreamer-player/src/auto/player_video_renderer.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-player/src/auto/player_visualization.rs b/gstreamer-player/src/auto/player_visualization.rs index 88021dd81..b1e32253b 100644 --- a/gstreamer-player/src/auto/player_visualization.rs +++ b/gstreamer-player/src/auto/player_visualization.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-video/src/auto/enums.rs b/gstreamer-video/src/auto/enums.rs index 8c38781fa..be9550e6c 100644 --- a/gstreamer-video/src/auto/enums.rs +++ b/gstreamer-video/src/auto/enums.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-video/src/auto/flags.rs b/gstreamer-video/src/auto/flags.rs index 43bdc9ab7..9690dccda 100644 --- a/gstreamer-video/src/auto/flags.rs +++ b/gstreamer-video/src/auto/flags.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-video/src/auto/mod.rs b/gstreamer-video/src/auto/mod.rs index c42e18456..7733b3ffc 100644 --- a/gstreamer-video/src/auto/mod.rs +++ b/gstreamer-video/src/auto/mod.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT mod video_overlay; diff --git a/gstreamer-video/src/auto/video_overlay.rs b/gstreamer-video/src/auto/video_overlay.rs index 1be67ffd6..5d862a61c 100644 --- a/gstreamer-video/src/auto/video_overlay.rs +++ b/gstreamer-video/src/auto/video_overlay.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/alias.rs b/gstreamer/src/auto/alias.rs index 2e9da5992..006beb9d2 100644 --- a/gstreamer/src/auto/alias.rs +++ b/gstreamer/src/auto/alias.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT #[allow(unused_imports)] diff --git a/gstreamer/src/auto/bin.rs b/gstreamer/src/auto/bin.rs index 4750c787d..b62e80ce7 100644 --- a/gstreamer/src/auto/bin.rs +++ b/gstreamer/src/auto/bin.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ChildProxy; @@ -14,6 +14,7 @@ use glib; use glib::Value; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -93,20 +94,20 @@ pub trait BinExt { fn set_property_message_forward(&self, message_forward: bool); #[cfg(feature = "v1_10")] - fn connect_deep_element_added(&self, f: F) -> u64; + fn connect_deep_element_added(&self, f: F) -> SignalHandlerId; #[cfg(feature = "v1_10")] - fn connect_deep_element_removed(&self, f: F) -> u64; + fn connect_deep_element_removed(&self, f: F) -> SignalHandlerId; - fn connect_do_latency bool + Send + Sync + 'static>(&self, f: F) -> u64; + fn connect_do_latency bool + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId; - fn connect_element_added(&self, f: F) -> u64; + fn connect_element_added(&self, f: F) -> SignalHandlerId; - fn connect_element_removed(&self, f: F) -> u64; + fn connect_element_removed(&self, f: F) -> SignalHandlerId; - fn connect_property_async_handling_notify(&self, f: F) -> u64; + fn connect_property_async_handling_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_message_forward_notify(&self, f: F) -> u64; + fn connect_property_message_forward_notify(&self, f: F) -> SignalHandlerId; } impl + IsA> BinExt for O { @@ -245,7 +246,7 @@ impl + IsA> BinExt for O { } #[cfg(feature = "v1_10")] - fn connect_deep_element_added(&self, f: F) -> u64 { + fn connect_deep_element_added(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "deep-element-added", @@ -254,7 +255,7 @@ impl + IsA> BinExt for O { } #[cfg(feature = "v1_10")] - fn connect_deep_element_removed(&self, f: F) -> u64 { + fn connect_deep_element_removed(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "deep-element-removed", @@ -262,7 +263,7 @@ impl + IsA> BinExt for O { } } - fn connect_do_latency bool + Send + Sync + 'static>(&self, f: F) -> u64 { + fn connect_do_latency bool + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_ bool + Send + Sync + 'static>> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "do-latency", @@ -270,7 +271,7 @@ impl + IsA> BinExt for O { } } - fn connect_element_added(&self, f: F) -> u64 { + fn connect_element_added(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "element-added", @@ -278,7 +279,7 @@ impl + IsA> BinExt for O { } } - fn connect_element_removed(&self, f: F) -> u64 { + fn connect_element_removed(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "element-removed", @@ -286,7 +287,7 @@ impl + IsA> BinExt for O { } } - fn connect_property_async_handling_notify(&self, f: F) -> u64 { + fn connect_property_async_handling_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::async-handling", @@ -294,7 +295,7 @@ impl + IsA> BinExt for O { } } - fn connect_property_message_forward_notify(&self, f: F) -> u64 { + fn connect_property_message_forward_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::message-forward", @@ -308,7 +309,7 @@ unsafe extern "C" fn deep_element_added_trampoline

(this: *mut ffi::GstBin, su where P: IsA { callback_guard!(); let f: &&(Fn(&P, &Bin, &Element) + Send + Sync + 'static) = transmute(f); - f(&Bin::from_glib_none(this).downcast_unchecked(), &from_glib_none(sub_bin), &from_glib_none(element)) + f(&Bin::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(sub_bin), &from_glib_borrow(element)) } #[cfg(feature = "v1_10")] @@ -316,40 +317,40 @@ unsafe extern "C" fn deep_element_removed_trampoline

(this: *mut ffi::GstBin, where P: IsA { callback_guard!(); let f: &&(Fn(&P, &Bin, &Element) + Send + Sync + 'static) = transmute(f); - f(&Bin::from_glib_none(this).downcast_unchecked(), &from_glib_none(sub_bin), &from_glib_none(element)) + f(&Bin::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(sub_bin), &from_glib_borrow(element)) } unsafe extern "C" fn do_latency_trampoline

(this: *mut ffi::GstBin, f: glib_ffi::gpointer) -> glib_ffi::gboolean where P: IsA { callback_guard!(); let f: &&(Fn(&P) -> bool + Send + Sync + 'static) = transmute(f); - f(&Bin::from_glib_none(this).downcast_unchecked()).to_glib() + f(&Bin::from_glib_borrow(this).downcast_unchecked()).to_glib() } unsafe extern "C" fn element_added_trampoline

(this: *mut ffi::GstBin, element: *mut ffi::GstElement, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P, &Element) + Send + Sync + 'static) = transmute(f); - f(&Bin::from_glib_none(this).downcast_unchecked(), &from_glib_none(element)) + f(&Bin::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(element)) } unsafe extern "C" fn element_removed_trampoline

(this: *mut ffi::GstBin, element: *mut ffi::GstElement, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P, &Element) + Send + Sync + 'static) = transmute(f); - f(&Bin::from_glib_none(this).downcast_unchecked(), &from_glib_none(element)) + f(&Bin::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(element)) } unsafe extern "C" fn notify_async_handling_trampoline

(this: *mut ffi::GstBin, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Bin::from_glib_none(this).downcast_unchecked()) + f(&Bin::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_message_forward_trampoline

(this: *mut ffi::GstBin, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Bin::from_glib_none(this).downcast_unchecked()) + f(&Bin::from_glib_borrow(this).downcast_unchecked()) } diff --git a/gstreamer/src/auto/bus.rs b/gstreamer/src/auto/bus.rs index f13a09bcf..93b010524 100644 --- a/gstreamer/src/auto/bus.rs +++ b/gstreamer/src/auto/bus.rs @@ -1,10 +1,11 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ClockTime; use Message; use Object; use ffi; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -116,7 +117,7 @@ impl Bus { } } - pub fn connect_message(&self, f: F) -> u64 { + pub fn connect_message(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "message", @@ -124,7 +125,7 @@ impl Bus { } } - pub fn connect_sync_message(&self, f: F) -> u64 { + pub fn connect_sync_message(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "sync-message", @@ -132,7 +133,7 @@ impl Bus { } } - pub fn connect_property_enable_async_notify(&self, f: F) -> u64 { + pub fn connect_property_enable_async_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::enable-async", @@ -153,17 +154,17 @@ unsafe impl Sync for Bus {} unsafe extern "C" fn message_trampoline(this: *mut ffi::GstBus, message: *mut ffi::GstMessage, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Bus, &Message) + Send + 'static) = transmute(f); - f(&from_glib_none(this), &from_glib_none(message)) + f(&from_glib_borrow(this), &from_glib_borrow(message)) } unsafe extern "C" fn sync_message_trampoline(this: *mut ffi::GstBus, message: *mut ffi::GstMessage, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Bus, &Message) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this), &from_glib_none(message)) + f(&from_glib_borrow(this), &from_glib_borrow(message)) } unsafe extern "C" fn notify_enable_async_trampoline(this: *mut ffi::GstBus, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Bus) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } diff --git a/gstreamer/src/auto/child_proxy.rs b/gstreamer/src/auto/child_proxy.rs index b864db19c..310990c76 100644 --- a/gstreamer/src/auto/child_proxy.rs +++ b/gstreamer/src/auto/child_proxy.rs @@ -1,10 +1,11 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; use glib; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -51,9 +52,9 @@ pub trait ChildProxyExt { //fn set_valist(&self, first_property_name: &str, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported); - fn connect_child_added(&self, f: F) -> u64; + fn connect_child_added(&self, f: F) -> SignalHandlerId; - fn connect_child_removed(&self, f: F) -> u64; + fn connect_child_removed(&self, f: F) -> SignalHandlerId; } impl + IsA> ChildProxyExt for O { @@ -115,7 +116,7 @@ impl + IsA> ChildProxyExt for O { // unsafe { TODO: call ffi::gst_child_proxy_set_valist() } //} - fn connect_child_added(&self, f: F) -> u64 { + fn connect_child_added(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "child-added", @@ -123,7 +124,7 @@ impl + IsA> ChildProxyExt for O { } } - fn connect_child_removed(&self, f: F) -> u64 { + fn connect_child_removed(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "child-removed", @@ -136,12 +137,12 @@ unsafe extern "C" fn child_added_trampoline

(this: *mut ffi::GstChildProxy, ob where P: IsA { callback_guard!(); let f: &&(Fn(&P, &glib::Object, &str) + Send + Sync + 'static) = transmute(f); - f(&ChildProxy::from_glib_none(this).downcast_unchecked(), &from_glib_none(object), &String::from_glib_none(name)) + f(&ChildProxy::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object), &String::from_glib_none(name)) } unsafe extern "C" fn child_removed_trampoline

(this: *mut ffi::GstChildProxy, object: *mut gobject_ffi::GObject, name: *mut libc::c_char, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P, &glib::Object, &str) + Send + Sync + 'static) = transmute(f); - f(&ChildProxy::from_glib_none(this).downcast_unchecked(), &from_glib_none(object), &String::from_glib_none(name)) + f(&ChildProxy::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object), &String::from_glib_none(name)) } diff --git a/gstreamer/src/auto/clock.rs b/gstreamer/src/auto/clock.rs index b4796f7bf..79294f23a 100644 --- a/gstreamer/src/auto/clock.rs +++ b/gstreamer/src/auto/clock.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ClockTime; @@ -8,6 +8,7 @@ use glib; use glib::Value; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -113,13 +114,13 @@ pub trait ClockExt { fn set_property_window_threshold(&self, window_threshold: i32); - fn connect_synced(&self, f: F) -> u64; + fn connect_synced(&self, f: F) -> SignalHandlerId; - fn connect_property_timeout_notify(&self, f: F) -> u64; + fn connect_property_timeout_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_window_size_notify(&self, f: F) -> u64; + fn connect_property_window_size_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_window_threshold_notify(&self, f: F) -> u64; + fn connect_property_window_threshold_notify(&self, f: F) -> SignalHandlerId; } impl + IsA> ClockExt for O { @@ -296,7 +297,7 @@ impl + IsA> ClockExt for O { } } - fn connect_synced(&self, f: F) -> u64 { + fn connect_synced(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "synced", @@ -304,7 +305,7 @@ impl + IsA> ClockExt for O { } } - fn connect_property_timeout_notify(&self, f: F) -> u64 { + fn connect_property_timeout_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::timeout", @@ -312,7 +313,7 @@ impl + IsA> ClockExt for O { } } - fn connect_property_window_size_notify(&self, f: F) -> u64 { + fn connect_property_window_size_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::window-size", @@ -320,7 +321,7 @@ impl + IsA> ClockExt for O { } } - fn connect_property_window_threshold_notify(&self, f: F) -> u64 { + fn connect_property_window_threshold_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::window-threshold", @@ -333,26 +334,26 @@ unsafe extern "C" fn synced_trampoline

(this: *mut ffi::GstClock, synced: glib where P: IsA { callback_guard!(); let f: &&(Fn(&P, bool) + Send + Sync + 'static) = transmute(f); - f(&Clock::from_glib_none(this).downcast_unchecked(), from_glib(synced)) + f(&Clock::from_glib_borrow(this).downcast_unchecked(), from_glib(synced)) } unsafe extern "C" fn notify_timeout_trampoline

(this: *mut ffi::GstClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Clock::from_glib_none(this).downcast_unchecked()) + f(&Clock::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_window_size_trampoline

(this: *mut ffi::GstClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Clock::from_glib_none(this).downcast_unchecked()) + f(&Clock::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_window_threshold_trampoline

(this: *mut ffi::GstClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Clock::from_glib_none(this).downcast_unchecked()) + f(&Clock::from_glib_borrow(this).downcast_unchecked()) } diff --git a/gstreamer/src/auto/date_time.rs b/gstreamer/src/auto/date_time.rs index 09f46bd3c..94f6ec865 100644 --- a/gstreamer/src/auto/date_time.rs +++ b/gstreamer/src/auto/date_time.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/device.rs b/gstreamer/src/auto/device.rs index af87d1e77..01af76562 100644 --- a/gstreamer/src/auto/device.rs +++ b/gstreamer/src/auto/device.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Caps; @@ -10,6 +10,7 @@ use glib; use glib::Value; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -55,15 +56,15 @@ pub trait DeviceExt { fn get_property_properties(&self) -> Option; - fn connect_removed(&self, f: F) -> u64; + fn connect_removed(&self, f: F) -> SignalHandlerId; - fn connect_property_caps_notify(&self, f: F) -> u64; + fn connect_property_caps_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_device_class_notify(&self, f: F) -> u64; + fn connect_property_device_class_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_display_name_notify(&self, f: F) -> u64; + fn connect_property_display_name_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_properties_notify(&self, f: F) -> u64; + fn connect_property_properties_notify(&self, f: F) -> SignalHandlerId; } impl + IsA> DeviceExt for O { @@ -149,7 +150,7 @@ impl + IsA> DeviceExt for O { value.get() } - fn connect_removed(&self, f: F) -> u64 { + fn connect_removed(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "removed", @@ -157,7 +158,7 @@ impl + IsA> DeviceExt for O { } } - fn connect_property_caps_notify(&self, f: F) -> u64 { + fn connect_property_caps_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::caps", @@ -165,7 +166,7 @@ impl + IsA> DeviceExt for O { } } - fn connect_property_device_class_notify(&self, f: F) -> u64 { + fn connect_property_device_class_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::device-class", @@ -173,7 +174,7 @@ impl + IsA> DeviceExt for O { } } - fn connect_property_display_name_notify(&self, f: F) -> u64 { + fn connect_property_display_name_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::display-name", @@ -181,7 +182,7 @@ impl + IsA> DeviceExt for O { } } - fn connect_property_properties_notify(&self, f: F) -> u64 { + fn connect_property_properties_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::properties", @@ -194,33 +195,33 @@ unsafe extern "C" fn removed_trampoline

(this: *mut ffi::GstDevice, f: glib_ff where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Device::from_glib_none(this).downcast_unchecked()) + f(&Device::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_caps_trampoline

(this: *mut ffi::GstDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Device::from_glib_none(this).downcast_unchecked()) + f(&Device::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_device_class_trampoline

(this: *mut ffi::GstDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Device::from_glib_none(this).downcast_unchecked()) + f(&Device::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_display_name_trampoline

(this: *mut ffi::GstDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Device::from_glib_none(this).downcast_unchecked()) + f(&Device::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_properties_trampoline

(this: *mut ffi::GstDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Device::from_glib_none(this).downcast_unchecked()) + f(&Device::from_glib_borrow(this).downcast_unchecked()) } diff --git a/gstreamer/src/auto/device_monitor.rs b/gstreamer/src/auto/device_monitor.rs index c77012d7d..b9177c8b5 100644 --- a/gstreamer/src/auto/device_monitor.rs +++ b/gstreamer/src/auto/device_monitor.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Bus; @@ -10,6 +10,7 @@ use glib; use glib::Value; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -68,7 +69,7 @@ pub trait DeviceMonitorExt { fn set_property_show_all(&self, show_all: bool); - fn connect_property_show_all_notify(&self, f: F) -> u64; + fn connect_property_show_all_notify(&self, f: F) -> SignalHandlerId; } impl + IsA> DeviceMonitorExt for O { @@ -144,7 +145,7 @@ impl + IsA> DeviceMonitorExt for O { } } - fn connect_property_show_all_notify(&self, f: F) -> u64 { + fn connect_property_show_all_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::show-all", @@ -157,5 +158,5 @@ unsafe extern "C" fn notify_show_all_trampoline

(this: *mut ffi::GstDeviceMoni where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&DeviceMonitor::from_glib_none(this).downcast_unchecked()) + f(&DeviceMonitor::from_glib_borrow(this).downcast_unchecked()) } diff --git a/gstreamer/src/auto/device_provider.rs b/gstreamer/src/auto/device_provider.rs index 08f363088..f0375c5c4 100644 --- a/gstreamer/src/auto/device_provider.rs +++ b/gstreamer/src/auto/device_provider.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Bus; @@ -10,6 +10,7 @@ use ffi; use glib; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -65,9 +66,9 @@ pub trait DeviceProviderExt { fn unhide_provider(&self, name: &str); - fn connect_provider_hidden(&self, f: F) -> u64; + fn connect_provider_hidden(&self, f: F) -> SignalHandlerId; - fn connect_provider_unhidden(&self, f: F) -> u64; + fn connect_provider_unhidden(&self, f: F) -> SignalHandlerId; } impl + IsA> DeviceProviderExt for O { @@ -137,7 +138,7 @@ impl + IsA> DeviceProviderExt for O } } - fn connect_provider_hidden(&self, f: F) -> u64 { + fn connect_provider_hidden(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "provider-hidden", @@ -145,7 +146,7 @@ impl + IsA> DeviceProviderExt for O } } - fn connect_provider_unhidden(&self, f: F) -> u64 { + fn connect_provider_unhidden(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "provider-unhidden", @@ -158,12 +159,12 @@ unsafe extern "C" fn provider_hidden_trampoline

(this: *mut ffi::GstDeviceProv where P: IsA { callback_guard!(); let f: &&(Fn(&P, &str) + Send + Sync + 'static) = transmute(f); - f(&DeviceProvider::from_glib_none(this).downcast_unchecked(), &String::from_glib_none(object)) + f(&DeviceProvider::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(object)) } unsafe extern "C" fn provider_unhidden_trampoline

(this: *mut ffi::GstDeviceProvider, object: *mut libc::c_char, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P, &str) + Send + Sync + 'static) = transmute(f); - f(&DeviceProvider::from_glib_none(this).downcast_unchecked(), &String::from_glib_none(object)) + f(&DeviceProvider::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(object)) } diff --git a/gstreamer/src/auto/device_provider_factory.rs b/gstreamer/src/auto/device_provider_factory.rs index e967f28c5..7c7a53b00 100644 --- a/gstreamer/src/auto/device_provider_factory.rs +++ b/gstreamer/src/auto/device_provider_factory.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use DeviceProvider; diff --git a/gstreamer/src/auto/element.rs b/gstreamer/src/auto/element.rs index a55620aa6..a0026c108 100644 --- a/gstreamer/src/auto/element.rs +++ b/gstreamer/src/auto/element.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Bus; @@ -26,6 +26,7 @@ use ffi; use glib; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -202,11 +203,11 @@ pub trait ElementExt { fn unlink_pads>(&self, srcpadname: &str, dest: &P, destpadname: &str); - fn connect_no_more_pads(&self, f: F) -> u64; + fn connect_no_more_pads(&self, f: F) -> SignalHandlerId; - fn connect_pad_added(&self, f: F) -> u64; + fn connect_pad_added(&self, f: F) -> SignalHandlerId; - fn connect_pad_removed(&self, f: F) -> u64; + fn connect_pad_removed(&self, f: F) -> SignalHandlerId; } impl + IsA> ElementExt for O { @@ -576,7 +577,7 @@ impl + IsA> ElementExt for O { } } - fn connect_no_more_pads(&self, f: F) -> u64 { + fn connect_no_more_pads(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "no-more-pads", @@ -584,7 +585,7 @@ impl + IsA> ElementExt for O { } } - fn connect_pad_added(&self, f: F) -> u64 { + fn connect_pad_added(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "pad-added", @@ -592,7 +593,7 @@ impl + IsA> ElementExt for O { } } - fn connect_pad_removed(&self, f: F) -> u64 { + fn connect_pad_removed(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "pad-removed", @@ -605,19 +606,19 @@ unsafe extern "C" fn no_more_pads_trampoline

(this: *mut ffi::GstElement, f: g where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Element::from_glib_none(this).downcast_unchecked()) + f(&Element::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn pad_added_trampoline

(this: *mut ffi::GstElement, new_pad: *mut ffi::GstPad, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P, &Pad) + Send + Sync + 'static) = transmute(f); - f(&Element::from_glib_none(this).downcast_unchecked(), &from_glib_none(new_pad)) + f(&Element::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(new_pad)) } unsafe extern "C" fn pad_removed_trampoline

(this: *mut ffi::GstElement, old_pad: *mut ffi::GstPad, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P, &Pad) + Send + Sync + 'static) = transmute(f); - f(&Element::from_glib_none(this).downcast_unchecked(), &from_glib_none(old_pad)) + f(&Element::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(old_pad)) } diff --git a/gstreamer/src/auto/element_factory.rs b/gstreamer/src/auto/element_factory.rs index 878469bde..dec09dc2d 100644 --- a/gstreamer/src/auto/element_factory.rs +++ b/gstreamer/src/auto/element_factory.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Caps; diff --git a/gstreamer/src/auto/enums.rs b/gstreamer/src/auto/enums.rs index b94784c91..69e6869b1 100644 --- a/gstreamer/src/auto/enums.rs +++ b/gstreamer/src/auto/enums.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/flags.rs b/gstreamer/src/auto/flags.rs index e4fde300f..972c15d43 100644 --- a/gstreamer/src/auto/flags.rs +++ b/gstreamer/src/auto/flags.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/functions.rs b/gstreamer/src/auto/functions.rs index aef06ee8a..bb24016fb 100644 --- a/gstreamer/src/auto/functions.rs +++ b/gstreamer/src/auto/functions.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Bin; diff --git a/gstreamer/src/auto/ghost_pad.rs b/gstreamer/src/auto/ghost_pad.rs index 0f95e8bdd..fdc42cd59 100644 --- a/gstreamer/src/auto/ghost_pad.rs +++ b/gstreamer/src/auto/ghost_pad.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Object; diff --git a/gstreamer/src/auto/mod.rs b/gstreamer/src/auto/mod.rs index 7ee71f815..9487746d3 100644 --- a/gstreamer/src/auto/mod.rs +++ b/gstreamer/src/auto/mod.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT mod bin; diff --git a/gstreamer/src/auto/object.rs b/gstreamer/src/auto/object.rs index 84b6a3b06..ab8db354e 100644 --- a/gstreamer/src/auto/object.rs +++ b/gstreamer/src/auto/object.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ClockTime; @@ -7,6 +7,7 @@ use ffi; use glib; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -95,11 +96,11 @@ pub trait GstObjectExt { fn unparent(&self); - //fn connect_deep_notify(&self, f: F) -> u64; + //fn connect_deep_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_name_notify(&self, f: F) -> u64; + fn connect_property_name_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_parent_notify(&self, f: F) -> u64; + fn connect_property_parent_notify(&self, f: F) -> SignalHandlerId; } impl + IsA> GstObjectExt for O { @@ -233,11 +234,11 @@ impl + IsA> GstObjectExt for O { } } - //fn connect_deep_notify(&self, f: F) -> u64 { + //fn connect_deep_notify(&self, f: F) -> SignalHandlerId { // Ignored prop: GObject.ParamSpec //} - fn connect_property_name_notify(&self, f: F) -> u64 { + fn connect_property_name_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::name", @@ -245,7 +246,7 @@ impl + IsA> GstObjectExt for O { } } - fn connect_property_parent_notify(&self, f: F) -> u64 { + fn connect_property_parent_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::parent", @@ -258,12 +259,12 @@ unsafe extern "C" fn notify_name_trampoline

(this: *mut ffi::GstObject, _param where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Object::from_glib_none(this).downcast_unchecked()) + f(&Object::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_parent_trampoline

(this: *mut ffi::GstObject, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Object::from_glib_none(this).downcast_unchecked()) + f(&Object::from_glib_borrow(this).downcast_unchecked()) } diff --git a/gstreamer/src/auto/pad.rs b/gstreamer/src/auto/pad.rs index 94328048e..bfa183130 100644 --- a/gstreamer/src/auto/pad.rs +++ b/gstreamer/src/auto/pad.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Caps; @@ -21,6 +21,7 @@ use glib; use glib::Value; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -215,17 +216,17 @@ pub trait PadExt { fn set_property_template(&self, template: Option<&PadTemplate>); - fn connect_linked(&self, f: F) -> u64; + fn connect_linked(&self, f: F) -> SignalHandlerId; - fn connect_unlinked(&self, f: F) -> u64; + fn connect_unlinked(&self, f: F) -> SignalHandlerId; - fn connect_property_caps_notify(&self, f: F) -> u64; + fn connect_property_caps_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_direction_notify(&self, f: F) -> u64; + fn connect_property_direction_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_offset_notify(&self, f: F) -> u64; + fn connect_property_offset_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_template_notify(&self, f: F) -> u64; + fn connect_property_template_notify(&self, f: F) -> SignalHandlerId; } impl + IsA> PadExt for O { @@ -631,7 +632,7 @@ impl + IsA> PadExt for O { } } - fn connect_linked(&self, f: F) -> u64 { + fn connect_linked(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "linked", @@ -639,7 +640,7 @@ impl + IsA> PadExt for O { } } - fn connect_unlinked(&self, f: F) -> u64 { + fn connect_unlinked(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "unlinked", @@ -647,7 +648,7 @@ impl + IsA> PadExt for O { } } - fn connect_property_caps_notify(&self, f: F) -> u64 { + fn connect_property_caps_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::caps", @@ -655,7 +656,7 @@ impl + IsA> PadExt for O { } } - fn connect_property_direction_notify(&self, f: F) -> u64 { + fn connect_property_direction_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::direction", @@ -663,7 +664,7 @@ impl + IsA> PadExt for O { } } - fn connect_property_offset_notify(&self, f: F) -> u64 { + fn connect_property_offset_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::offset", @@ -671,7 +672,7 @@ impl + IsA> PadExt for O { } } - fn connect_property_template_notify(&self, f: F) -> u64 { + fn connect_property_template_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::template", @@ -684,40 +685,40 @@ unsafe extern "C" fn linked_trampoline

(this: *mut ffi::GstPad, peer: *mut ffi where P: IsA { callback_guard!(); let f: &&(Fn(&P, &Pad) + Send + Sync + 'static) = transmute(f); - f(&Pad::from_glib_none(this).downcast_unchecked(), &from_glib_none(peer)) + f(&Pad::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(peer)) } unsafe extern "C" fn unlinked_trampoline

(this: *mut ffi::GstPad, peer: *mut ffi::GstPad, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P, &Pad) + Send + Sync + 'static) = transmute(f); - f(&Pad::from_glib_none(this).downcast_unchecked(), &from_glib_none(peer)) + f(&Pad::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(peer)) } unsafe extern "C" fn notify_caps_trampoline

(this: *mut ffi::GstPad, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Pad::from_glib_none(this).downcast_unchecked()) + f(&Pad::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_direction_trampoline

(this: *mut ffi::GstPad, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Pad::from_glib_none(this).downcast_unchecked()) + f(&Pad::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_offset_trampoline

(this: *mut ffi::GstPad, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Pad::from_glib_none(this).downcast_unchecked()) + f(&Pad::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_template_trampoline

(this: *mut ffi::GstPad, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Pad::from_glib_none(this).downcast_unchecked()) + f(&Pad::from_glib_borrow(this).downcast_unchecked()) } diff --git a/gstreamer/src/auto/pad_template.rs b/gstreamer/src/auto/pad_template.rs index 8aaae77f3..f43103012 100644 --- a/gstreamer/src/auto/pad_template.rs +++ b/gstreamer/src/auto/pad_template.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Caps; @@ -9,6 +9,7 @@ use PadPresence; use ffi; use glib::Value; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -70,7 +71,7 @@ impl PadTemplate { } } - pub fn connect_pad_created(&self, f: F) -> u64 { + pub fn connect_pad_created(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "pad-created", @@ -78,7 +79,7 @@ impl PadTemplate { } } - pub fn connect_property_caps_notify(&self, f: F) -> u64 { + pub fn connect_property_caps_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::caps", @@ -86,7 +87,7 @@ impl PadTemplate { } } - pub fn connect_property_direction_notify(&self, f: F) -> u64 { + pub fn connect_property_direction_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::direction", @@ -94,7 +95,7 @@ impl PadTemplate { } } - pub fn connect_property_name_template_notify(&self, f: F) -> u64 { + pub fn connect_property_name_template_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::name-template", @@ -102,7 +103,7 @@ impl PadTemplate { } } - pub fn connect_property_presence_notify(&self, f: F) -> u64 { + pub fn connect_property_presence_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::presence", @@ -117,29 +118,29 @@ unsafe impl Sync for PadTemplate {} unsafe extern "C" fn pad_created_trampoline(this: *mut ffi::GstPadTemplate, pad: *mut ffi::GstPad, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&PadTemplate, &Pad) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this), &from_glib_none(pad)) + f(&from_glib_borrow(this), &from_glib_borrow(pad)) } unsafe extern "C" fn notify_caps_trampoline(this: *mut ffi::GstPadTemplate, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&PadTemplate) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_direction_trampoline(this: *mut ffi::GstPadTemplate, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&PadTemplate) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_name_template_trampoline(this: *mut ffi::GstPadTemplate, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&PadTemplate) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_presence_trampoline(this: *mut ffi::GstPadTemplate, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&PadTemplate) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } diff --git a/gstreamer/src/auto/pipeline.rs b/gstreamer/src/auto/pipeline.rs index de570473c..fc495f665 100644 --- a/gstreamer/src/auto/pipeline.rs +++ b/gstreamer/src/auto/pipeline.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Bin; @@ -11,6 +11,7 @@ use ffi; use glib; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -61,11 +62,11 @@ pub trait PipelineExt { fn use_clock<'a, P: IsA + 'a, Q: Into>>(&self, clock: Q); - fn connect_property_auto_flush_bus_notify(&self, f: F) -> u64; + fn connect_property_auto_flush_bus_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_delay_notify(&self, f: F) -> u64; + fn connect_property_delay_notify(&self, f: F) -> SignalHandlerId; - fn connect_property_latency_notify(&self, f: F) -> u64; + fn connect_property_latency_notify(&self, f: F) -> SignalHandlerId; } impl + IsA> PipelineExt for O { @@ -125,7 +126,7 @@ impl + IsA> PipelineExt for O { } } - fn connect_property_auto_flush_bus_notify(&self, f: F) -> u64 { + fn connect_property_auto_flush_bus_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::auto-flush-bus", @@ -133,7 +134,7 @@ impl + IsA> PipelineExt for O { } } - fn connect_property_delay_notify(&self, f: F) -> u64 { + fn connect_property_delay_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::delay", @@ -141,7 +142,7 @@ impl + IsA> PipelineExt for O { } } - fn connect_property_latency_notify(&self, f: F) -> u64 { + fn connect_property_latency_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::latency", @@ -154,19 +155,19 @@ unsafe extern "C" fn notify_auto_flush_bus_trampoline

(this: *mut ffi::GstPipe where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Pipeline::from_glib_none(this).downcast_unchecked()) + f(&Pipeline::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_delay_trampoline

(this: *mut ffi::GstPipeline, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Pipeline::from_glib_none(this).downcast_unchecked()) + f(&Pipeline::from_glib_borrow(this).downcast_unchecked()) } unsafe extern "C" fn notify_latency_trampoline

(this: *mut ffi::GstPipeline, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&Pipeline::from_glib_none(this).downcast_unchecked()) + f(&Pipeline::from_glib_borrow(this).downcast_unchecked()) } diff --git a/gstreamer/src/auto/plugin.rs b/gstreamer/src/auto/plugin.rs index 7472c0da6..abeb56fe6 100644 --- a/gstreamer/src/auto/plugin.rs +++ b/gstreamer/src/auto/plugin.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Error; diff --git a/gstreamer/src/auto/preset.rs b/gstreamer/src/auto/preset.rs index ca8273a4c..3acc47555 100644 --- a/gstreamer/src/auto/preset.rs +++ b/gstreamer/src/auto/preset.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/proxy_pad.rs b/gstreamer/src/auto/proxy_pad.rs index 3081aa29c..20b0b0015 100644 --- a/gstreamer/src/auto/proxy_pad.rs +++ b/gstreamer/src/auto/proxy_pad.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Iterator; diff --git a/gstreamer/src/auto/stream.rs b/gstreamer/src/auto/stream.rs index 62fa20f19..e18b6b73b 100644 --- a/gstreamer/src/auto/stream.rs +++ b/gstreamer/src/auto/stream.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Caps; @@ -8,6 +8,7 @@ use StreamType; use TagList; use ffi; use glib::Value; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -171,7 +172,7 @@ impl Stream { } } - pub fn connect_property_caps_notify(&self, f: F) -> u64 { + pub fn connect_property_caps_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::caps", @@ -179,7 +180,7 @@ impl Stream { } } - pub fn connect_property_stream_flags_notify(&self, f: F) -> u64 { + pub fn connect_property_stream_flags_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::stream-flags", @@ -187,7 +188,7 @@ impl Stream { } } - pub fn connect_property_stream_id_notify(&self, f: F) -> u64 { + pub fn connect_property_stream_id_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::stream-id", @@ -195,7 +196,7 @@ impl Stream { } } - pub fn connect_property_stream_type_notify(&self, f: F) -> u64 { + pub fn connect_property_stream_type_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::stream-type", @@ -203,7 +204,7 @@ impl Stream { } } - pub fn connect_property_tags_notify(&self, f: F) -> u64 { + pub fn connect_property_tags_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::tags", @@ -218,29 +219,29 @@ unsafe impl Sync for Stream {} unsafe extern "C" fn notify_caps_trampoline(this: *mut ffi::GstStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Stream) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_stream_flags_trampoline(this: *mut ffi::GstStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Stream) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_stream_id_trampoline(this: *mut ffi::GstStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Stream) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_stream_type_trampoline(this: *mut ffi::GstStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Stream) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } unsafe extern "C" fn notify_tags_trampoline(this: *mut ffi::GstStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&Stream) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } diff --git a/gstreamer/src/auto/stream_collection.rs b/gstreamer/src/auto/stream_collection.rs index 786b1bbda..3ec5d4c3c 100644 --- a/gstreamer/src/auto/stream_collection.rs +++ b/gstreamer/src/auto/stream_collection.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Object; @@ -6,6 +6,7 @@ use Object; use Stream; use ffi; use glib::Value; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -76,11 +77,11 @@ impl StreamCollection { } } - //pub fn connect_stream_notify(&self, f: F) -> u64 { + //pub fn connect_stream_notify(&self, f: F) -> SignalHandlerId { // Ignored p0: GObject.ParamSpec //} - pub fn connect_property_upstream_id_notify(&self, f: F) -> u64 { + pub fn connect_property_upstream_id_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::upstream-id", @@ -95,5 +96,5 @@ unsafe impl Sync for StreamCollection {} unsafe extern "C" fn notify_upstream_id_trampoline(this: *mut ffi::GstStreamCollection, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { callback_guard!(); let f: &&(Fn(&StreamCollection) + Send + Sync + 'static) = transmute(f); - f(&from_glib_none(this)) + f(&from_glib_borrow(this)) } diff --git a/gstreamer/src/auto/system_clock.rs b/gstreamer/src/auto/system_clock.rs index e71869881..e9fcae207 100644 --- a/gstreamer/src/auto/system_clock.rs +++ b/gstreamer/src/auto/system_clock.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Clock; @@ -9,6 +9,7 @@ use glib; use glib::Value; use glib::object::Downcast; use glib::object::IsA; +use glib::signal::SignalHandlerId; use glib::signal::connect; use glib::translate::*; use glib_ffi; @@ -50,7 +51,7 @@ pub trait SystemClockExt { fn set_property_clock_type(&self, clock_type: ClockType); - fn connect_property_clock_type_notify(&self, f: F) -> u64; + fn connect_property_clock_type_notify(&self, f: F) -> SignalHandlerId; } impl + IsA> SystemClockExt for O { @@ -69,7 +70,7 @@ impl + IsA> SystemClockExt for O { } } - fn connect_property_clock_type_notify(&self, f: F) -> u64 { + fn connect_property_clock_type_notify(&self, f: F) -> SignalHandlerId { unsafe { let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "notify::clock-type", @@ -82,5 +83,5 @@ unsafe extern "C" fn notify_clock_type_trampoline

(this: *mut ffi::GstSystemCl where P: IsA { callback_guard!(); let f: &&(Fn(&P) + Send + Sync + 'static) = transmute(f); - f(&SystemClock::from_glib_none(this).downcast_unchecked()) + f(&SystemClock::from_glib_borrow(this).downcast_unchecked()) } diff --git a/gstreamer/src/auto/tag_setter.rs b/gstreamer/src/auto/tag_setter.rs index 5bac60885..d7f9cda21 100644 --- a/gstreamer/src/auto/tag_setter.rs +++ b/gstreamer/src/auto/tag_setter.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Element; diff --git a/gstreamer/src/auto/toc_setter.rs b/gstreamer/src/auto/toc_setter.rs index 4e0b6a972..82d69dd6c 100644 --- a/gstreamer/src/auto/toc_setter.rs +++ b/gstreamer/src/auto/toc_setter.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Element; diff --git a/gstreamer/src/auto/u_r_i_handler.rs b/gstreamer/src/auto/u_r_i_handler.rs index bcd4b04a4..cce62d4a0 100644 --- a/gstreamer/src/auto/u_r_i_handler.rs +++ b/gstreamer/src/auto/u_r_i_handler.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (e43d6c3) from gir-files (???) +// This file was generated by gir (6a48033) from gir-files (???) // DO NOT EDIT use Error; diff --git a/gstreamer/src/bus.rs b/gstreamer/src/bus.rs index e6d7df2fe..85fac8e53 100644 --- a/gstreamer/src/bus.rs +++ b/gstreamer/src/bus.rs @@ -38,7 +38,7 @@ unsafe extern "C" fn trampoline_watch( ) -> gboolean { let _guard = CallbackGuard::new(); let func: &RefCell Continue + Send + 'static>> = transmute(func); - (&mut *func.borrow_mut())(&from_glib_none(bus), &Message::from_glib_none(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(ptr: gpointer) { @@ -61,7 +61,7 @@ unsafe extern "C" fn trampoline_sync( ) -> ffi::GstBusSyncReply { let _guard = CallbackGuard::new(); let f: &&(Fn(&Bus, &Message) -> BusSyncReply + Send + Sync + 'static) = transmute(func); - f(&from_glib_none(bus), &Message::from_glib_none(msg)).to_glib() + f(&from_glib_borrow(bus), &Message::from_glib_borrow(msg)).to_glib() } unsafe extern "C" fn destroy_closure_sync(ptr: gpointer) { diff --git a/gstreamer/src/clock.rs b/gstreamer/src/clock.rs index 08e597c0e..5f347f503 100644 --- a/gstreamer/src/clock.rs +++ b/gstreamer/src/clock.rs @@ -40,7 +40,7 @@ unsafe extern "C" fn trampoline_wait_async( ) -> gboolean { let _guard = CallbackGuard::new(); let f: &&(Fn(&Clock, ClockTime, &ClockId) -> bool + Send + 'static) = transmute(func); - f(&from_glib_none(clock), time, &from_glib_none(id)).to_glib() + f(&from_glib_borrow(clock), time, &from_glib_borrow(id)).to_glib() } unsafe extern "C" fn destroy_closure_wait_async(ptr: gpointer) { diff --git a/gstreamer/src/pad.rs b/gstreamer/src/pad.rs index de283eda3..95b4e0f0e 100644 --- a/gstreamer/src/pad.rs +++ b/gstreamer/src/pad.rs @@ -21,7 +21,7 @@ use std::mem::transmute; use std::ptr; use glib::{IsA, StaticType}; -use glib::translate::{from_glib, from_glib_full, from_glib_none, FromGlib, ToGlib, ToGlibPtr}; +use glib::translate::{from_glib, from_glib_full, from_glib_borrow, from_glib_none, FromGlib, ToGlib, ToGlibPtr}; use glib::source::CallbackGuard; use glib_ffi; use glib_ffi::gpointer; @@ -328,7 +328,7 @@ unsafe extern "C" fn trampoline_pad_probe( }, }; - let ret = func(&from_glib_none(pad), &mut probe_info).to_glib(); + let ret = func(&from_glib_borrow(pad), &mut probe_info).to_glib(); match probe_info.data { Some(PadProbeData::Buffer(buffer)) => {