From 019afd54f9e6982098e825dbe572ada6dc6c43d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 5 Apr 2020 17:52:56 +0300 Subject: [PATCH] Update for new from_glib_borrow signature See https://github.com/gtk-rs/glib/pull/605 --- gstreamer-app/src/app_sink.rs | 12 +-- gstreamer-app/src/app_src.rs | 12 +-- gstreamer-app/src/auto/versions.txt | 4 +- gstreamer-audio/src/auto/audio_base_sink.rs | 16 ++-- gstreamer-audio/src/auto/audio_base_src.rs | 12 +-- gstreamer-audio/src/auto/audio_decoder.rs | 6 +- gstreamer-audio/src/auto/audio_encoder.rs | 8 +- gstreamer-audio/src/auto/stream_volume.rs | 4 +- gstreamer-audio/src/auto/versions.txt | 4 +- gstreamer-audio/src/subclass/audio_decoder.rs | 42 +++++----- gstreamer-audio/src/subclass/audio_encoder.rs | 40 +++++----- gstreamer-audio/src/subclass/audio_sink.rs | 28 +++---- gstreamer-audio/src/subclass/audio_src.rs | 28 +++---- gstreamer-base/src/aggregator.rs | 2 +- gstreamer-base/src/auto/aggregator.rs | 4 +- gstreamer-base/src/auto/aggregator_pad.rs | 4 +- gstreamer-base/src/auto/base_parse.rs | 2 +- gstreamer-base/src/auto/base_sink.rs | 24 +++--- gstreamer-base/src/auto/base_src.rs | 8 +- gstreamer-base/src/auto/base_transform.rs | 2 +- gstreamer-base/src/auto/versions.txt | 4 +- gstreamer-base/src/subclass/aggregator.rs | 54 ++++++------- gstreamer-base/src/subclass/aggregator_pad.rs | 4 +- gstreamer-base/src/subclass/base_parse.rs | 10 +-- gstreamer-base/src/subclass/base_sink.rs | 30 ++++---- gstreamer-base/src/subclass/base_src.rs | 52 +++++++------ gstreamer-base/src/subclass/base_transform.rs | 56 +++++++------- gstreamer-base/src/subclass/push_src.rs | 6 +- gstreamer-check/src/auto/versions.txt | 4 +- gstreamer-editing-services/src/auto/asset.rs | 4 +- gstreamer-editing-services/src/auto/clip.rs | 4 +- .../src/auto/container.rs | 6 +- gstreamer-editing-services/src/auto/group.rs | 10 +-- gstreamer-editing-services/src/auto/layer.rs | 8 +- .../src/auto/pipeline.rs | 12 +-- .../src/auto/project.rs | 12 +-- .../src/auto/timeline.rs | 22 +++--- .../src/auto/timeline_element.rs | 18 ++--- gstreamer-editing-services/src/auto/track.rs | 12 +-- .../src/auto/track_element.rs | 6 +- .../src/auto/uri_clip.rs | 6 +- .../src/auto/uri_clip_asset.rs | 2 +- .../src/auto/versions.txt | 4 +- gstreamer-gl/src/auto/gl_base_filter.rs | 2 +- gstreamer-gl/src/auto/gl_display.rs | 2 +- gstreamer-gl/src/auto/gl_window.rs | 4 +- gstreamer-gl/src/auto/versions.txt | 4 +- gstreamer-gl/src/gl_video_frame.rs | 2 +- gstreamer-net/src/auto/versions.txt | 4 +- gstreamer-pbutils/src/auto/discoverer.rs | 4 +- gstreamer-pbutils/src/auto/versions.txt | 4 +- gstreamer-pbutils/src/discoverer.rs | 2 +- gstreamer-player/src/auto/versions.txt | 4 +- gstreamer-rtp/src/auto/versions.txt | 4 +- gstreamer-rtsp-server/src/auto/rtsp_auth.rs | 2 +- gstreamer-rtsp-server/src/auto/rtsp_client.rs | 52 ++++++------- gstreamer-rtsp-server/src/auto/rtsp_media.rs | 59 +++++++------- .../src/auto/rtsp_media_factory.rs | 30 ++++---- .../src/auto/rtsp_media_factory_uri.rs | 4 +- gstreamer-rtsp-server/src/auto/rtsp_server.rs | 14 ++-- .../src/auto/rtsp_session.rs | 4 +- .../src/auto/rtsp_session_media.rs | 18 +++-- .../src/auto/rtsp_session_pool.rs | 4 +- gstreamer-rtsp-server/src/auto/rtsp_stream.rs | 12 +-- .../src/auto/rtsp_thread_pool.rs | 2 +- gstreamer-rtsp-server/src/auto/versions.txt | 4 +- gstreamer-rtsp-server/src/rtsp_auth.rs | 2 +- gstreamer-rtsp-server/src/rtsp_context.rs | 16 ++-- .../src/subclass/rtsp_client.rs | 64 ++++++++-------- .../src/subclass/rtsp_media.rs | 48 ++++++------ .../src/subclass/rtsp_media_factory.rs | 14 ++-- .../src/subclass/rtsp_server.rs | 4 +- gstreamer-rtsp/src/auto/versions.txt | 4 +- gstreamer-sdp/src/auto/versions.txt | 4 +- gstreamer-video/src/auto/versions.txt | 4 +- gstreamer-video/src/auto/video_encoder.rs | 2 +- gstreamer-video/src/subclass/video_decoder.rs | 50 ++++++------ gstreamer-video/src/subclass/video_encoder.rs | 42 +++++----- gstreamer-video/src/video_frame.rs | 41 ++++++---- gstreamer-video/src/video_time_code.rs | 9 +-- .../src/video_time_code_interval.rs | 6 +- gstreamer-webrtc/src/auto/versions.txt | 4 +- gstreamer/src/auto/bin.rs | 12 +-- gstreamer/src/auto/child_proxy.rs | 4 +- gstreamer/src/auto/clock.rs | 8 +- gstreamer/src/auto/device.rs | 2 +- gstreamer/src/auto/device_monitor.rs | 2 +- gstreamer/src/auto/device_provider.rs | 4 +- gstreamer/src/auto/element.rs | 6 +- gstreamer/src/auto/object.rs | 4 +- gstreamer/src/auto/pad.rs | 10 +-- gstreamer/src/auto/pipeline.rs | 6 +- gstreamer/src/auto/system_clock.rs | 2 +- gstreamer/src/auto/versions.txt | 4 +- gstreamer/src/bin.rs | 4 +- gstreamer/src/element.rs | 2 +- gstreamer/src/iterator.rs | 16 ++-- gstreamer/src/log.rs | 6 +- gstreamer/src/miniobject.rs | 39 +++++----- gstreamer/src/object.rs | 2 +- gstreamer/src/pad.rs | 76 +++++++++++++------ gstreamer/src/promise.rs | 2 +- gstreamer/src/segment.rs | 4 +- gstreamer/src/static_caps.rs | 6 +- gstreamer/src/static_pad_template.rs | 8 +- gstreamer/src/subclass/bin.rs | 10 +-- gstreamer/src/subclass/child_proxy.rs | 6 +- gstreamer/src/subclass/clock.rs | 12 +-- gstreamer/src/subclass/device.rs | 9 ++- gstreamer/src/subclass/device_provider.rs | 8 +- gstreamer/src/subclass/element.rs | 24 +++--- gstreamer/src/subclass/pad.rs | 4 +- 112 files changed, 751 insertions(+), 714 deletions(-) diff --git a/gstreamer-app/src/app_sink.rs b/gstreamer-app/src/app_sink.rs index fb67e9ace..a182a3468 100644 --- a/gstreamer-app/src/app_sink.rs +++ b/gstreamer-app/src/app_sink.rs @@ -157,10 +157,10 @@ fn post_panic_error_message(element: &AppSink, err: &dyn std::any::Any) { unsafe extern "C" fn trampoline_eos(appsink: *mut gst_app_sys::GstAppSink, callbacks: gpointer) { let callbacks = &*(callbacks as *const AppSinkCallbacks); - let element: AppSink = from_glib_borrow(appsink); + let element: Borrowed = from_glib_borrow(appsink); if callbacks.panicked.load(Ordering::Relaxed) { - let element: AppSink = from_glib_borrow(appsink); + let element: Borrowed = from_glib_borrow(appsink); gst_element_error!(&element, gst::LibraryError::Failed, ["Panicked"]); return; } @@ -184,10 +184,10 @@ unsafe extern "C" fn trampoline_new_preroll( callbacks: gpointer, ) -> gst_sys::GstFlowReturn { let callbacks = &*(callbacks as *const AppSinkCallbacks); - let element: AppSink = from_glib_borrow(appsink); + let element: Borrowed = from_glib_borrow(appsink); if callbacks.panicked.load(Ordering::Relaxed) { - let element: AppSink = from_glib_borrow(appsink); + let element: Borrowed = from_glib_borrow(appsink); gst_element_error!(&element, gst::LibraryError::Failed, ["Panicked"]); return gst::FlowReturn::Error.to_glib(); } @@ -217,10 +217,10 @@ unsafe extern "C" fn trampoline_new_sample( callbacks: gpointer, ) -> gst_sys::GstFlowReturn { let callbacks = &*(callbacks as *const AppSinkCallbacks); - let element: AppSink = from_glib_borrow(appsink); + let element: Borrowed = from_glib_borrow(appsink); if callbacks.panicked.load(Ordering::Relaxed) { - let element: AppSink = from_glib_borrow(appsink); + let element: Borrowed = from_glib_borrow(appsink); gst_element_error!(&element, gst::LibraryError::Failed, ["Panicked"]); return gst::FlowReturn::Error.to_glib(); } diff --git a/gstreamer-app/src/app_src.rs b/gstreamer-app/src/app_src.rs index 970efa601..9f74036fb 100644 --- a/gstreamer-app/src/app_src.rs +++ b/gstreamer-app/src/app_src.rs @@ -133,10 +133,10 @@ unsafe extern "C" fn trampoline_need_data( callbacks: gpointer, ) { let callbacks = &*(callbacks as *const AppSrcCallbacks); - let element: AppSrc = from_glib_borrow(appsrc); + let element: Borrowed = from_glib_borrow(appsrc); if callbacks.panicked.load(Ordering::Relaxed) { - let element: AppSrc = from_glib_borrow(appsrc); + let element: Borrowed = from_glib_borrow(appsrc); gst_element_error!(&element, gst::LibraryError::Failed, ["Panicked"]); return; } @@ -160,10 +160,10 @@ unsafe extern "C" fn trampoline_enough_data( callbacks: gpointer, ) { let callbacks = &*(callbacks as *const AppSrcCallbacks); - let element: AppSrc = from_glib_borrow(appsrc); + let element: Borrowed = from_glib_borrow(appsrc); if callbacks.panicked.load(Ordering::Relaxed) { - let element: AppSrc = from_glib_borrow(appsrc); + let element: Borrowed = from_glib_borrow(appsrc); gst_element_error!(&element, gst::LibraryError::Failed, ["Panicked"]); return; } @@ -186,10 +186,10 @@ unsafe extern "C" fn trampoline_seek_data( callbacks: gpointer, ) -> gboolean { let callbacks = &*(callbacks as *const AppSrcCallbacks); - let element: AppSrc = from_glib_borrow(appsrc); + let element: Borrowed = from_glib_borrow(appsrc); if callbacks.panicked.load(Ordering::Relaxed) { - let element: AppSrc = from_glib_borrow(appsrc); + let element: Borrowed = from_glib_borrow(appsrc); gst_element_error!(&element, gst::LibraryError::Failed, ["Panicked"]); return false.to_glib(); } diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-app/src/auto/versions.txt +++ b/gstreamer-app/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-audio/src/auto/audio_base_sink.rs b/gstreamer-audio/src/auto/audio_base_sink.rs index 264b88458..0948d21d6 100644 --- a/gstreamer-audio/src/auto/audio_base_sink.rs +++ b/gstreamer-audio/src/auto/audio_base_sink.rs @@ -291,7 +291,7 @@ impl> AudioBaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -318,7 +318,7 @@ impl> AudioBaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -346,7 +346,7 @@ impl> AudioBaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -373,7 +373,7 @@ impl> AudioBaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -403,7 +403,7 @@ impl> AudioBaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -430,7 +430,7 @@ impl> AudioBaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -457,7 +457,7 @@ impl> AudioBaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -484,7 +484,7 @@ impl> AudioBaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-audio/src/auto/audio_base_src.rs b/gstreamer-audio/src/auto/audio_base_src.rs index 89bdcf811..0eeae71f4 100644 --- a/gstreamer-audio/src/auto/audio_base_src.rs +++ b/gstreamer-audio/src/auto/audio_base_src.rs @@ -209,7 +209,7 @@ impl> AudioBaseSrcExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -239,7 +239,7 @@ impl> AudioBaseSrcExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -266,7 +266,7 @@ impl> AudioBaseSrcExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -291,7 +291,7 @@ impl> AudioBaseSrcExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -318,7 +318,7 @@ impl> AudioBaseSrcExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -345,7 +345,7 @@ impl> AudioBaseSrcExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast()) + f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-audio/src/auto/audio_decoder.rs b/gstreamer-audio/src/auto/audio_decoder.rs index e02adc360..51f8ee137 100644 --- a/gstreamer-audio/src/auto/audio_decoder.rs +++ b/gstreamer-audio/src/auto/audio_decoder.rs @@ -336,7 +336,7 @@ impl> AudioDecoderExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioDecoder::from_glib_borrow(this).unsafe_cast()) + f(&AudioDecoder::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -361,7 +361,7 @@ impl> AudioDecoderExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioDecoder::from_glib_borrow(this).unsafe_cast()) + f(&AudioDecoder::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -386,7 +386,7 @@ impl> AudioDecoderExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioDecoder::from_glib_borrow(this).unsafe_cast()) + f(&AudioDecoder::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-audio/src/auto/audio_encoder.rs b/gstreamer-audio/src/auto/audio_encoder.rs index b238f5e8f..beab93016 100644 --- a/gstreamer-audio/src/auto/audio_encoder.rs +++ b/gstreamer-audio/src/auto/audio_encoder.rs @@ -337,7 +337,7 @@ impl> AudioEncoderExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioEncoder::from_glib_borrow(this).unsafe_cast()) + f(&AudioEncoder::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -362,7 +362,7 @@ impl> AudioEncoderExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioEncoder::from_glib_borrow(this).unsafe_cast()) + f(&AudioEncoder::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -392,7 +392,7 @@ impl> AudioEncoderExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioEncoder::from_glib_borrow(this).unsafe_cast()) + f(&AudioEncoder::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -419,7 +419,7 @@ impl> AudioEncoderExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AudioEncoder::from_glib_borrow(this).unsafe_cast()) + f(&AudioEncoder::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-audio/src/auto/stream_volume.rs b/gstreamer-audio/src/auto/stream_volume.rs index 75d77a5f6..d73f0cffa 100644 --- a/gstreamer-audio/src/auto/stream_volume.rs +++ b/gstreamer-audio/src/auto/stream_volume.rs @@ -104,7 +104,7 @@ impl> StreamVolumeExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&StreamVolume::from_glib_borrow(this).unsafe_cast()) + f(&StreamVolume::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -129,7 +129,7 @@ impl> StreamVolumeExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&StreamVolume::from_glib_borrow(this).unsafe_cast()) + f(&StreamVolume::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-audio/src/auto/versions.txt +++ b/gstreamer-audio/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-audio/src/subclass/audio_decoder.rs b/gstreamer-audio/src/subclass/audio_decoder.rs index c44c60618..d85c9fe34 100644 --- a/gstreamer-audio/src/subclass/audio_decoder.rs +++ b/gstreamer-audio/src/subclass/audio_decoder.rs @@ -549,7 +549,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.open(&wrap) { @@ -572,7 +572,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.close(&wrap) { @@ -595,7 +595,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.start(&wrap) { @@ -618,7 +618,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.stop(&wrap) { @@ -642,13 +642,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.set_format(&wrap, &from_glib_borrow(caps)) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -668,7 +668,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { match imp.parse(&wrap, &from_glib_borrow(adapter)) { @@ -698,7 +698,7 @@ where let buffer = buffer as *mut gst_sys::GstBuffer; let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.handle_frame( @@ -720,7 +720,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { match imp.pre_push(&wrap, from_glib_full(*buffer)) { @@ -748,7 +748,7 @@ unsafe extern "C" fn audio_decoder_flush( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), (), { AudioDecoderImpl::flush(imp, &wrap, from_glib(hard)) @@ -764,13 +764,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.negotiate(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -788,13 +788,15 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::Caps::new_empty(), { AudioDecoderImpl::get_caps( imp, &wrap, - Option::::from_glib_borrow(filter).as_ref(), + Option::::from_glib_borrow(filter) + .as_ref() + .as_ref(), ) }) .to_glib_full() @@ -810,7 +812,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.sink_event(&wrap, from_glib_full(event)) @@ -828,7 +830,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.sink_query(&wrap, gst::QueryRef::from_mut_ptr(query)) @@ -846,7 +848,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.src_event(&wrap, from_glib_full(event)) @@ -864,7 +866,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.src_query(&wrap, gst::QueryRef::from_mut_ptr(query)) @@ -882,7 +884,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let query = gst::QueryRef::from_mut_ptr(query); gst_panic_to_error!(&wrap, &instance.panicked(), false, { @@ -907,7 +909,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let query = gst::QueryRef::from_mut_ptr(query); gst_panic_to_error!(&wrap, &instance.panicked(), false, { diff --git a/gstreamer-audio/src/subclass/audio_encoder.rs b/gstreamer-audio/src/subclass/audio_encoder.rs index c13e42b37..1092ff6a8 100644 --- a/gstreamer-audio/src/subclass/audio_encoder.rs +++ b/gstreamer-audio/src/subclass/audio_encoder.rs @@ -497,7 +497,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.open(&wrap) { @@ -520,7 +520,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.close(&wrap) { @@ -543,7 +543,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.start(&wrap) { @@ -566,7 +566,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.stop(&wrap) { @@ -590,13 +590,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.set_format(&wrap, &from_glib_none(info)) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -616,7 +616,7 @@ where let buffer = buffer as *mut gst_sys::GstBuffer; let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.handle_frame( @@ -638,7 +638,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { match imp.pre_push(&wrap, from_glib_full(*buffer)) { @@ -665,7 +665,7 @@ unsafe extern "C" fn audio_encoder_flush( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), (), { AudioEncoderImpl::flush(imp, &wrap) @@ -681,13 +681,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.negotiate(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -705,13 +705,15 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::Caps::new_empty(), { AudioEncoderImpl::get_caps( imp, &wrap, - Option::::from_glib_borrow(filter).as_ref(), + Option::::from_glib_borrow(filter) + .as_ref() + .as_ref(), ) }) .to_glib_full() @@ -727,7 +729,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.sink_event(&wrap, from_glib_full(event)) @@ -745,7 +747,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.sink_query(&wrap, gst::QueryRef::from_mut_ptr(query)) @@ -763,7 +765,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.src_event(&wrap, from_glib_full(event)) @@ -781,7 +783,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.src_query(&wrap, gst::QueryRef::from_mut_ptr(query)) @@ -799,7 +801,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let query = gst::QueryRef::from_mut_ptr(query); gst_panic_to_error!(&wrap, &instance.panicked(), false, { @@ -824,7 +826,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let query = gst::QueryRef::from_mut_ptr(query); gst_panic_to_error!(&wrap, &instance.panicked(), false, { diff --git a/gstreamer-audio/src/subclass/audio_sink.rs b/gstreamer-audio/src/subclass/audio_sink.rs index 0a9f70f80..6229f9547 100644 --- a/gstreamer-audio/src/subclass/audio_sink.rs +++ b/gstreamer-audio/src/subclass/audio_sink.rs @@ -13,7 +13,7 @@ use AudioSink; use AudioSinkClass; pub trait AudioSinkImpl: AudioSinkImplExt + BaseSinkImpl + Send + Sync + 'static { - fn close(&self, sink: &mut AudioSink) -> Result<(), LoggableError> { + fn close(&self, sink: &AudioSink) -> Result<(), LoggableError> { self.parent_close(sink) } @@ -41,7 +41,7 @@ pub trait AudioSinkImpl: AudioSinkImplExt + BaseSinkImpl + Send + Sync + 'static } pub trait AudioSinkImplExt { - fn parent_close(&self, sink: &mut AudioSink) -> Result<(), LoggableError>; + fn parent_close(&self, sink: &AudioSink) -> Result<(), LoggableError>; fn parent_delay(&self, sink: &AudioSink) -> u32; fn parent_open(&self, sink: &AudioSink) -> Result<(), LoggableError>; fn parent_prepare( @@ -54,7 +54,7 @@ pub trait AudioSinkImplExt { } impl AudioSinkImplExt for T { - fn parent_close(&self, sink: &mut AudioSink) -> Result<(), LoggableError> { + fn parent_close(&self, sink: &AudioSink) -> Result<(), LoggableError> { unsafe { let data = self.get_type_data(); let parent_class = @@ -194,13 +194,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let mut wrap: AudioSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { - match imp.close(&mut wrap) { + match imp.close(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -217,7 +217,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), 0, { imp.delay(&wrap) }) } @@ -231,13 +231,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.open(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -255,7 +255,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let spec = &mut *(spec as *mut AudioRingBufferSpec); @@ -263,7 +263,7 @@ where match AudioSinkImpl::prepare(imp, &wrap, spec) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -280,13 +280,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.unprepare(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -305,7 +305,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let data_slice = std::slice::from_raw_parts(data as *const u8, length as usize); gst_panic_to_error!(&wrap, &instance.panicked(), -1, { diff --git a/gstreamer-audio/src/subclass/audio_src.rs b/gstreamer-audio/src/subclass/audio_src.rs index a62935da9..3c8b55520 100644 --- a/gstreamer-audio/src/subclass/audio_src.rs +++ b/gstreamer-audio/src/subclass/audio_src.rs @@ -15,7 +15,7 @@ use AudioSrc; use AudioSrcClass; pub trait AudioSrcImpl: AudioSrcImplExt + BaseSrcImpl + Send + Sync + 'static { - fn close(&self, src: &mut AudioSrc) -> Result<(), LoggableError> { + fn close(&self, src: &AudioSrc) -> Result<(), LoggableError> { self.parent_close(src) } @@ -43,7 +43,7 @@ pub trait AudioSrcImpl: AudioSrcImplExt + BaseSrcImpl + Send + Sync + 'static { } pub trait AudioSrcImplExt { - fn parent_close(&self, src: &mut AudioSrc) -> Result<(), LoggableError>; + fn parent_close(&self, src: &AudioSrc) -> Result<(), LoggableError>; fn parent_delay(&self, src: &AudioSrc) -> u32; fn parent_open(&self, src: &AudioSrc) -> Result<(), LoggableError>; fn parent_prepare( @@ -60,7 +60,7 @@ pub trait AudioSrcImplExt { } impl AudioSrcImplExt for T { - fn parent_close(&self, src: &mut AudioSrc) -> Result<(), LoggableError> { + fn parent_close(&self, src: &AudioSrc) -> Result<(), LoggableError> { unsafe { let data = self.get_type_data(); let parent_class = @@ -210,13 +210,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let mut wrap: AudioSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { - match imp.close(&mut wrap) { + match imp.close(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -231,7 +231,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), 0, { imp.delay(&wrap) }) } @@ -245,13 +245,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.open(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -269,7 +269,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let spec = &mut *(spec as *mut AudioRingBufferSpec); @@ -277,7 +277,7 @@ where match AudioSrcImpl::prepare(imp, &wrap, spec) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -294,13 +294,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.unprepare(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -320,7 +320,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AudioSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let data_slice = std::slice::from_raw_parts_mut(data as *mut u8, length as usize); gst_panic_to_error!(&wrap, &instance.panicked(), 0, { diff --git a/gstreamer-base/src/aggregator.rs b/gstreamer-base/src/aggregator.rs index 70764ed0c..ef0da9335 100644 --- a/gstreamer-base/src/aggregator.rs +++ b/gstreamer-base/src/aggregator.rs @@ -118,5 +118,5 @@ unsafe extern "C" fn notify_min_upstream_latency_trampoline, { let f: &F = &*(f as *const F); - f(&Aggregator::from_glib_borrow(this).unsafe_cast()) + f(&Aggregator::from_glib_borrow(this).unsafe_cast_ref()) } diff --git a/gstreamer-base/src/auto/aggregator.rs b/gstreamer-base/src/auto/aggregator.rs index 7638f0156..8ed95bc98 100644 --- a/gstreamer-base/src/auto/aggregator.rs +++ b/gstreamer-base/src/auto/aggregator.rs @@ -156,7 +156,7 @@ impl> AggregatorExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Aggregator::from_glib_borrow(this).unsafe_cast()) + f(&Aggregator::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -181,7 +181,7 @@ impl> AggregatorExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Aggregator::from_glib_borrow(this).unsafe_cast()) + f(&Aggregator::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-base/src/auto/aggregator_pad.rs b/gstreamer-base/src/auto/aggregator_pad.rs index 625735b30..c6aacee34 100644 --- a/gstreamer-base/src/auto/aggregator_pad.rs +++ b/gstreamer-base/src/auto/aggregator_pad.rs @@ -156,7 +156,7 @@ impl> AggregatorPadExt for O { { let f: &F = &*(f as *const F); f( - &AggregatorPad::from_glib_borrow(this).unsafe_cast(), + &AggregatorPad::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), ) } @@ -184,7 +184,7 @@ impl> AggregatorPadExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&AggregatorPad::from_glib_borrow(this).unsafe_cast()) + f(&AggregatorPad::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-base/src/auto/base_parse.rs b/gstreamer-base/src/auto/base_parse.rs index 7444ee401..86e7c7016 100644 --- a/gstreamer-base/src/auto/base_parse.rs +++ b/gstreamer-base/src/auto/base_parse.rs @@ -214,7 +214,7 @@ impl> BaseParseExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseParse::from_glib_borrow(this).unsafe_cast()) + f(&BaseParse::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-base/src/auto/base_sink.rs b/gstreamer-base/src/auto/base_sink.rs index 875ab5c10..8bd3469e3 100644 --- a/gstreamer-base/src/auto/base_sink.rs +++ b/gstreamer-base/src/auto/base_sink.rs @@ -446,7 +446,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -471,7 +471,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -499,7 +499,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -526,7 +526,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -551,7 +551,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -576,7 +576,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -607,7 +607,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -634,7 +634,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -659,7 +659,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -686,7 +686,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -711,7 +711,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -738,7 +738,7 @@ impl> BaseSinkExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSink::from_glib_borrow(this).unsafe_cast()) + f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-base/src/auto/base_src.rs b/gstreamer-base/src/auto/base_src.rs index 98131c1bc..bb47891be 100644 --- a/gstreamer-base/src/auto/base_src.rs +++ b/gstreamer-base/src/auto/base_src.rs @@ -267,7 +267,7 @@ impl> BaseSrcExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSrc::from_glib_borrow(this).unsafe_cast()) + f(&BaseSrc::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -292,7 +292,7 @@ impl> BaseSrcExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSrc::from_glib_borrow(this).unsafe_cast()) + f(&BaseSrc::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -319,7 +319,7 @@ impl> BaseSrcExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSrc::from_glib_borrow(this).unsafe_cast()) + f(&BaseSrc::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -344,7 +344,7 @@ impl> BaseSrcExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseSrc::from_glib_borrow(this).unsafe_cast()) + f(&BaseSrc::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-base/src/auto/base_transform.rs b/gstreamer-base/src/auto/base_transform.rs index eb9b0e3e3..d29b3f29d 100644 --- a/gstreamer-base/src/auto/base_transform.rs +++ b/gstreamer-base/src/auto/base_transform.rs @@ -223,7 +223,7 @@ impl> BaseTransformExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&BaseTransform::from_glib_borrow(this).unsafe_cast()) + f(&BaseTransform::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-base/src/auto/versions.txt +++ b/gstreamer-base/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-base/src/subclass/aggregator.rs b/gstreamer-base/src/subclass/aggregator.rs index f68f07042..fbb889478 100644 --- a/gstreamer-base/src/subclass/aggregator.rs +++ b/gstreamer-base/src/subclass/aggregator.rs @@ -540,7 +540,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.flush(&wrap).into() @@ -559,7 +559,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let ret = gst_panic_to_error!(&wrap, &instance.panicked(), None, { imp.clip( @@ -582,7 +582,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.finish_buffer(&wrap, from_glib_full(buffer)).into() @@ -601,7 +601,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.sink_event( @@ -624,7 +624,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.sink_query( @@ -646,7 +646,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.src_event(&wrap, from_glib_full(event)) @@ -664,7 +664,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.src_query(&wrap, gst::QueryRef::from_mut_ptr(query)) @@ -683,13 +683,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.src_activate(&wrap, from_glib(mode), from_glib(active)) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -707,7 +707,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.aggregate(&wrap, from_glib(timeout)).into() @@ -724,7 +724,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.start(&wrap) { @@ -747,7 +747,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.stop(&wrap) { @@ -770,7 +770,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::CLOCK_TIME_NONE, { imp.get_next_time(&wrap) @@ -790,26 +790,18 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), None, { - let req_name: Option = from_glib_none(req_name); - - // FIXME: Easier way to convert Option to Option<&str>? - let mut _tmp = String::new(); - let req_name = match req_name { - Some(n) => { - _tmp = n; - Some(_tmp.as_str()) - } - None => None, - }; + let req_name: Borrowed> = from_glib_borrow(req_name); imp.create_new_pad( &wrap, &from_glib_borrow(templ), - req_name, - Option::::from_glib_borrow(caps).as_ref(), + req_name.as_ref().as_ref().map(|s| s.as_str()), + Option::::from_glib_borrow(caps) + .as_ref() + .as_ref(), ) }) .to_glib_full() @@ -826,7 +818,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); *res = ptr::null_mut(); @@ -852,7 +844,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::Caps::new_empty(), { imp.fixate_src_caps(&wrap, from_glib_full(caps)) @@ -870,13 +862,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Aggregator = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.negotiated_src_caps(&wrap, &from_glib_borrow(caps)) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } diff --git a/gstreamer-base/src/subclass/aggregator_pad.rs b/gstreamer-base/src/subclass/aggregator_pad.rs index 92056a107..4bd1f3ab5 100644 --- a/gstreamer-base/src/subclass/aggregator_pad.rs +++ b/gstreamer-base/src/subclass/aggregator_pad.rs @@ -120,7 +120,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AggregatorPad = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let res: gst::FlowReturn = imp.flush(&wrap, &from_glib_borrow(aggregator)).into(); res.to_glib() @@ -136,7 +136,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: AggregatorPad = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.skip_buffer( &wrap, diff --git a/gstreamer-base/src/subclass/base_parse.rs b/gstreamer-base/src/subclass/base_parse.rs index 26e994914..a022234ad 100644 --- a/gstreamer-base/src/subclass/base_parse.rs +++ b/gstreamer-base/src/subclass/base_parse.rs @@ -211,7 +211,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseParse = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.start(&wrap) { @@ -235,8 +235,8 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseParse = from_glib_borrow(ptr); - let caps: gst::Caps = from_glib_none(caps); + let wrap: Borrowed = from_glib_borrow(ptr); + let caps: Borrowed = from_glib_borrow(caps); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.set_sink_caps(&wrap, &caps) { @@ -261,7 +261,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseParse = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let wrap_frame = BaseParseFrame::new(frame, &wrap); let res = gst_panic_to_error!(&wrap, &instance.panicked(), Err(gst::FlowError::Error), { @@ -291,7 +291,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseParse = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let source = gst::GenericFormattedValue::new(from_glib(source_format), source_value); let res = gst_panic_to_error!(&wrap, &instance.panicked(), None, { diff --git a/gstreamer-base/src/subclass/base_sink.rs b/gstreamer-base/src/subclass/base_sink.rs index 42bd7883f..3cce9d85e 100644 --- a/gstreamer-base/src/subclass/base_sink.rs +++ b/gstreamer-base/src/subclass/base_sink.rs @@ -416,7 +416,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.start(&wrap) { @@ -439,7 +439,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.stop(&wrap) { @@ -463,7 +463,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let buffer = from_glib_borrow(buffer); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { @@ -482,7 +482,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let buffer = from_glib_borrow(buffer); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { @@ -501,7 +501,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let list = from_glib_borrow(list); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { @@ -520,7 +520,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let list = from_glib_borrow(list); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { @@ -539,7 +539,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let query = gst::QueryRef::from_mut_ptr(query_ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { @@ -558,7 +558,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.event(&wrap, from_glib_full(event_ptr)) @@ -576,11 +576,11 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let filter = Option::::from_glib_borrow(filter); gst_panic_to_error!(&wrap, &instance.panicked(), None, { - imp.get_caps(&wrap, filter.as_ref()) + imp.get_caps(&wrap, filter.as_ref().as_ref()) }) .map(|caps| caps.into_ptr()) .unwrap_or(ptr::null_mut()) @@ -596,14 +596,14 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let caps = from_glib_borrow(caps); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.set_caps(&wrap, &caps) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -621,7 +621,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let caps = from_glib_full(caps); gst_panic_to_error!(&wrap, &instance.panicked(), gst::Caps::new_empty(), { @@ -639,7 +639,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.unlock(&wrap) { @@ -662,7 +662,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSink = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.unlock_stop(&wrap) { diff --git a/gstreamer-base/src/subclass/base_src.rs b/gstreamer-base/src/subclass/base_src.rs index 024537b54..c629463bb 100644 --- a/gstreamer-base/src/subclass/base_src.rs +++ b/gstreamer-base/src/subclass/base_src.rs @@ -609,7 +609,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.start(&wrap) { @@ -632,7 +632,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.stop(&wrap) { @@ -655,7 +655,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.is_seekable(&wrap) @@ -673,7 +673,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.get_size(&wrap) { @@ -698,7 +698,7 @@ unsafe extern "C" fn base_src_get_times( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let buffer = gst::BufferRef::from_ptr(buffer); *start = gst_sys::GST_CLOCK_TIME_NONE; @@ -723,7 +723,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let buffer = gst::BufferRef::from_mut_ptr(buffer); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { @@ -744,7 +744,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); // FIXME: Wrong signature in -sys bindings // https://gitlab.freedesktop.org/gstreamer/gstreamer-rs-sys/issues/3 let buffer_ptr = buffer_ptr as *mut *mut gst_sys::GstBuffer; @@ -775,7 +775,7 @@ where let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); // FIXME: Wrong signature in -sys bindings // https://gitlab.freedesktop.org/gstreamer/gstreamer-rs-sys/issues/3 let buffer_ptr = buffer_ptr as *mut *mut gst_sys::GstBuffer; @@ -798,7 +798,7 @@ where if passed_buffer.as_ptr() != new_buffer.as_ptr() { gst_debug!( gst::CAT_PERFORMANCE, - obj: &wrap, + obj: &*wrap, "Returned new buffer from create function, copying into passed buffer" ); @@ -807,7 +807,7 @@ where Err(_) => { gst_error!( gst::CAT_RUST, - obj: &wrap, + obj: &*wrap, "Failed to map passed buffer writable" ); return gst::FlowReturn::Error; @@ -831,7 +831,7 @@ where Err(_) => { gst_error!( gst::CAT_RUST, - obj: &wrap, + obj: &*wrap, "Failed to copy buffer metadata" ); @@ -863,10 +863,14 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { - imp.do_seek(&wrap, &mut from_glib_borrow(segment)) + let mut s = from_glib_none(segment); + let res = imp.do_seek(&wrap, &mut s); + ptr::write(segment, *(s.to_glib_none().0)); + + res }) .to_glib() } @@ -881,7 +885,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let query = gst::QueryRef::from_mut_ptr(query_ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { @@ -900,7 +904,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.event(&wrap, &from_glib_borrow(event_ptr)) @@ -918,11 +922,11 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let filter = Option::::from_glib_borrow(filter); gst_panic_to_error!(&wrap, &instance.panicked(), None, { - imp.get_caps(&wrap, filter.as_ref()) + imp.get_caps(&wrap, filter.as_ref().as_ref()) }) .map(|caps| caps.into_ptr()) .unwrap_or(ptr::null_mut()) @@ -937,13 +941,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.negotiate(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -961,14 +965,14 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let caps = from_glib_borrow(caps); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.set_caps(&wrap, &caps) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -986,7 +990,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let caps = from_glib_full(caps); gst_panic_to_error!(&wrap, &instance.panicked(), gst::Caps::new_empty(), { @@ -1004,7 +1008,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.unlock(&wrap) { @@ -1027,7 +1031,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.unlock_stop(&wrap) { diff --git a/gstreamer-base/src/subclass/base_transform.rs b/gstreamer-base/src/subclass/base_transform.rs index f189c38f9..f9f068ad9 100644 --- a/gstreamer-base/src/subclass/base_transform.rs +++ b/gstreamer-base/src/subclass/base_transform.rs @@ -796,7 +796,7 @@ impl BaseTransformImplExt for T { unsafe { let element = self.get_instance(); let ptr: *mut gst_base_sys::GstBaseTransform = element.to_glib_none().0 as *mut _; - let sinkpad: gst::Pad = from_glib_borrow((*ptr).sinkpad); + let sinkpad: Borrowed = from_glib_borrow((*ptr).sinkpad); let _stream_lock = sinkpad.stream_lock(); let buffer = (*ptr).queued_buf; (*ptr).queued_buf = ptr::null_mut(); @@ -812,7 +812,7 @@ impl BaseTransformImplExt for T { unsafe { let element = self.get_instance(); let ptr: *mut gst_base_sys::GstBaseTransform = element.to_glib_none().0 as *mut _; - let sinkpad: gst::Pad = from_glib_borrow((*ptr).sinkpad); + let sinkpad: Borrowed = from_glib_borrow((*ptr).sinkpad); let _stream_lock = sinkpad.stream_lock(); let buffer = (*ptr).queued_buf; from_glib_none(buffer) @@ -917,7 +917,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.start(&wrap) { @@ -940,7 +940,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.stop(&wrap) { @@ -966,20 +966,16 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), None, { - let filter = if filter.is_null() { - None - } else { - Some(from_glib_borrow(filter)) - }; + let filter: Borrowed> = from_glib_borrow(filter); imp.transform_caps( &wrap, from_glib(direction), &from_glib_borrow(caps), - filter.as_ref(), + filter.as_ref().as_ref(), ) }) .map(|caps| caps.into_ptr()) @@ -998,7 +994,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::Caps::new_empty(), { imp.fixate_caps( @@ -1022,13 +1018,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.set_caps(&wrap, &from_glib_borrow(incaps), &from_glib_borrow(outcaps)) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -1047,7 +1043,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.accept_caps(&wrap, from_glib(direction), &from_glib_borrow(caps)) @@ -1066,7 +1062,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { BaseTransformImpl::query( @@ -1093,7 +1089,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.transform_size( @@ -1124,7 +1120,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.get_unit_size(&wrap, &from_glib_borrow(caps)) { @@ -1149,7 +1145,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); // FIXME: Wrong signature in FFI let outbuf = outbuf as *mut *mut gst_sys::GstBuffer; @@ -1180,7 +1176,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.sink_event(&wrap, from_glib_full(event)) @@ -1198,7 +1194,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.src_event(&wrap, from_glib_full(event)) @@ -1217,7 +1213,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.transform( @@ -1240,7 +1236,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); // FIXME: Wrong signature in FFI let buf = buf as *mut gst_sys::GstBuffer; @@ -1269,7 +1265,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let inbuf = gst::BufferRef::from_ptr(inbuf); @@ -1295,12 +1291,12 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); if gst_sys::gst_mini_object_is_writable(outbuf as *mut _) == glib_sys::GFALSE { gst_warning!( gst::CAT_RUST, - obj: &wrap, + obj: &*wrap, "buffer {:?} not writable", outbuf ); @@ -1315,7 +1311,7 @@ where ) { Ok(_) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -1332,7 +1328,7 @@ unsafe extern "C" fn base_transform_before_transform( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), (), { imp.before_transform(&wrap, gst::BufferRef::from_ptr(inbuf)); @@ -1350,7 +1346,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.submit_input_buffer(&wrap, from_glib(is_discont), from_glib_full(buf)) @@ -1369,7 +1365,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: BaseTransform = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); *buf = ptr::null_mut(); diff --git a/gstreamer-base/src/subclass/push_src.rs b/gstreamer-base/src/subclass/push_src.rs index f12aade56..203ab93da 100644 --- a/gstreamer-base/src/subclass/push_src.rs +++ b/gstreamer-base/src/subclass/push_src.rs @@ -140,7 +140,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: PushSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let buffer = gst::BufferRef::from_mut_ptr(buffer); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { @@ -159,7 +159,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: PushSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); // FIXME: Wrong signature in -sys bindings // https://gitlab.freedesktop.org/gstreamer/gstreamer-rs-sys/issues/3 let buffer_ptr = buffer_ptr as *mut *mut gst_sys::GstBuffer; @@ -186,7 +186,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: PushSrc = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); // FIXME: Wrong signature in -sys bindings // https://gitlab.freedesktop.org/gstreamer/gstreamer-rs-sys/issues/3 let buffer_ptr = buffer_ptr as *mut *mut gst_sys::GstBuffer; diff --git a/gstreamer-check/src/auto/versions.txt b/gstreamer-check/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-check/src/auto/versions.txt +++ b/gstreamer-check/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-editing-services/src/auto/asset.rs b/gstreamer-editing-services/src/auto/asset.rs index 0ceebd6fa..26f1ab152 100644 --- a/gstreamer-editing-services/src/auto/asset.rs +++ b/gstreamer-editing-services/src/auto/asset.rs @@ -241,7 +241,7 @@ impl> AssetExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Asset::from_glib_borrow(this).unsafe_cast()) + f(&Asset::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -266,7 +266,7 @@ impl> AssetExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Asset::from_glib_borrow(this).unsafe_cast()) + f(&Asset::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/clip.rs b/gstreamer-editing-services/src/auto/clip.rs index e58b48765..738f95a9f 100644 --- a/gstreamer-editing-services/src/auto/clip.rs +++ b/gstreamer-editing-services/src/auto/clip.rs @@ -237,7 +237,7 @@ impl> ClipExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Clip::from_glib_borrow(this).unsafe_cast()) + f(&Clip::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -262,7 +262,7 @@ impl> ClipExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Clip::from_glib_borrow(this).unsafe_cast()) + f(&Clip::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/container.rs b/gstreamer-editing-services/src/auto/container.rs index bbc44ede2..81b9163de 100644 --- a/gstreamer-editing-services/src/auto/container.rs +++ b/gstreamer-editing-services/src/auto/container.rs @@ -165,7 +165,7 @@ impl> GESContainerExt for O { { let f: &F = &*(f as *const F); f( - &Container::from_glib_borrow(this).unsafe_cast(), + &Container::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(element), ) } @@ -193,7 +193,7 @@ impl> GESContainerExt for O { { let f: &F = &*(f as *const F); f( - &Container::from_glib_borrow(this).unsafe_cast(), + &Container::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(element), ) } @@ -217,7 +217,7 @@ impl> GESContainerExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Container::from_glib_borrow(this).unsafe_cast()) + f(&Container::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/group.rs b/gstreamer-editing-services/src/auto/group.rs index 6836cbfa2..f5f165b46 100644 --- a/gstreamer-editing-services/src/auto/group.rs +++ b/gstreamer-editing-services/src/auto/group.rs @@ -209,7 +209,7 @@ impl> GroupExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Group::from_glib_borrow(this).unsafe_cast()) + f(&Group::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -231,7 +231,7 @@ impl> GroupExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Group::from_glib_borrow(this).unsafe_cast()) + f(&Group::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -256,7 +256,7 @@ impl> GroupExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Group::from_glib_borrow(this).unsafe_cast()) + f(&Group::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -280,7 +280,7 @@ impl> GroupExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Group::from_glib_borrow(this).unsafe_cast()) + f(&Group::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -302,7 +302,7 @@ impl> GroupExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Group::from_glib_borrow(this).unsafe_cast()) + f(&Group::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/layer.rs b/gstreamer-editing-services/src/auto/layer.rs index b080fe989..e6a703ab5 100644 --- a/gstreamer-editing-services/src/auto/layer.rs +++ b/gstreamer-editing-services/src/auto/layer.rs @@ -220,7 +220,7 @@ impl> LayerExt for O { { let f: &F = &*(f as *const F); f( - &Layer::from_glib_borrow(this).unsafe_cast(), + &Layer::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(clip), ) } @@ -245,7 +245,7 @@ impl> LayerExt for O { { let f: &F = &*(f as *const F); f( - &Layer::from_glib_borrow(this).unsafe_cast(), + &Layer::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(clip), ) } @@ -272,7 +272,7 @@ impl> LayerExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Layer::from_glib_borrow(this).unsafe_cast()) + f(&Layer::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -296,7 +296,7 @@ impl> LayerExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Layer::from_glib_borrow(this).unsafe_cast()) + f(&Layer::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/pipeline.rs b/gstreamer-editing-services/src/auto/pipeline.rs index e7320e3c3..56e7a3d65 100644 --- a/gstreamer-editing-services/src/auto/pipeline.rs +++ b/gstreamer-editing-services/src/auto/pipeline.rs @@ -382,7 +382,7 @@ impl> GESPipelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pipeline::from_glib_borrow(this).unsafe_cast()) + f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -406,7 +406,7 @@ impl> GESPipelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pipeline::from_glib_borrow(this).unsafe_cast()) + f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -428,7 +428,7 @@ impl> GESPipelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pipeline::from_glib_borrow(this).unsafe_cast()) + f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -450,7 +450,7 @@ impl> GESPipelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pipeline::from_glib_borrow(this).unsafe_cast()) + f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -475,7 +475,7 @@ impl> GESPipelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pipeline::from_glib_borrow(this).unsafe_cast()) + f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -499,7 +499,7 @@ impl> GESPipelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pipeline::from_glib_borrow(this).unsafe_cast()) + f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/project.rs b/gstreamer-editing-services/src/auto/project.rs index 1ee9a9ad6..adb501226 100644 --- a/gstreamer-editing-services/src/auto/project.rs +++ b/gstreamer-editing-services/src/auto/project.rs @@ -251,7 +251,7 @@ impl> ProjectExt for O { { let f: &F = &*(f as *const F); f( - &Project::from_glib_borrow(this).unsafe_cast(), + &Project::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(asset), ) } @@ -276,7 +276,7 @@ impl> ProjectExt for O { { let f: &F = &*(f as *const F); f( - &Project::from_glib_borrow(this).unsafe_cast(), + &Project::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(asset), ) } @@ -301,7 +301,7 @@ impl> ProjectExt for O { { let f: &F = &*(f as *const F); f( - &Project::from_glib_borrow(this).unsafe_cast(), + &Project::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(asset), ) } @@ -336,7 +336,7 @@ impl> ProjectExt for O { { let f: &F = &*(f as *const F); f( - &Project::from_glib_borrow(this).unsafe_cast(), + &Project::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(error), &GString::from_glib_borrow(id), from_glib(extractable_type), @@ -365,7 +365,7 @@ impl> ProjectExt for O { { let f: &F = &*(f as *const F); f( - &Project::from_glib_borrow(this).unsafe_cast(), + &Project::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(timeline), ) } @@ -398,7 +398,7 @@ impl> ProjectExt for O { { let f: &F = &*(f as *const F); f( - &Project::from_glib_borrow(this).unsafe_cast(), + &Project::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(error), &from_glib_borrow(wrong_asset), ) diff --git a/gstreamer-editing-services/src/auto/timeline.rs b/gstreamer-editing-services/src/auto/timeline.rs index 71268f645..0620444d7 100644 --- a/gstreamer-editing-services/src/auto/timeline.rs +++ b/gstreamer-editing-services/src/auto/timeline.rs @@ -426,7 +426,7 @@ impl> TimelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Timeline::from_glib_borrow(this).unsafe_cast()) + f(&Timeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -449,7 +449,7 @@ impl> TimelineExt for O { { let f: &F = &*(f as *const F); f( - &Timeline::from_glib_borrow(this).unsafe_cast(), + &Timeline::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(group), ) } @@ -478,7 +478,7 @@ impl> TimelineExt for O { { let f: &F = &*(f as *const F); f( - &Timeline::from_glib_borrow(this).unsafe_cast(), + &Timeline::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(layer), ) } @@ -503,7 +503,7 @@ impl> TimelineExt for O { { let f: &F = &*(f as *const F); f( - &Timeline::from_glib_borrow(this).unsafe_cast(), + &Timeline::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(layer), ) } @@ -540,7 +540,7 @@ impl> TimelineExt for O { { let f: &F = &*(f as *const F); f( - &Timeline::from_glib_borrow(this).unsafe_cast(), + &Timeline::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(obj1), &from_glib_borrow(obj2), position, @@ -575,7 +575,7 @@ impl> TimelineExt for O { { let f: &F = &*(f as *const F); f( - &Timeline::from_glib_borrow(this).unsafe_cast(), + &Timeline::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(obj1), &from_glib_borrow(obj2), position, @@ -602,7 +602,7 @@ impl> TimelineExt for O { { let f: &F = &*(f as *const F); f( - &Timeline::from_glib_borrow(this).unsafe_cast(), + &Timeline::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(track), ) } @@ -627,7 +627,7 @@ impl> TimelineExt for O { { let f: &F = &*(f as *const F); f( - &Timeline::from_glib_borrow(this).unsafe_cast(), + &Timeline::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(track), ) } @@ -654,7 +654,7 @@ impl> TimelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Timeline::from_glib_borrow(this).unsafe_cast()) + f(&Timeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -678,7 +678,7 @@ impl> TimelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Timeline::from_glib_borrow(this).unsafe_cast()) + f(&Timeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -703,7 +703,7 @@ impl> TimelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Timeline::from_glib_borrow(this).unsafe_cast()) + f(&Timeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/timeline_element.rs b/gstreamer-editing-services/src/auto/timeline_element.rs index 4ec96fb40..2d7eb2ada 100644 --- a/gstreamer-editing-services/src/auto/timeline_element.rs +++ b/gstreamer-editing-services/src/auto/timeline_element.rs @@ -494,7 +494,7 @@ impl> TimelineElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TimelineElement::from_glib_borrow(this).unsafe_cast()) + f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -516,7 +516,7 @@ impl> TimelineElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TimelineElement::from_glib_borrow(this).unsafe_cast()) + f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -541,7 +541,7 @@ impl> TimelineElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TimelineElement::from_glib_borrow(this).unsafe_cast()) + f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -565,7 +565,7 @@ impl> TimelineElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TimelineElement::from_glib_borrow(this).unsafe_cast()) + f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -587,7 +587,7 @@ impl> TimelineElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TimelineElement::from_glib_borrow(this).unsafe_cast()) + f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -609,7 +609,7 @@ impl> TimelineElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TimelineElement::from_glib_borrow(this).unsafe_cast()) + f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -631,7 +631,7 @@ impl> TimelineElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TimelineElement::from_glib_borrow(this).unsafe_cast()) + f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -653,7 +653,7 @@ impl> TimelineElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TimelineElement::from_glib_borrow(this).unsafe_cast()) + f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -675,7 +675,7 @@ impl> TimelineElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TimelineElement::from_glib_borrow(this).unsafe_cast()) + f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/track.rs b/gstreamer-editing-services/src/auto/track.rs index f2af5aca2..04453c6e3 100644 --- a/gstreamer-editing-services/src/auto/track.rs +++ b/gstreamer-editing-services/src/auto/track.rs @@ -242,7 +242,7 @@ impl> GESTrackExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Track::from_glib_borrow(this).unsafe_cast()) + f(&Track::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -268,7 +268,7 @@ impl> GESTrackExt for O { { let f: &F = &*(f as *const F); f( - &Track::from_glib_borrow(this).unsafe_cast(), + &Track::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(effect), ) } @@ -301,7 +301,7 @@ impl> GESTrackExt for O { { let f: &F = &*(f as *const F); f( - &Track::from_glib_borrow(this).unsafe_cast(), + &Track::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(effect), ) } @@ -327,7 +327,7 @@ impl> GESTrackExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Track::from_glib_borrow(this).unsafe_cast()) + f(&Track::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -349,7 +349,7 @@ impl> GESTrackExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Track::from_glib_borrow(this).unsafe_cast()) + f(&Track::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -374,7 +374,7 @@ impl> GESTrackExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Track::from_glib_borrow(this).unsafe_cast()) + f(&Track::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/track_element.rs b/gstreamer-editing-services/src/auto/track_element.rs index 6a520d221..a3cacf890 100644 --- a/gstreamer-editing-services/src/auto/track_element.rs +++ b/gstreamer-editing-services/src/auto/track_element.rs @@ -256,7 +256,7 @@ impl> TrackElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TrackElement::from_glib_borrow(this).unsafe_cast()) + f(&TrackElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -278,7 +278,7 @@ impl> TrackElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TrackElement::from_glib_borrow(this).unsafe_cast()) + f(&TrackElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -300,7 +300,7 @@ impl> TrackElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&TrackElement::from_glib_borrow(this).unsafe_cast()) + f(&TrackElement::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/uri_clip.rs b/gstreamer-editing-services/src/auto/uri_clip.rs index b065951fe..d4f212faf 100644 --- a/gstreamer-editing-services/src/auto/uri_clip.rs +++ b/gstreamer-editing-services/src/auto/uri_clip.rs @@ -142,7 +142,7 @@ impl> UriClipExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&UriClip::from_glib_borrow(this).unsafe_cast()) + f(&UriClip::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -164,7 +164,7 @@ impl> UriClipExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&UriClip::from_glib_borrow(this).unsafe_cast()) + f(&UriClip::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -189,7 +189,7 @@ impl> UriClipExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&UriClip::from_glib_borrow(this).unsafe_cast()) + f(&UriClip::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/uri_clip_asset.rs b/gstreamer-editing-services/src/auto/uri_clip_asset.rs index 1dcd9c75a..21914f285 100644 --- a/gstreamer-editing-services/src/auto/uri_clip_asset.rs +++ b/gstreamer-editing-services/src/auto/uri_clip_asset.rs @@ -120,7 +120,7 @@ impl> UriClipAssetExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&UriClipAsset::from_glib_borrow(this).unsafe_cast()) + f(&UriClipAsset::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-editing-services/src/auto/versions.txt +++ b/gstreamer-editing-services/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-gl/src/auto/gl_base_filter.rs b/gstreamer-gl/src/auto/gl_base_filter.rs index b70f3cd58..41ccee975 100644 --- a/gstreamer-gl/src/auto/gl_base_filter.rs +++ b/gstreamer-gl/src/auto/gl_base_filter.rs @@ -78,7 +78,7 @@ impl> GLBaseFilterExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&GLBaseFilter::from_glib_borrow(this).unsafe_cast()) + f(&GLBaseFilter::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-gl/src/auto/gl_display.rs b/gstreamer-gl/src/auto/gl_display.rs index 0be40a3c8..06a5f4725 100644 --- a/gstreamer-gl/src/auto/gl_display.rs +++ b/gstreamer-gl/src/auto/gl_display.rs @@ -176,7 +176,7 @@ impl> GLDisplayExt for O { { let f: &F = &*(f as *const F); f( - &GLDisplay::from_glib_borrow(this).unsafe_cast(), + &GLDisplay::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(context), ) .to_glib_full() diff --git a/gstreamer-gl/src/auto/gl_window.rs b/gstreamer-gl/src/auto/gl_window.rs index 667e9a0ee..87a9708ec 100644 --- a/gstreamer-gl/src/auto/gl_window.rs +++ b/gstreamer-gl/src/auto/gl_window.rs @@ -238,7 +238,7 @@ impl> GLWindowExt for O { { let f: &F = &*(f as *const F); f( - &GLWindow::from_glib_borrow(this).unsafe_cast(), + &GLWindow::from_glib_borrow(this).unsafe_cast_ref(), &GString::from_glib_borrow(id), &GString::from_glib_borrow(key), ) @@ -273,7 +273,7 @@ impl> GLWindowExt for O { { let f: &F = &*(f as *const F); f( - &GLWindow::from_glib_borrow(this).unsafe_cast(), + &GLWindow::from_glib_borrow(this).unsafe_cast_ref(), &GString::from_glib_borrow(id), button, x, diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-gl/src/auto/versions.txt +++ b/gstreamer-gl/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-gl/src/gl_video_frame.rs b/gstreamer-gl/src/gl_video_frame.rs index e25de9659..3f39efd23 100644 --- a/gstreamer-gl/src/gl_video_frame.rs +++ b/gstreamer-gl/src/gl_video_frame.rs @@ -128,7 +128,7 @@ impl<'a> VideoFrameGLExt for VideoFrameRef<&'a gst::BufferRef> { "Failed to fill in the values of GstVideoFrame" )) } else { - Ok(VideoFrameRef::from_glib_borrow(&frame.assume_init())) + Ok(VideoFrameRef::from_glib_full(frame.assume_init())) } } } diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-net/src/auto/versions.txt +++ b/gstreamer-net/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-pbutils/src/auto/discoverer.rs b/gstreamer-pbutils/src/auto/discoverer.rs index d71a21cc1..c65244581 100644 --- a/gstreamer-pbutils/src/auto/discoverer.rs +++ b/gstreamer-pbutils/src/auto/discoverer.rs @@ -129,7 +129,9 @@ impl Discoverer { f( &from_glib_borrow(this), &from_glib_borrow(info), - Option::::from_glib_borrow(error).as_ref(), + Option::::from_glib_borrow(error) + .as_ref() + .as_ref(), ) } unsafe { diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-pbutils/src/auto/versions.txt +++ b/gstreamer-pbutils/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-pbutils/src/discoverer.rs b/gstreamer-pbutils/src/discoverer.rs index d31211f2a..ae8d55e10 100644 --- a/gstreamer-pbutils/src/discoverer.rs +++ b/gstreamer-pbutils/src/discoverer.rs @@ -75,5 +75,5 @@ unsafe extern "C" fn notify_timeout_trampoline, { let f: &F = &*(f as *const F); - f(&Discoverer::from_glib_borrow(this).unsafe_cast()) + f(&Discoverer::from_glib_borrow(this).unsafe_cast_ref()) } diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-player/src/auto/versions.txt +++ b/gstreamer-player/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-rtp/src/auto/versions.txt b/gstreamer-rtp/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-rtp/src/auto/versions.txt +++ b/gstreamer-rtp/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs index a867d5c11..73fd9c658 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs @@ -297,7 +297,7 @@ impl> RTSPAuthExt for O { { let f: &F = &*(f as *const F); f( - &RTSPAuth::from_glib_borrow(this).unsafe_cast(), + &RTSPAuth::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(connection), &from_glib_borrow(peer_cert), from_glib(errors), diff --git a/gstreamer-rtsp-server/src/auto/rtsp_client.rs b/gstreamer-rtsp-server/src/auto/rtsp_client.rs index d70584d90..a89a2a27d 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_client.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_client.rs @@ -439,7 +439,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) } @@ -466,7 +466,7 @@ impl> RTSPClientExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPClient::from_glib_borrow(this).unsafe_cast()) + f(&RTSPClient::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -495,7 +495,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) } @@ -526,7 +526,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) } @@ -559,7 +559,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) } @@ -590,7 +590,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), ) } @@ -621,7 +621,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) } @@ -652,7 +652,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) } @@ -683,7 +683,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) } @@ -718,7 +718,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) .to_glib() @@ -756,7 +756,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) .to_glib() @@ -794,7 +794,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) .to_glib() @@ -832,7 +832,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) .to_glib() @@ -870,7 +870,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) .to_glib() @@ -906,7 +906,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) .to_glib() @@ -942,7 +942,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) .to_glib() @@ -978,7 +978,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) .to_glib() @@ -1016,7 +1016,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) .to_glib() @@ -1052,7 +1052,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) .to_glib() @@ -1086,7 +1086,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) } @@ -1121,7 +1121,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) } @@ -1154,7 +1154,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) } @@ -1185,7 +1185,7 @@ impl> RTSPClientExt for O { { let f: &F = &*(f as *const F); f( - &RTSPClient::from_glib_borrow(this).unsafe_cast(), + &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) } @@ -1212,7 +1212,7 @@ impl> RTSPClientExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPClient::from_glib_borrow(this).unsafe_cast()) + f(&RTSPClient::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1239,7 +1239,7 @@ impl> RTSPClientExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPClient::from_glib_borrow(this).unsafe_cast()) + f(&RTSPClient::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1266,7 +1266,7 @@ impl> RTSPClientExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPClient::from_glib_borrow(this).unsafe_cast()) + f(&RTSPClient::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_media.rs index dcf361283..a637b19e0 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_media.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_media.rs @@ -23,6 +23,7 @@ use RTSPAddressPool; use RTSPMediaStatus; use RTSPPublishClockMode; use RTSPStream; +use RTSPStreamTransport; use RTSPSuspendMode; use RTSPThread; use RTSPTransportMode; @@ -55,7 +56,7 @@ pub trait RTSPMediaExt: 'static { fn collect_streams(&self); //#[cfg(any(feature = "v1_14", feature = "dox"))] - //fn complete_pipeline(&self, transports: /*Unknown conversion*//*Unimplemented*/PtrArray TypeId { ns_id: 10, id: 31 }) -> bool; + //fn complete_pipeline(&self, transports: /*Ignored*/&[&gst_rtsp::RTSPTransport]) -> bool; fn create_stream, Q: IsA>( &self, @@ -171,7 +172,7 @@ pub trait RTSPMediaExt: 'static { fn set_shared(&self, shared: bool); - //fn set_state(&self, state: gst::State, transports: /*Unknown conversion*//*Unimplemented*/PtrArray TypeId { ns_id: 1, id: 27 }) -> bool; + fn set_state(&self, state: gst::State, transports: &[RTSPStreamTransport]) -> bool; fn set_stop_on_disconnect(&self, stop_on_disconnect: bool); @@ -308,7 +309,7 @@ impl> RTSPMediaExt for O { } //#[cfg(any(feature = "v1_14", feature = "dox"))] - //fn complete_pipeline(&self, transports: /*Unknown conversion*//*Unimplemented*/PtrArray TypeId { ns_id: 10, id: 31 }) -> bool { + //fn complete_pipeline(&self, transports: /*Ignored*/&[&gst_rtsp::RTSPTransport]) -> bool { // unsafe { TODO: call gst_rtsp_server_sys:gst_rtsp_media_complete_pipeline() } //} @@ -718,9 +719,15 @@ impl> RTSPMediaExt for O { } } - //fn set_state(&self, state: gst::State, transports: /*Unknown conversion*//*Unimplemented*/PtrArray TypeId { ns_id: 1, id: 27 }) -> bool { - // unsafe { TODO: call gst_rtsp_server_sys:gst_rtsp_media_set_state() } - //} + fn set_state(&self, state: gst::State, transports: &[RTSPStreamTransport]) -> bool { + unsafe { + from_glib(gst_rtsp_server_sys::gst_rtsp_media_set_state( + self.as_ref().to_glib_none().0, + state.to_glib(), + transports.to_glib_none().0, + )) + } + } fn set_stop_on_disconnect(&self, stop_on_disconnect: bool) { unsafe { @@ -921,7 +928,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast(), object) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref(), object) } unsafe { let f: Box_ = Box_::new(f); @@ -950,7 +957,7 @@ impl> RTSPMediaExt for O { { let f: &F = &*(f as *const F); f( - &RTSPMedia::from_glib_borrow(this).unsafe_cast(), + &RTSPMedia::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), ) } @@ -973,7 +980,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1002,7 +1009,7 @@ impl> RTSPMediaExt for O { { let f: &F = &*(f as *const F); f( - &RTSPMedia::from_glib_borrow(this).unsafe_cast(), + &RTSPMedia::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), ) } @@ -1029,7 +1036,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast(), object) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref(), object) } unsafe { let f: Box_ = Box_::new(f); @@ -1050,7 +1057,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1078,7 +1085,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1105,7 +1112,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1130,7 +1137,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1155,7 +1162,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1182,7 +1189,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1207,7 +1214,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1234,7 +1241,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1259,7 +1266,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1284,7 +1291,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1309,7 +1316,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1337,7 +1344,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1364,7 +1371,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1391,7 +1398,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1421,7 +1428,7 @@ impl> RTSPMediaExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMedia::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMedia::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs index a43ff5531..ea82267c6 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs @@ -724,7 +724,7 @@ impl> RTSPMediaFactoryExt for O { { let f: &F = &*(f as *const F); f( - &RTSPMediaFactory::from_glib_borrow(this).unsafe_cast(), + &RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), ) } @@ -755,7 +755,7 @@ impl> RTSPMediaFactoryExt for O { { let f: &F = &*(f as *const F); f( - &RTSPMediaFactory::from_glib_borrow(this).unsafe_cast(), + &RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), ) } @@ -785,7 +785,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -812,7 +812,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -837,7 +837,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -862,7 +862,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -889,7 +889,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -914,7 +914,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -939,7 +939,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -966,7 +966,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -991,7 +991,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1016,7 +1016,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1044,7 +1044,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1071,7 +1071,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1101,7 +1101,7 @@ impl> RTSPMediaFactoryExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactory::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs b/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs index a99ecbb2b..b193d37ae 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs @@ -118,7 +118,7 @@ impl> RTSPMediaFactoryURIExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactoryURI::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactoryURI::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -143,7 +143,7 @@ impl> RTSPMediaFactoryURIExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPMediaFactoryURI::from_glib_borrow(this).unsafe_cast()) + f(&RTSPMediaFactoryURI::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-rtsp-server/src/auto/rtsp_server.rs b/gstreamer-rtsp-server/src/auto/rtsp_server.rs index ee00b867d..edf63f585 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_server.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_server.rs @@ -396,7 +396,7 @@ impl> RTSPServerExt for O { { let f: &F = &*(f as *const F); f( - &RTSPServer::from_glib_borrow(this).unsafe_cast(), + &RTSPServer::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), ) } @@ -423,7 +423,7 @@ impl> RTSPServerExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPServer::from_glib_borrow(this).unsafe_cast()) + f(&RTSPServer::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -448,7 +448,7 @@ impl> RTSPServerExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPServer::from_glib_borrow(this).unsafe_cast()) + f(&RTSPServer::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -473,7 +473,7 @@ impl> RTSPServerExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPServer::from_glib_borrow(this).unsafe_cast()) + f(&RTSPServer::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -498,7 +498,7 @@ impl> RTSPServerExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPServer::from_glib_borrow(this).unsafe_cast()) + f(&RTSPServer::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -525,7 +525,7 @@ impl> RTSPServerExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPServer::from_glib_borrow(this).unsafe_cast()) + f(&RTSPServer::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -550,7 +550,7 @@ impl> RTSPServerExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPServer::from_glib_borrow(this).unsafe_cast()) + f(&RTSPServer::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session.rs b/gstreamer-rtsp-server/src/auto/rtsp_session.rs index e42ded414..0def1cfe8 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_session.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_session.rs @@ -290,7 +290,7 @@ impl> RTSPSessionExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPSession::from_glib_borrow(this).unsafe_cast()) + f(&RTSPSession::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -318,7 +318,7 @@ impl> RTSPSessionExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPSession::from_glib_borrow(this).unsafe_cast()) + f(&RTSPSession::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs index ea7b545c2..1f4527b7f 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs @@ -50,8 +50,8 @@ pub trait RTSPSessionMediaExt: 'static { fn get_transport(&self, idx: u32) -> Option; - //#[cfg(any(feature = "v1_14", feature = "dox"))] - //fn get_transports(&self) -> /*Unknown conversion*//*Unimplemented*/PtrArray TypeId { ns_id: 1, id: 27 }; + #[cfg(any(feature = "v1_14", feature = "dox"))] + fn get_transports(&self) -> Vec; fn matches(&self, path: &str) -> Option; @@ -104,10 +104,16 @@ impl> RTSPSessionMediaExt for O { } } - //#[cfg(any(feature = "v1_14", feature = "dox"))] - //fn get_transports(&self) -> /*Unknown conversion*//*Unimplemented*/PtrArray TypeId { ns_id: 1, id: 27 } { - // unsafe { TODO: call gst_rtsp_server_sys:gst_rtsp_session_media_get_transports() } - //} + #[cfg(any(feature = "v1_14", feature = "dox"))] + fn get_transports(&self) -> Vec { + unsafe { + FromGlibPtrContainer::from_glib_full( + gst_rtsp_server_sys::gst_rtsp_session_media_get_transports( + self.as_ref().to_glib_none().0, + ), + ) + } + } fn matches(&self, path: &str) -> Option { unsafe { diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs index 151396b2a..71144af4e 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs @@ -194,7 +194,7 @@ impl> RTSPSessionPoolExt for O { { let f: &F = &*(f as *const F); f( - &RTSPSessionPool::from_glib_borrow(this).unsafe_cast(), + &RTSPSessionPool::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), ) } @@ -221,7 +221,7 @@ impl> RTSPSessionPoolExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPSessionPool::from_glib_borrow(this).unsafe_cast()) + f(&RTSPSessionPool::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs index 69a600bde..57f195814 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs @@ -1090,7 +1090,7 @@ impl> RTSPStreamExt for O { { let f: &F = &*(f as *const F); f( - &RTSPStream::from_glib_borrow(this).unsafe_cast(), + &RTSPStream::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), ) } @@ -1121,7 +1121,7 @@ impl> RTSPStreamExt for O { { let f: &F = &*(f as *const F); f( - &RTSPStream::from_glib_borrow(this).unsafe_cast(), + &RTSPStream::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), ) } @@ -1152,7 +1152,7 @@ impl> RTSPStreamExt for O { { let f: &F = &*(f as *const F); f( - &RTSPStream::from_glib_borrow(this).unsafe_cast(), + &RTSPStream::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), ) } @@ -1181,7 +1181,7 @@ impl> RTSPStreamExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPStream::from_glib_borrow(this).unsafe_cast()) + f(&RTSPStream::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1206,7 +1206,7 @@ impl> RTSPStreamExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPStream::from_glib_borrow(this).unsafe_cast()) + f(&RTSPStream::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -1231,7 +1231,7 @@ impl> RTSPStreamExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPStream::from_glib_borrow(this).unsafe_cast()) + f(&RTSPStream::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs index 84d12a30c..e1406d6b2 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs @@ -101,7 +101,7 @@ impl> RTSPThreadPoolExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&RTSPThreadPool::from_glib_borrow(this).unsafe_cast()) + f(&RTSPThreadPool::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-rtsp-server/src/auto/versions.txt +++ b/gstreamer-rtsp-server/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-rtsp-server/src/rtsp_auth.rs b/gstreamer-rtsp-server/src/rtsp_auth.rs index 0dbcf9b45..1a3d0ddde 100644 --- a/gstreamer-rtsp-server/src/rtsp_auth.rs +++ b/gstreamer-rtsp-server/src/rtsp_auth.rs @@ -89,7 +89,7 @@ where { let f: &F = &*(f as *const F); match f( - &RTSPAuth::from_glib_borrow(this).unsafe_cast(), + &RTSPAuth::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(connection), &from_glib_borrow(peer_cert), from_glib(errors), diff --git a/gstreamer-rtsp-server/src/rtsp_context.rs b/gstreamer-rtsp-server/src/rtsp_context.rs index 8622172e0..a25b64e23 100644 --- a/gstreamer-rtsp-server/src/rtsp_context.rs +++ b/gstreamer-rtsp-server/src/rtsp_context.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use glib; +use glib::translate::*; use gst_rtsp_server_sys; use std::ptr; @@ -30,22 +30,20 @@ impl RTSPContext { } #[doc(hidden)] -impl glib::translate::FromGlibPtrBorrow<*mut gst_rtsp_server_sys::GstRTSPContext> for RTSPContext { +impl FromGlibPtrBorrow<*mut gst_rtsp_server_sys::GstRTSPContext> for RTSPContext { #[inline] - unsafe fn from_glib_borrow(ptr: *mut gst_rtsp_server_sys::GstRTSPContext) -> Self { + unsafe fn from_glib_borrow(ptr: *mut gst_rtsp_server_sys::GstRTSPContext) -> Borrowed { assert!(!ptr.is_null()); - RTSPContext(ptr::NonNull::new_unchecked(ptr)) + Borrowed::new(RTSPContext(ptr::NonNull::new_unchecked(ptr))) } } #[doc(hidden)] -impl<'a> glib::translate::ToGlibPtr<'a, *mut gst_rtsp_server_sys::GstRTSPContext> for RTSPContext { +impl<'a> ToGlibPtr<'a, *mut gst_rtsp_server_sys::GstRTSPContext> for RTSPContext { type Storage = &'a RTSPContext; - fn to_glib_none( - &'a self, - ) -> glib::translate::Stash<'a, *mut gst_rtsp_server_sys::GstRTSPContext, Self> { - glib::translate::Stash(self.0.as_ptr(), self) + fn to_glib_none(&'a self) -> Stash<'a, *mut gst_rtsp_server_sys::GstRTSPContext, Self> { + Stash(self.0.as_ptr(), self) } fn to_glib_full(&self) -> *mut gst_rtsp_server_sys::GstRTSPContext { diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_client.rs b/gstreamer-rtsp-server/src/subclass/rtsp_client.rs index 2b6d3d201..568746d9c 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_client.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_client.rs @@ -839,7 +839,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let sdp = imp.create_sdp(&wrap, &from_glib_borrow(media)); let ptr = sdp.to_glib_none().0; @@ -859,7 +859,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.configure_client_media( &wrap, @@ -869,7 +869,7 @@ where ) { Ok(()) => glib_sys::GTRUE, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); glib_sys::GFALSE } } @@ -884,7 +884,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.params_set(&wrap, &from_glib_borrow(ctx)).to_glib() } @@ -898,7 +898,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.params_get(&wrap, &from_glib_borrow(ctx)).to_glib() } @@ -912,7 +912,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.make_path_from_uri(&wrap, &from_glib_borrow(url)) .to_glib_full() @@ -924,7 +924,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.closed(&wrap); } @@ -937,7 +937,7 @@ unsafe extern "C" fn client_new_session( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.new_session(&wrap, &from_glib_borrow(session)); } @@ -950,7 +950,7 @@ unsafe extern "C" fn client_options_request( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.options_request(&wrap, &from_glib_borrow(ctx)); } @@ -963,7 +963,7 @@ unsafe extern "C" fn client_describe_request( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.describe_request(&wrap, &from_glib_borrow(ctx)); } @@ -976,7 +976,7 @@ unsafe extern "C" fn client_setup_request( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.setup_request(&wrap, &from_glib_borrow(ctx)); } @@ -989,7 +989,7 @@ unsafe extern "C" fn client_play_request( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.play_request(&wrap, &from_glib_borrow(ctx)); } @@ -1002,7 +1002,7 @@ unsafe extern "C" fn client_pause_request( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.pause_request(&wrap, &from_glib_borrow(ctx)); } @@ -1015,7 +1015,7 @@ unsafe extern "C" fn client_teardown_request( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.teardown_request(&wrap, &from_glib_borrow(ctx)); } @@ -1028,7 +1028,7 @@ unsafe extern "C" fn client_set_parameter_request( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.set_parameter_request(&wrap, &from_glib_borrow(ctx)); } @@ -1041,7 +1041,7 @@ unsafe extern "C" fn client_get_parameter_request( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.get_parameter_request(&wrap, &from_glib_borrow(ctx)); } @@ -1054,7 +1054,7 @@ unsafe extern "C" fn client_announce_request( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.announce_request(&wrap, &from_glib_borrow(ctx)); } @@ -1067,7 +1067,7 @@ unsafe extern "C" fn client_record_request( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.record_request(&wrap, &from_glib_borrow(ctx)); } @@ -1080,7 +1080,7 @@ unsafe extern "C" fn client_handle_response( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.handle_response(&wrap, &from_glib_borrow(ctx)); } @@ -1096,7 +1096,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.handle_sdp( &wrap, @@ -1106,7 +1106,7 @@ where ) { Ok(()) => glib_sys::GTRUE, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); glib_sys::GFALSE } } @@ -1122,7 +1122,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.check_requirements( &wrap, @@ -1141,7 +1141,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.pre_options_request(&wrap, &from_glib_borrow(ctx)) .to_glib() @@ -1156,7 +1156,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.pre_describe_request(&wrap, &from_glib_borrow(ctx)) .to_glib() @@ -1171,7 +1171,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.pre_setup_request(&wrap, &from_glib_borrow(ctx)) .to_glib() @@ -1186,7 +1186,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.pre_play_request(&wrap, &from_glib_borrow(ctx)) .to_glib() @@ -1201,7 +1201,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.pre_pause_request(&wrap, &from_glib_borrow(ctx)) .to_glib() @@ -1216,7 +1216,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.pre_teardown_request(&wrap, &from_glib_borrow(ctx)) .to_glib() @@ -1231,7 +1231,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.pre_set_parameter_request(&wrap, &from_glib_borrow(ctx)) .to_glib() @@ -1246,7 +1246,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.pre_get_parameter_request(&wrap, &from_glib_borrow(ctx)) .to_glib() @@ -1261,7 +1261,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.pre_announce_request(&wrap, &from_glib_borrow(ctx)) .to_glib() @@ -1276,7 +1276,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPClient = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.pre_record_request(&wrap, &from_glib_borrow(ctx)) .to_glib() diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_media.rs b/gstreamer-rtsp-server/src/subclass/rtsp_media.rs index 8ed01479e..a9ea2938d 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_media.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_media.rs @@ -486,7 +486,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.handle_message(&wrap, gst::MessageRef::from_ptr(message)) .to_glib() @@ -501,12 +501,12 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.prepare(&wrap, &from_glib_borrow(thread)) { Ok(()) => glib_sys::GTRUE, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); glib_sys::GFALSE } } @@ -520,12 +520,12 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.unprepare(&wrap) { Ok(()) => glib_sys::GTRUE, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); glib_sys::GFALSE } } @@ -539,12 +539,12 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.suspend(&wrap) { Ok(()) => glib_sys::GTRUE, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); glib_sys::GFALSE } } @@ -558,12 +558,12 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.unsuspend(&wrap) { Ok(()) => glib_sys::GTRUE, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); glib_sys::GFALSE } } @@ -578,7 +578,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.query_position(&wrap) { Some(pos) => { @@ -598,7 +598,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.query_stop(&wrap) { Some(s) => { @@ -617,7 +617,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let res: *mut gst_sys::GstElement = imp.create_rtpbin(&wrap).to_glib_full(); @@ -637,7 +637,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); // If the rtpbin was floating before make sure it is not anymore for now so // we don't accidentally take ownership of it somewhere along the line @@ -648,7 +648,7 @@ where let res = match imp.setup_rtpbin(&wrap, &from_glib_borrow(rtpbin)) { Ok(()) => glib_sys::GTRUE, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); glib_sys::GFALSE } }; @@ -669,7 +669,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.setup_sdp( &wrap, @@ -678,7 +678,7 @@ where ) { Ok(()) => glib_sys::GTRUE, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); glib_sys::GFALSE } } @@ -692,7 +692,7 @@ unsafe extern "C" fn media_new_stream( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.new_stream(&wrap, &from_glib_borrow(stream)); } @@ -705,7 +705,7 @@ unsafe extern "C" fn media_removed_stream( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.removed_stream(&wrap, &from_glib_borrow(stream)); } @@ -716,7 +716,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.prepared(&wrap); } @@ -728,7 +728,7 @@ unsafe extern "C" fn media_unprepared( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.unprepared(&wrap); } @@ -741,7 +741,7 @@ unsafe extern "C" fn media_target_state( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.target_state(&wrap, from_glib(state)); } @@ -754,7 +754,7 @@ unsafe extern "C" fn media_new_state( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.new_state(&wrap, from_glib(state)); } @@ -768,12 +768,12 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMedia = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.handle_sdp(&wrap, &*(sdp as *const gst_sdp::SDPMessageRef)) { Ok(()) => glib_sys::GTRUE, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); glib_sys::GFALSE } } diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs b/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs index 026f989cc..395fc6a7f 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_media_factory.rs @@ -228,7 +228,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMediaFactory = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.gen_key(&wrap, &from_glib_borrow(url)).to_glib_full() } @@ -242,7 +242,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMediaFactory = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let element = imp .create_element(&wrap, &from_glib_borrow(url)) @@ -260,7 +260,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMediaFactory = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.construct(&wrap, &from_glib_borrow(url)).to_glib_full() } @@ -280,7 +280,7 @@ where let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMediaFactory = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let pipeline: *mut gst_sys::GstPipeline = imp .create_pipeline(&wrap, &from_glib_borrow(media)) @@ -305,7 +305,7 @@ unsafe extern "C" fn factory_configure( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMediaFactory = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.configure(&wrap, &from_glib_borrow(media)); } @@ -318,7 +318,7 @@ unsafe extern "C" fn factory_media_constructed( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMediaFactory = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.media_constructed(&wrap, &from_glib_borrow(media)); } @@ -331,7 +331,7 @@ unsafe extern "C" fn factory_media_configure( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPMediaFactory = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.media_configure(&wrap, &from_glib_borrow(media)); } diff --git a/gstreamer-rtsp-server/src/subclass/rtsp_server.rs b/gstreamer-rtsp-server/src/subclass/rtsp_server.rs index 78e13e874..78fb024f2 100644 --- a/gstreamer-rtsp-server/src/subclass/rtsp_server.rs +++ b/gstreamer-rtsp-server/src/subclass/rtsp_server.rs @@ -73,7 +73,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPServer = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.create_client(&wrap).to_glib_full() } @@ -86,7 +86,7 @@ unsafe extern "C" fn server_client_connected( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: RTSPServer = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.client_connected(&wrap, &from_glib_borrow(client)); } diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-rtsp/src/auto/versions.txt +++ b/gstreamer-rtsp/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-sdp/src/auto/versions.txt +++ b/gstreamer-sdp/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-video/src/auto/versions.txt +++ b/gstreamer-video/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer-video/src/auto/video_encoder.rs b/gstreamer-video/src/auto/video_encoder.rs index 7e79472a2..6ef1ccc3a 100644 --- a/gstreamer-video/src/auto/video_encoder.rs +++ b/gstreamer-video/src/auto/video_encoder.rs @@ -177,7 +177,7 @@ impl> VideoEncoderExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&VideoEncoder::from_glib_borrow(this).unsafe_cast()) + f(&VideoEncoder::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-video/src/subclass/video_decoder.rs b/gstreamer-video/src/subclass/video_decoder.rs index 5e972edf9..08c573ebc 100644 --- a/gstreamer-video/src/subclass/video_decoder.rs +++ b/gstreamer-video/src/subclass/video_decoder.rs @@ -539,7 +539,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.open(&wrap) { @@ -562,7 +562,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.close(&wrap) { @@ -585,7 +585,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.start(&wrap) { @@ -608,7 +608,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.stop(&wrap) { @@ -631,7 +631,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.finish(&wrap).into() @@ -648,7 +648,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.drain(&wrap).into() @@ -666,7 +666,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_video_sys::gst_video_codec_state_ref(state); let wrap_state = VideoCodecState::::new(state); @@ -674,7 +674,7 @@ where match imp.set_format(&wrap, &wrap_state) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -694,10 +694,10 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_video_sys::gst_video_codec_frame_ref(frame); - let wrap_frame = VideoCodecFrame::new(frame, &wrap); - let wrap_adapter: gst_base::Adapter = from_glib_borrow(adapter); + let wrap_frame = VideoCodecFrame::new(frame, &*wrap); + let wrap_adapter: Borrowed = from_glib_borrow(adapter); let at_eos: bool = from_glib(at_eos); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { @@ -716,8 +716,8 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); - let wrap_frame = VideoCodecFrame::new(frame, &wrap); + let wrap: Borrowed = from_glib_borrow(ptr); + let wrap_frame = VideoCodecFrame::new(frame, &*wrap); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.handle_frame(&wrap, wrap_frame).into() @@ -734,7 +734,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { VideoDecoderImpl::flush(imp, &wrap) @@ -751,13 +751,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.negotiate(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -775,13 +775,15 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::Caps::new_empty(), { VideoDecoderImpl::get_caps( imp, &wrap, - Option::::from_glib_borrow(filter).as_ref(), + Option::::from_glib_borrow(filter) + .as_ref() + .as_ref(), ) }) .to_glib_full() @@ -797,7 +799,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.sink_event(&wrap, from_glib_full(event)) @@ -815,7 +817,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.sink_query(&wrap, gst::QueryRef::from_mut_ptr(query)) @@ -833,7 +835,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.src_event(&wrap, from_glib_full(event)) @@ -851,7 +853,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.src_query(&wrap, gst::QueryRef::from_mut_ptr(query)) @@ -869,7 +871,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let query = gst::QueryRef::from_mut_ptr(query); gst_panic_to_error!(&wrap, &instance.panicked(), false, { @@ -894,7 +896,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoDecoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let query = gst::QueryRef::from_mut_ptr(query); gst_panic_to_error!(&wrap, &instance.panicked(), false, { diff --git a/gstreamer-video/src/subclass/video_encoder.rs b/gstreamer-video/src/subclass/video_encoder.rs index b4e7a66fe..b7fd1b356 100644 --- a/gstreamer-video/src/subclass/video_encoder.rs +++ b/gstreamer-video/src/subclass/video_encoder.rs @@ -473,7 +473,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.open(&wrap) { @@ -496,7 +496,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.close(&wrap) { @@ -519,7 +519,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.start(&wrap) { @@ -542,7 +542,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.stop(&wrap) { @@ -565,7 +565,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.finish(&wrap).into() @@ -583,7 +583,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_video_sys::gst_video_codec_state_ref(state); let wrap_state = VideoCodecState::::new(state); @@ -591,7 +591,7 @@ where match imp.set_format(&wrap, &wrap_state) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -609,8 +609,8 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); - let wrap_frame = VideoCodecFrame::new(frame, &wrap); + let wrap: Borrowed = from_glib_borrow(ptr); + let wrap_frame = VideoCodecFrame::new(frame, &*wrap); gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, { imp.handle_frame(&wrap, wrap_frame).into() @@ -627,7 +627,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { VideoEncoderImpl::flush(imp, &wrap) @@ -644,13 +644,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.negotiate(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -668,13 +668,15 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), gst::Caps::new_empty(), { VideoEncoderImpl::get_caps( imp, &wrap, - Option::::from_glib_borrow(filter).as_ref(), + Option::::from_glib_borrow(filter) + .as_ref() + .as_ref(), ) }) .to_glib_full() @@ -690,7 +692,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.sink_event(&wrap, from_glib_full(event)) @@ -708,7 +710,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.sink_query(&wrap, gst::QueryRef::from_mut_ptr(query)) @@ -726,7 +728,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.src_event(&wrap, from_glib_full(event)) @@ -744,7 +746,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.src_query(&wrap, gst::QueryRef::from_mut_ptr(query)) @@ -762,7 +764,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let query = gst::QueryRef::from_mut_ptr(query); gst_panic_to_error!(&wrap, &instance.panicked(), false, { @@ -787,7 +789,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: VideoEncoder = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let query = gst::QueryRef::from_mut_ptr(query); gst_panic_to_error!(&wrap, &instance.panicked(), false, { diff --git a/gstreamer-video/src/video_frame.rs b/gstreamer-video/src/video_frame.rs index 9650512b9..76cd145e9 100644 --- a/gstreamer-video/src/video_frame.rs +++ b/gstreamer-video/src/video_frame.rs @@ -10,7 +10,7 @@ use gst_sys; use gst_video_sys; use glib; -use glib::translate::{from_glib, ToGlibPtr}; +use glib::translate::{from_glib, Borrowed, ToGlibPtr}; use gst; use gst::miniobject::MiniObject; @@ -201,7 +201,6 @@ impl VideoFrame { frame, buffer: Some(self.buffer()), info, - borrowed: true, } } @@ -390,7 +389,6 @@ impl VideoFrame { frame, buffer: Some(self.buffer_mut()), info, - borrowed: true, } } @@ -404,7 +402,6 @@ pub struct VideoFrameRef { frame: gst_video_sys::GstVideoFrame, buffer: Option, info: ::VideoInfo, - borrowed: bool, } impl VideoFrameRef { @@ -546,17 +543,26 @@ impl VideoFrameRef { } impl<'a> VideoFrameRef<&'a gst::BufferRef> { - pub unsafe fn from_glib_borrow(frame: *const gst_video_sys::GstVideoFrame) -> Self { + pub unsafe fn from_glib_borrow(frame: *const gst_video_sys::GstVideoFrame) -> Borrowed { assert!(!frame.is_null()); let frame = ptr::read(frame); + let info = ::VideoInfo(ptr::read(&frame.info)); + let buffer = gst::BufferRef::from_ptr(frame.buffer); + Borrowed::new(VideoFrameRef { + frame, + buffer: Some(buffer), + info, + }) + } + + pub unsafe fn from_glib_full(frame: gst_video_sys::GstVideoFrame) -> Self { let info = ::VideoInfo(ptr::read(&frame.info)); let buffer = gst::BufferRef::from_ptr(frame.buffer); VideoFrameRef { frame, buffer: Some(buffer), info, - borrowed: false, } } @@ -584,7 +590,6 @@ impl<'a> VideoFrameRef<&'a gst::BufferRef> { frame, buffer: Some(buffer), info, - borrowed: false, }) } } @@ -616,7 +621,6 @@ impl<'a> VideoFrameRef<&'a gst::BufferRef> { frame, buffer: Some(buffer), info, - borrowed: false, }) } } @@ -628,17 +632,26 @@ impl<'a> VideoFrameRef<&'a gst::BufferRef> { } impl<'a> VideoFrameRef<&'a mut gst::BufferRef> { - pub unsafe fn from_glib_borrow_mut(frame: *mut gst_video_sys::GstVideoFrame) -> Self { + pub unsafe fn from_glib_borrow_mut(frame: *mut gst_video_sys::GstVideoFrame) -> Borrowed { assert!(!frame.is_null()); let frame = ptr::read(frame); + let info = ::VideoInfo(ptr::read(&frame.info)); + let buffer = gst::BufferRef::from_mut_ptr(frame.buffer); + Borrowed::new(VideoFrameRef { + frame, + buffer: Some(buffer), + info, + }) + } + + pub unsafe fn from_glib_full_mut(frame: gst_video_sys::GstVideoFrame) -> Self { let info = ::VideoInfo(ptr::read(&frame.info)); let buffer = gst::BufferRef::from_mut_ptr(frame.buffer); VideoFrameRef { frame, buffer: Some(buffer), info, - borrowed: false, } } @@ -668,7 +681,6 @@ impl<'a> VideoFrameRef<&'a mut gst::BufferRef> { frame, buffer: Some(buffer), info, - borrowed: false, }) } } @@ -702,7 +714,6 @@ impl<'a> VideoFrameRef<&'a mut gst::BufferRef> { frame, buffer: Some(buffer), info, - borrowed: false, }) } } @@ -763,10 +774,8 @@ unsafe impl Sync for VideoFrameRef {} impl Drop for VideoFrameRef { fn drop(&mut self) { - if !self.borrowed { - unsafe { - gst_video_sys::gst_video_frame_unmap(&mut self.frame); - } + unsafe { + gst_video_sys::gst_video_frame_unmap(&mut self.frame); } } } diff --git a/gstreamer-video/src/video_time_code.rs b/gstreamer-video/src/video_time_code.rs index 227402767..539d7a4f8 100644 --- a/gstreamer-video/src/video_time_code.rs +++ b/gstreamer-video/src/video_time_code.rs @@ -425,14 +425,13 @@ macro_rules! generic_impl { #[doc(hidden)] impl FromGlibPtrBorrow<*mut gst_video_sys::GstVideoTimeCode> for $name { #[inline] - unsafe fn from_glib_borrow(ptr: *mut gst_video_sys::GstVideoTimeCode) -> Self { + unsafe fn from_glib_borrow( + ptr: *mut gst_video_sys::GstVideoTimeCode, + ) -> Borrowed { assert!(!ptr.is_null()); let v = ptr::read(ptr); - if !v.config.latest_daily_jam.is_null() { - glib_sys::g_date_time_ref(v.config.latest_daily_jam); - } - $name(v) + Borrowed::new($name(v)) } } diff --git a/gstreamer-video/src/video_time_code_interval.rs b/gstreamer-video/src/video_time_code_interval.rs index 648dd7233..5c8858343 100644 --- a/gstreamer-video/src/video_time_code_interval.rs +++ b/gstreamer-video/src/video_time_code_interval.rs @@ -207,9 +207,11 @@ impl FromGlibPtrFull<*mut gst_video_sys::GstVideoTimeCodeInterval> for VideoTime #[doc(hidden)] impl FromGlibPtrBorrow<*mut gst_video_sys::GstVideoTimeCodeInterval> for VideoTimeCodeInterval { #[inline] - unsafe fn from_glib_borrow(ptr: *mut gst_video_sys::GstVideoTimeCodeInterval) -> Self { + unsafe fn from_glib_borrow( + ptr: *mut gst_video_sys::GstVideoTimeCodeInterval, + ) -> Borrowed { assert!(!ptr.is_null()); - VideoTimeCodeInterval(ptr::read(ptr)) + Borrowed::new(VideoTimeCodeInterval(ptr::read(ptr))) } } diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer-webrtc/src/auto/versions.txt +++ b/gstreamer-webrtc/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer/src/auto/bin.rs b/gstreamer/src/auto/bin.rs index 7ae50bf8b..d954a36bb 100644 --- a/gstreamer/src/auto/bin.rs +++ b/gstreamer/src/auto/bin.rs @@ -320,7 +320,7 @@ impl> GstBinExt for O { { let f: &F = &*(f as *const F); f( - &Bin::from_glib_borrow(this).unsafe_cast(), + &Bin::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(sub_bin), &from_glib_borrow(element), ) @@ -354,7 +354,7 @@ impl> GstBinExt for O { { let f: &F = &*(f as *const F); f( - &Bin::from_glib_borrow(this).unsafe_cast(), + &Bin::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(sub_bin), &from_glib_borrow(element), ) @@ -388,7 +388,7 @@ impl> GstBinExt for O { { let f: &F = &*(f as *const F); f( - &Bin::from_glib_borrow(this).unsafe_cast(), + &Bin::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(element), ) } @@ -419,7 +419,7 @@ impl> GstBinExt for O { { let f: &F = &*(f as *const F); f( - &Bin::from_glib_borrow(this).unsafe_cast(), + &Bin::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(element), ) } @@ -449,7 +449,7 @@ impl> GstBinExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Bin::from_glib_borrow(this).unsafe_cast()) + f(&Bin::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -479,7 +479,7 @@ impl> GstBinExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Bin::from_glib_borrow(this).unsafe_cast()) + f(&Bin::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer/src/auto/child_proxy.rs b/gstreamer/src/auto/child_proxy.rs index 1d26ef626..628ef577c 100644 --- a/gstreamer/src/auto/child_proxy.rs +++ b/gstreamer/src/auto/child_proxy.rs @@ -153,7 +153,7 @@ impl> ChildProxyExt for O { { let f: &F = &*(f as *const F); f( - &ChildProxy::from_glib_borrow(this).unsafe_cast(), + &ChildProxy::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), &GString::from_glib_borrow(name), ) @@ -186,7 +186,7 @@ impl> ChildProxyExt for O { { let f: &F = &*(f as *const F); f( - &ChildProxy::from_glib_borrow(this).unsafe_cast(), + &ChildProxy::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), &GString::from_glib_borrow(name), ) diff --git a/gstreamer/src/auto/clock.rs b/gstreamer/src/auto/clock.rs index a451425e4..5e78a27c7 100644 --- a/gstreamer/src/auto/clock.rs +++ b/gstreamer/src/auto/clock.rs @@ -430,7 +430,7 @@ impl> ClockExt for O { { let f: &F = &*(f as *const F); f( - &Clock::from_glib_borrow(this).unsafe_cast(), + &Clock::from_glib_borrow(this).unsafe_cast_ref(), from_glib(synced), ) } @@ -457,7 +457,7 @@ impl> ClockExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Clock::from_glib_borrow(this).unsafe_cast()) + f(&Clock::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -482,7 +482,7 @@ impl> ClockExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Clock::from_glib_borrow(this).unsafe_cast()) + f(&Clock::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -510,7 +510,7 @@ impl> ClockExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Clock::from_glib_borrow(this).unsafe_cast()) + f(&Clock::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer/src/auto/device.rs b/gstreamer/src/auto/device.rs index f9e6d7a0b..4e820065e 100644 --- a/gstreamer/src/auto/device.rs +++ b/gstreamer/src/auto/device.rs @@ -134,7 +134,7 @@ impl> DeviceExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Device::from_glib_borrow(this).unsafe_cast()) + f(&Device::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer/src/auto/device_monitor.rs b/gstreamer/src/auto/device_monitor.rs index 904019de4..3b2dc1db1 100644 --- a/gstreamer/src/auto/device_monitor.rs +++ b/gstreamer/src/auto/device_monitor.rs @@ -152,7 +152,7 @@ impl> DeviceMonitorExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&DeviceMonitor::from_glib_borrow(this).unsafe_cast()) + f(&DeviceMonitor::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer/src/auto/device_provider.rs b/gstreamer/src/auto/device_provider.rs index 74c5a356a..5a43d6107 100644 --- a/gstreamer/src/auto/device_provider.rs +++ b/gstreamer/src/auto/device_provider.rs @@ -188,7 +188,7 @@ impl> DeviceProviderExt for O { { let f: &F = &*(f as *const F); f( - &DeviceProvider::from_glib_borrow(this).unsafe_cast(), + &DeviceProvider::from_glib_borrow(this).unsafe_cast_ref(), &GString::from_glib_borrow(object), ) } @@ -219,7 +219,7 @@ impl> DeviceProviderExt for O { { let f: &F = &*(f as *const F); f( - &DeviceProvider::from_glib_borrow(this).unsafe_cast(), + &DeviceProvider::from_glib_borrow(this).unsafe_cast_ref(), &GString::from_glib_borrow(object), ) } diff --git a/gstreamer/src/auto/element.rs b/gstreamer/src/auto/element.rs index aecf02aec..310139362 100644 --- a/gstreamer/src/auto/element.rs +++ b/gstreamer/src/auto/element.rs @@ -670,7 +670,7 @@ impl> ElementExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Element::from_glib_borrow(this).unsafe_cast()) + f(&Element::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -696,7 +696,7 @@ impl> ElementExt for O { { let f: &F = &*(f as *const F); f( - &Element::from_glib_borrow(this).unsafe_cast(), + &Element::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(new_pad), ) } @@ -724,7 +724,7 @@ impl> ElementExt for O { { let f: &F = &*(f as *const F); f( - &Element::from_glib_borrow(this).unsafe_cast(), + &Element::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(old_pad), ) } diff --git a/gstreamer/src/auto/object.rs b/gstreamer/src/auto/object.rs index 1de7a99ad..365ca3a55 100644 --- a/gstreamer/src/auto/object.rs +++ b/gstreamer/src/auto/object.rs @@ -301,7 +301,7 @@ impl> GstObjectExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Object::from_glib_borrow(this).unsafe_cast()) + f(&Object::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -326,7 +326,7 @@ impl> GstObjectExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Object::from_glib_borrow(this).unsafe_cast()) + f(&Object::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer/src/auto/pad.rs b/gstreamer/src/auto/pad.rs index ef9561c39..c967115f1 100644 --- a/gstreamer/src/auto/pad.rs +++ b/gstreamer/src/auto/pad.rs @@ -573,7 +573,7 @@ impl> PadExt for O { { let f: &F = &*(f as *const F); f( - &Pad::from_glib_borrow(this).unsafe_cast(), + &Pad::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(peer), ) } @@ -601,7 +601,7 @@ impl> PadExt for O { { let f: &F = &*(f as *const F); f( - &Pad::from_glib_borrow(this).unsafe_cast(), + &Pad::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(peer), ) } @@ -628,7 +628,7 @@ impl> PadExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pad::from_glib_borrow(this).unsafe_cast()) + f(&Pad::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -653,7 +653,7 @@ impl> PadExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pad::from_glib_borrow(this).unsafe_cast()) + f(&Pad::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -678,7 +678,7 @@ impl> PadExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pad::from_glib_borrow(this).unsafe_cast()) + f(&Pad::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer/src/auto/pipeline.rs b/gstreamer/src/auto/pipeline.rs index 1e066332f..3b3e5e927 100644 --- a/gstreamer/src/auto/pipeline.rs +++ b/gstreamer/src/auto/pipeline.rs @@ -159,7 +159,7 @@ impl> PipelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pipeline::from_glib_borrow(this).unsafe_cast()) + f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -186,7 +186,7 @@ impl> PipelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pipeline::from_glib_borrow(this).unsafe_cast()) + f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); @@ -211,7 +211,7 @@ impl> PipelineExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&Pipeline::from_glib_borrow(this).unsafe_cast()) + f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer/src/auto/system_clock.rs b/gstreamer/src/auto/system_clock.rs index fd3e61c0d..3d669c5fd 100644 --- a/gstreamer/src/auto/system_clock.rs +++ b/gstreamer/src/auto/system_clock.rs @@ -94,7 +94,7 @@ impl> SystemClockExt for O { P: IsA, { let f: &F = &*(f as *const F); - f(&SystemClock::from_glib_borrow(this).unsafe_cast()) + f(&SystemClock::from_glib_borrow(this).unsafe_cast_ref()) } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt index e6c1d2b5d..bb127cbf0 100644 --- a/gstreamer/src/auto/versions.txt +++ b/gstreamer/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 0a4cfc4) -from gir-files (https://github.com/gtk-rs/gir-files @ 4607c4a0) +Generated by gir (https://github.com/gtk-rs/gir @ 997cbcb) +from gir-files (https://github.com/gtk-rs/gir-files @ a57b90d4) diff --git a/gstreamer/src/bin.rs b/gstreamer/src/bin.rs index ccba7df90..60d52c5d4 100644 --- a/gstreamer/src/bin.rs +++ b/gstreamer/src/bin.rs @@ -214,10 +214,10 @@ where P: IsA, { let f: &F = &*(f as *const F); - match f(&Bin::from_glib_borrow(this).unsafe_cast()) { + match f(&Bin::from_glib_borrow(this).unsafe_cast_ref()) { Ok(()) => true, Err(err) => { - err.log_with_object(&Bin::from_glib_borrow(this)); + err.log_with_object(&*Bin::from_glib_borrow(this)); false } } diff --git a/gstreamer/src/element.rs b/gstreamer/src/element.rs index 4e5d93ef2..469b0af7e 100644 --- a/gstreamer/src/element.rs +++ b/gstreamer/src/element.rs @@ -768,7 +768,7 @@ impl> ElementExtManual for O { let user_data: &mut Option = &mut *(user_data as *mut _); let callback = user_data.take().unwrap(); - callback(&Element::from_glib_borrow(element).unsafe_cast()); + callback(&Element::from_glib_borrow(element).unsafe_cast_ref()); } unsafe extern "C" fn free_user_data, F: FnOnce(&O) + Send + 'static>( diff --git a/gstreamer/src/iterator.rs b/gstreamer/src/iterator.rs index 99ce2aa66..f70b7ffb9 100644 --- a/gstreamer/src/iterator.rs +++ b/gstreamer/src/iterator.rs @@ -35,7 +35,6 @@ pub enum IteratorError { // Implemented manually so that we can use generics for the item pub struct Iterator { iter: ptr::NonNull, - borrowed: bool, phantom: PhantomData, } @@ -463,17 +462,14 @@ impl fmt::Debug for Iterator { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.debug_struct("Iterator") .field("iter", &self.iter) - .field("borrowed", &self.borrowed) .finish() } } impl Drop for Iterator { fn drop(&mut self) { - if !self.borrowed { - unsafe { - gst_sys::gst_iterator_free(self.iter.as_ptr()); - } + unsafe { + gst_sys::gst_iterator_free(self.iter.as_ptr()); } } } @@ -584,17 +580,16 @@ impl glib::translate::FromGlibPtrNone<*mut gst_sys::GstIterator> #[doc(hidden)] impl glib::translate::FromGlibPtrBorrow<*mut gst_sys::GstIterator> for Iterator { #[inline] - unsafe fn from_glib_borrow(ptr: *mut gst_sys::GstIterator) -> Self { + unsafe fn from_glib_borrow(ptr: *mut gst_sys::GstIterator) -> Borrowed { assert!(!ptr.is_null()); assert_ne!( gobject_sys::g_type_is_a((*ptr).type_, T::static_type().to_glib()), glib_sys::GFALSE ); - Self { + Borrowed::new(Self { iter: ptr::NonNull::new_unchecked(ptr), - borrowed: true, phantom: PhantomData, - } + }) } } @@ -609,7 +604,6 @@ impl glib::translate::FromGlibPtrFull<*mut gst_sys::GstIterator> ); Self { iter: ptr::NonNull::new_unchecked(ptr), - borrowed: false, phantom: PhantomData, } } diff --git a/gstreamer/src/log.rs b/gstreamer/src/log.rs index ae9765eba..ea45bee7e 100644 --- a/gstreamer/src/log.rs +++ b/gstreamer/src/log.rs @@ -19,7 +19,7 @@ use once_cell::sync::Lazy; use gobject_sys; use gst_sys; -use glib::translate::{from_glib, from_glib_borrow, ToGlib, ToGlibPtr}; +use glib::translate::*; use glib::IsA; use glib_sys::gpointer; @@ -329,7 +329,7 @@ unsafe extern "C" fn log_handler( let file = CStr::from_ptr(file).to_string_lossy(); let function = CStr::from_ptr(function).to_string_lossy(); let line = line as u32; - let object: Option = from_glib_borrow(object); + let object: Borrowed> = from_glib_borrow(object); let message = DebugMessage(ptr::NonNull::new_unchecked(message)); let handler = &*(user_data as *mut T); (handler)( @@ -338,7 +338,7 @@ unsafe extern "C" fn log_handler( &file, &function, line, - object.as_ref(), + object.as_ref().as_ref(), &message, ); } diff --git a/gstreamer/src/miniobject.rs b/gstreamer/src/miniobject.rs index 43ec39377..c045aa388 100644 --- a/gstreamer/src/miniobject.rs +++ b/gstreamer/src/miniobject.rs @@ -12,11 +12,7 @@ use std::ptr; use std::{borrow, fmt, ops}; use glib; -use glib::translate::{ - from_glib, from_glib_full, from_glib_none, FromGlibContainerAsVec, - FromGlibPtrArrayContainerAsVec, FromGlibPtrBorrow, FromGlibPtrFull, FromGlibPtrNone, - GlibPtrDefault, Stash, StashMut, ToGlibContainerFromSlice, ToGlibPtr, ToGlibPtrMut, -}; +use glib::translate::*; use glib_sys; use glib_sys::gpointer; use gobject_sys; @@ -24,7 +20,6 @@ use gst_sys; pub struct GstRc { obj: ptr::NonNull, - borrowed: bool, phantom: PhantomData, } @@ -36,7 +31,6 @@ impl GstRc { GstRc { obj: ptr::NonNull::new_unchecked(ptr as *mut T::GstType as *mut T), - borrowed: false, phantom: PhantomData, } } @@ -46,19 +40,17 @@ impl GstRc { GstRc { obj: ptr::NonNull::new_unchecked(ptr as *mut T::GstType as *mut T), - borrowed: false, phantom: PhantomData, } } - pub unsafe fn from_glib_borrow(ptr: *const T::GstType) -> Self { + pub unsafe fn from_glib_borrow(ptr: *const T::GstType) -> Borrowed { assert!(!ptr.is_null()); - GstRc { + Borrowed::new(GstRc { obj: ptr::NonNull::new_unchecked(ptr as *mut T::GstType as *mut T), - borrowed: true, phantom: PhantomData, - } + }) } pub unsafe fn replace_ptr(&mut self, ptr: *mut T::GstType) { @@ -153,10 +145,8 @@ impl Clone for GstRc { impl Drop for GstRc { fn drop(&mut self) { - if !self.borrowed { - unsafe { - gst_sys::gst_mini_object_unref(self.as_mut_ptr() as *mut gst_sys::GstMiniObject); - } + unsafe { + gst_sys::gst_mini_object_unref(self.as_mut_ptr() as *mut gst_sys::GstMiniObject); } } } @@ -363,13 +353,13 @@ impl FromGlibPtrFull<*mut T::GstType> for GstRc { } impl FromGlibPtrBorrow<*const T::GstType> for GstRc { - unsafe fn from_glib_borrow(ptr: *const T::GstType) -> Self { + unsafe fn from_glib_borrow(ptr: *const T::GstType) -> Borrowed { Self::from_glib_borrow(ptr) } } impl FromGlibPtrBorrow<*mut T::GstType> for GstRc { - unsafe fn from_glib_borrow(ptr: *mut T::GstType) -> Self { + unsafe fn from_glib_borrow(ptr: *mut T::GstType) -> Borrowed { Self::from_glib_borrow(ptr) } } @@ -524,8 +514,13 @@ macro_rules! gst_define_mini_object_wrapper( $name($crate::glib::translate::from_glib_full(ptr)) } - pub unsafe fn from_glib_borrow(ptr: *const $gst_sys_name) -> Self { - $name($crate::glib::translate::from_glib_borrow(ptr)) + pub unsafe fn from_glib_borrow(ptr: *const $gst_sys_name) -> $crate::glib::translate::Borrowed { + $crate::glib::translate::Borrowed::new( + $name( + $crate::glib::translate::from_glib_borrow::<_, $crate::GstRc::<$ref_name>>(ptr) + .into_inner() + ) + ) } pub unsafe fn into_ptr(self) -> *mut $gst_sys_name { @@ -725,13 +720,13 @@ macro_rules! gst_define_mini_object_wrapper( } impl $crate::glib::translate::FromGlibPtrBorrow<*const $gst_sys_name> for $name { - unsafe fn from_glib_borrow(ptr: *const $gst_sys_name) -> Self { + unsafe fn from_glib_borrow(ptr: *const $gst_sys_name) -> $crate::glib::translate::Borrowed { Self::from_glib_borrow(ptr) } } impl $crate::glib::translate::FromGlibPtrBorrow<*mut $gst_sys_name> for $name { - unsafe fn from_glib_borrow(ptr: *mut $gst_sys_name) -> Self { + unsafe fn from_glib_borrow(ptr: *mut $gst_sys_name) -> $crate::glib::translate::Borrowed { Self::from_glib_borrow(ptr) } } diff --git a/gstreamer/src/object.rs b/gstreamer/src/object.rs index 76af69512..e8d86c774 100644 --- a/gstreamer/src/object.rs +++ b/gstreamer/src/object.rs @@ -42,7 +42,7 @@ impl> GstObjectExtManual for O { "deep-notify".into() }; - let obj: glib::Object = + let obj: Borrowed = unsafe { from_glib_borrow(self.as_ptr() as *mut gobject_sys::GObject) }; obj.connect(signal_name.as_str(), false, move |values| { diff --git a/gstreamer/src/pad.rs b/gstreamer/src/pad.rs index a6a0c0979..4fcf62808 100644 --- a/gstreamer/src/pad.rs +++ b/gstreamer/src/pad.rs @@ -1159,7 +1159,10 @@ where flow_ret: from_glib((*info).ABI.abi.flow_ret), }; - let ret = func(&Pad::from_glib_borrow(pad).unsafe_cast(), &mut probe_info); + let ret = func( + &Pad::from_glib_borrow(pad).unsafe_cast_ref(), + &mut probe_info, + ); if ret == PadProbeReturn::Handled { // Handled queries need to be returned @@ -1229,12 +1232,14 @@ where let func: &F = &*((*pad).activatedata as *const F); match func( - &Pad::from_glib_borrow(pad).unsafe_cast(), - Option::<::Object>::from_glib_borrow(parent).as_ref(), + &Pad::from_glib_borrow(pad).unsafe_cast_ref(), + Option::<::Object>::from_glib_borrow(parent) + .as_ref() + .as_ref(), ) { Ok(()) => true, Err(err) => { - err.log_with_object(&Pad::from_glib_borrow(pad)); + err.log_with_object(&*Pad::from_glib_borrow(pad)); false } } @@ -1256,14 +1261,16 @@ where let func: &F = &*((*pad).activatemodedata as *const F); match func( - &&Pad::from_glib_borrow(pad).unsafe_cast(), - Option::<::Object>::from_glib_borrow(parent).as_ref(), + &&Pad::from_glib_borrow(pad).unsafe_cast_ref(), + Option::<::Object>::from_glib_borrow(parent) + .as_ref() + .as_ref(), from_glib(mode), from_glib(active), ) { Ok(()) => true, Err(err) => { - err.log_with_object(&Pad::from_glib_borrow(pad)); + err.log_with_object(&*Pad::from_glib_borrow(pad)); false } } @@ -1284,8 +1291,10 @@ where let func: &F = &*((*pad).chaindata as *const F); let res: FlowReturn = func( - &Pad::from_glib_borrow(pad).unsafe_cast(), - Option::<::Object>::from_glib_borrow(parent).as_ref(), + &Pad::from_glib_borrow(pad).unsafe_cast_ref(), + Option::<::Object>::from_glib_borrow(parent) + .as_ref() + .as_ref(), from_glib_full(buffer), ) .into(); @@ -1309,8 +1318,10 @@ where let func: &F = &*((*pad).chainlistdata as *const F); let res: FlowReturn = func( - &Pad::from_glib_borrow(pad).unsafe_cast(), - Option::<::Object>::from_glib_borrow(parent).as_ref(), + &Pad::from_glib_borrow(pad).unsafe_cast_ref(), + Option::<::Object>::from_glib_borrow(parent) + .as_ref() + .as_ref(), from_glib_full(list), ) .into(); @@ -1331,8 +1342,10 @@ where let func: &F = &*((*pad).eventdata as *const F); func( - &Pad::from_glib_borrow(pad).unsafe_cast(), - Option::<::Object>::from_glib_borrow(parent).as_ref(), + &Pad::from_glib_borrow(pad).unsafe_cast_ref(), + Option::<::Object>::from_glib_borrow(parent) + .as_ref() + .as_ref(), from_glib_full(event), ) .to_glib() @@ -1352,8 +1365,10 @@ where let func: &F = &*((*pad).eventdata as *const F); let res: FlowReturn = func( - &Pad::from_glib_borrow(pad).unsafe_cast(), - Option::<::Object>::from_glib_borrow(parent).as_ref(), + &Pad::from_glib_borrow(pad).unsafe_cast_ref(), + Option::<::Object>::from_glib_borrow(parent) + .as_ref() + .as_ref(), from_glib_full(event), ) .into(); @@ -1388,7 +1403,8 @@ where assert!(!buffer.is_null()); - let pad = Pad::from_glib_borrow(pad).unsafe_cast(); + let pad = Pad::from_glib_borrow(pad); + let pad = pad.unsafe_cast_ref(); let mut passed_buffer = if (*buffer).is_null() { None } else { @@ -1397,7 +1413,9 @@ where match func( &pad, - Option::<::Object>::from_glib_borrow(parent).as_ref(), + Option::<::Object>::from_glib_borrow(parent) + .as_ref() + .as_ref(), offset, passed_buffer.as_mut().map(|b| b.deref_mut()), length, @@ -1468,8 +1486,10 @@ where // Steal the iterator and return it let ret = func( - &Pad::from_glib_borrow(pad).unsafe_cast(), - Option::<::Object>::from_glib_borrow(parent).as_ref(), + &Pad::from_glib_borrow(pad).unsafe_cast_ref(), + Option::<::Object>::from_glib_borrow(parent) + .as_ref() + .as_ref(), ); ret.into_ptr() @@ -1492,8 +1512,10 @@ where let func: &F = &*((*pad).linkdata as *const F); let res: ::PadLinkReturn = func( - &Pad::from_glib_borrow(pad).unsafe_cast(), - Option::<::Object>::from_glib_borrow(parent).as_ref(), + &Pad::from_glib_borrow(pad).unsafe_cast_ref(), + Option::<::Object>::from_glib_borrow(parent) + .as_ref() + .as_ref(), &from_glib_borrow(peer), ) .into(); @@ -1514,8 +1536,10 @@ where let func: &F = &*((*pad).querydata as *const F); func( - &Pad::from_glib_borrow(pad).unsafe_cast(), - Option::<::Object>::from_glib_borrow(parent).as_ref(), + &Pad::from_glib_borrow(pad).unsafe_cast_ref(), + Option::<::Object>::from_glib_borrow(parent) + .as_ref() + .as_ref(), ::QueryRef::from_mut_ptr(query), ) .to_glib() @@ -1533,8 +1557,10 @@ unsafe extern "C" fn trampoline_unlink_function< let func: &F = &*((*pad).unlinkdata as *const F); func( - &Pad::from_glib_borrow(pad).unsafe_cast(), - Option::<::Object>::from_glib_borrow(parent).as_ref(), + &Pad::from_glib_borrow(pad).unsafe_cast_ref(), + Option::<::Object>::from_glib_borrow(parent) + .as_ref() + .as_ref(), ) } diff --git a/gstreamer/src/promise.rs b/gstreamer/src/promise.rs index 45ddd6cfe..37540156a 100644 --- a/gstreamer/src/promise.rs +++ b/gstreamer/src/promise.rs @@ -55,7 +55,7 @@ impl Promise { let user_data: &mut Option = &mut *(user_data as *mut _); let callback = user_data.take().unwrap(); - let promise: Promise = from_glib_borrow(promise); + let promise: Borrowed = from_glib_borrow(promise); let res = match promise.wait() { PromiseResult::Replied => { diff --git a/gstreamer/src/segment.rs b/gstreamer/src/segment.rs index 8e3482696..1e9f39ae6 100644 --- a/gstreamer/src/segment.rs +++ b/gstreamer/src/segment.rs @@ -662,8 +662,8 @@ impl glib::translate::FromGlibPtrNone<*mut gst_sys::GstSegment> for Segment { #[doc(hidden)] impl glib::translate::FromGlibPtrBorrow<*mut gst_sys::GstSegment> for Segment { #[inline] - unsafe fn from_glib_borrow(ptr: *mut gst_sys::GstSegment) -> Self { - FormattedSegment(ptr::read(ptr), PhantomData) + unsafe fn from_glib_borrow(ptr: *mut gst_sys::GstSegment) -> Borrowed { + Borrowed::new(FormattedSegment(ptr::read(ptr), PhantomData)) } } diff --git a/gstreamer/src/static_caps.rs b/gstreamer/src/static_caps.rs index 34fabe9a9..b874dfbac 100644 --- a/gstreamer/src/static_caps.rs +++ b/gstreamer/src/static_caps.rs @@ -13,7 +13,7 @@ use gobject_sys; use gst_sys; use glib; -use glib::translate::{from_glib_full, FromGlibPtrNone, ToGlibPtr, ToGlibPtrMut}; +use glib::translate::*; use std::ffi::CStr; use std::fmt; @@ -117,9 +117,9 @@ impl glib::translate::FromGlibPtrNone<*mut gst_sys::GstStaticCaps> for StaticCap #[doc(hidden)] impl glib::translate::FromGlibPtrBorrow<*mut gst_sys::GstStaticCaps> for StaticCaps { #[inline] - unsafe fn from_glib_borrow(ptr: *mut gst_sys::GstStaticCaps) -> Self { + unsafe fn from_glib_borrow(ptr: *mut gst_sys::GstStaticCaps) -> Borrowed { assert!(!ptr.is_null()); - StaticCaps(ptr::NonNull::new_unchecked(ptr)) + Borrowed::new(StaticCaps(ptr::NonNull::new_unchecked(ptr))) } } diff --git a/gstreamer/src/static_pad_template.rs b/gstreamer/src/static_pad_template.rs index cf60ecb51..2d25e8eeb 100644 --- a/gstreamer/src/static_pad_template.rs +++ b/gstreamer/src/static_pad_template.rs @@ -14,9 +14,7 @@ use gobject_sys; use gst_sys; use glib; -use glib::translate::{ - from_glib, from_glib_full, from_glib_none, FromGlibPtrNone, ToGlibPtr, ToGlibPtrMut, -}; +use glib::translate::*; use std::ffi::CStr; use std::fmt; @@ -153,9 +151,9 @@ impl glib::translate::FromGlibPtrNone<*mut gst_sys::GstStaticPadTemplate> for St #[doc(hidden)] impl glib::translate::FromGlibPtrBorrow<*mut gst_sys::GstStaticPadTemplate> for StaticPadTemplate { #[inline] - unsafe fn from_glib_borrow(ptr: *mut gst_sys::GstStaticPadTemplate) -> Self { + unsafe fn from_glib_borrow(ptr: *mut gst_sys::GstStaticPadTemplate) -> Borrowed { assert!(!ptr.is_null()); - StaticPadTemplate(ptr::NonNull::new_unchecked(ptr)) + Borrowed::new(StaticPadTemplate(ptr::NonNull::new_unchecked(ptr))) } } diff --git a/gstreamer/src/subclass/bin.rs b/gstreamer/src/subclass/bin.rs index d711e9d05..159d29e0d 100644 --- a/gstreamer/src/subclass/bin.rs +++ b/gstreamer/src/subclass/bin.rs @@ -112,13 +112,13 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Bin = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { match imp.add_element(&wrap, &from_glib_none(element)) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -136,7 +136,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Bin = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); // If we get a floating reference passed simply return FALSE here. It can't be // stored inside this bin, and if we continued to use it we would take ownership @@ -149,7 +149,7 @@ where match imp.remove_element(&wrap, &from_glib_none(element)) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -166,7 +166,7 @@ unsafe extern "C" fn bin_handle_message( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Bin = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), (), { imp.handle_message(&wrap, from_glib_full(message)) diff --git a/gstreamer/src/subclass/child_proxy.rs b/gstreamer/src/subclass/child_proxy.rs index 83c7370f1..51387cbda 100644 --- a/gstreamer/src/subclass/child_proxy.rs +++ b/gstreamer/src/subclass/child_proxy.rs @@ -71,7 +71,7 @@ where imp.get_child_by_name( &from_glib_borrow(child_proxy), - String::from_glib_none(name).as_str(), + &glib::GString::from_glib_borrow(name), ) .to_glib_full() } @@ -115,7 +115,7 @@ unsafe extern "C" fn child_proxy_child_added( imp.child_added( &from_glib_borrow(child_proxy), &from_glib_borrow(child), - String::from_glib_none(name).as_str(), + &glib::GString::from_glib_borrow(name), ) } @@ -132,6 +132,6 @@ unsafe extern "C" fn child_proxy_child_removed( imp.child_removed( &from_glib_borrow(child_proxy), &from_glib_borrow(child), - String::from_glib_none(name).as_str(), + &glib::GString::from_glib_borrow(name), ) } diff --git a/gstreamer/src/subclass/clock.rs b/gstreamer/src/subclass/clock.rs index 10467fcf9..076e29665 100644 --- a/gstreamer/src/subclass/clock.rs +++ b/gstreamer/src/subclass/clock.rs @@ -259,7 +259,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Clock = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.change_resolution(&wrap, from_glib(old_resolution), from_glib(new_resolution)) .to_glib() @@ -273,7 +273,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Clock = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.get_resolution(&wrap).to_glib() } @@ -286,7 +286,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Clock = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.get_internal_time(&wrap).to_glib() } @@ -301,7 +301,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Clock = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let (res, j) = imp.wait(&wrap, &from_glib_borrow(id as gst_sys::GstClockID)); if !jitter.is_null() { @@ -320,7 +320,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Clock = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); ClockReturn::from(imp.wait_async(&wrap, &from_glib_borrow(id as gst_sys::GstClockID))).to_glib() } @@ -333,7 +333,7 @@ unsafe extern "C" fn clock_unschedule( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Clock = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.unschedule(&wrap, &from_glib_borrow(id as gst_sys::GstClockID)); } diff --git a/gstreamer/src/subclass/device.rs b/gstreamer/src/subclass/device.rs index 5b51b178b..250235167 100644 --- a/gstreamer/src/subclass/device.rs +++ b/gstreamer/src/subclass/device.rs @@ -119,11 +119,12 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Device = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.create_element( &wrap, Option::::from_glib_borrow(name) + .as_ref() .as_ref() .map(|s| s.as_str()), ) { @@ -137,7 +138,7 @@ where element_ptr } Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); ptr::null_mut() } } @@ -152,12 +153,12 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Device = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.reconfigure_element(&wrap, &from_glib_borrow(element)) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } diff --git a/gstreamer/src/subclass/device_provider.rs b/gstreamer/src/subclass/device_provider.rs index af242adb8..1cabf023f 100644 --- a/gstreamer/src/subclass/device_provider.rs +++ b/gstreamer/src/subclass/device_provider.rs @@ -134,7 +134,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: DeviceProvider = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.probe(&wrap).to_glib_full() } @@ -147,12 +147,12 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: DeviceProvider = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); match imp.start(&wrap) { Ok(()) => true, Err(err) => { - err.log_with_object(&wrap); + err.log_with_object(&*wrap); false } } @@ -165,7 +165,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: DeviceProvider = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.stop(&wrap); } diff --git a/gstreamer/src/subclass/element.rs b/gstreamer/src/subclass/element.rs index 1b7d683b4..c05767212 100644 --- a/gstreamer/src/subclass/element.rs +++ b/gstreamer/src/subclass/element.rs @@ -350,7 +350,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Element = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); // *Never* fail downwards state changes, this causes bugs in GStreamer // and leads to crashes and deadlocks. @@ -380,7 +380,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Element = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let caps = Option::<::Caps>::from_glib_borrow(caps); @@ -391,15 +391,15 @@ where &wrap, &from_glib_borrow(templ), from_glib_none(name), - caps.as_ref(), + caps.as_ref().as_ref(), ) }); // Ensure that the pad is owned by the element now, if a pad was returned if let Some(ref pad) = pad { assert_eq!( - pad.get_parent(), - Some(::Object::from_glib_borrow(ptr as *mut gst_sys::GstObject)) + pad.get_parent().as_ref(), + Some(&*::Object::from_glib_borrow(ptr as *mut gst_sys::GstObject)) ); } @@ -415,7 +415,7 @@ unsafe extern "C" fn element_release_pad( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Element = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); // If we get a floating reference passed simply return here. It can't be stored inside this // element, and if we continued to use it we would take ownership of this floating reference. @@ -438,7 +438,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Element = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.send_event(&wrap, from_glib_full(event)) @@ -456,7 +456,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Element = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let query = QueryRef::from_mut_ptr(query); gst_panic_to_error!(&wrap, &instance.panicked(), false, { @@ -474,7 +474,7 @@ unsafe extern "C" fn element_set_context( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Element = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), (), { imp.set_context(&wrap, &from_glib_borrow(context)) @@ -491,12 +491,12 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Element = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); let clock = Option::<::Clock>::from_glib_borrow(clock); gst_panic_to_error!(&wrap, &instance.panicked(), false, { - imp.set_clock(&wrap, clock.as_ref()) + imp.set_clock(&wrap, clock.as_ref().as_ref()) }) .to_glib() } @@ -510,7 +510,7 @@ where { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Element = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); gst_panic_to_error!(&wrap, &instance.panicked(), None, { imp.provide_clock(&wrap) diff --git a/gstreamer/src/subclass/pad.rs b/gstreamer/src/subclass/pad.rs index dd15c0f91..45d6e9046 100644 --- a/gstreamer/src/subclass/pad.rs +++ b/gstreamer/src/subclass/pad.rs @@ -78,7 +78,7 @@ unsafe extern "C" fn pad_linked( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Pad = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.linked(&wrap, &from_glib_borrow(peer)) } @@ -91,7 +91,7 @@ unsafe extern "C" fn pad_unlinked( { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); - let wrap: Pad = from_glib_borrow(ptr); + let wrap: Borrowed = from_glib_borrow(ptr); imp.unlinked(&wrap, &from_glib_borrow(peer)) }