From 991f2e1576d88c110ea15f0553ce43496db6e0be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 5 Oct 2019 00:03:57 +0300 Subject: [PATCH] Update and regenerate everything with latest gir --- gir | 2 +- gstreamer-app/src/auto/versions.txt | 2 +- gstreamer-audio/src/auto/versions.txt | 2 +- gstreamer-base/src/auto/versions.txt | 2 +- gstreamer-check/src/auto/versions.txt | 2 +- gstreamer-editing-services/src/auto/asset.rs | 18 ++++---- .../src/auto/pipeline.rs | 41 +++++++++++++++---- .../src/auto/versions.txt | 2 +- gstreamer-gl/src/auto/versions.txt | 2 +- gstreamer-net/src/auto/net_client_clock.rs | 4 +- gstreamer-net/src/auto/versions.txt | 2 +- gstreamer-pbutils/src/auto/versions.txt | 2 +- .../player_video_overlay_video_renderer.rs | 7 +++- gstreamer-player/src/auto/versions.txt | 2 +- gstreamer-rtp/src/auto/versions.txt | 2 +- gstreamer-rtsp-server/src/auto/rtsp_auth.rs | 1 + .../src/auto/rtsp_stream_transport.rs | 8 ++-- gstreamer-rtsp-server/src/auto/versions.txt | 2 +- gstreamer-rtsp/src/auto/versions.txt | 2 +- gstreamer-sdp/src/auto/versions.txt | 2 +- gstreamer-video/src/auto/versions.txt | 2 +- gstreamer-webrtc/src/auto/versions.txt | 2 +- gstreamer/src/auto/versions.txt | 2 +- 23 files changed, 75 insertions(+), 38 deletions(-) diff --git a/gir b/gir index 11e59a0b6..7cca8164f 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit 11e59a0b62e276ae4378343ffd84bf6aafa20a3d +Subproject commit 7cca8164f3166ba73ce74f02400cb151b963e2d2 diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-check/src/auto/versions.txt b/gstreamer-check/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-editing-services/src/auto/asset.rs b/gstreamer-editing-services/src/auto/asset.rs index 28cc1bbc1..05623c658 100644 --- a/gstreamer-editing-services/src/auto/asset.rs +++ b/gstreamer-editing-services/src/auto/asset.rs @@ -2,7 +2,7 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -#[cfg(feature = "futures")] +#[cfg(any(feature = "futures", feature = "dox"))] use futures::future; use ges_sys; use gio; @@ -13,6 +13,7 @@ use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; +use glib::value::SetValueOptional; use glib::GString; use glib::Value; use glib_sys; @@ -72,7 +73,7 @@ impl Asset { callback: Q, ) { assert_initialized_main_thread!(); - let user_data: Box = Box::new(callback); + let user_data: Box_ = Box_::new(callback); unsafe extern "C" fn request_async_trampoline< Q: FnOnce(Result) + Send + 'static, >( @@ -87,7 +88,7 @@ impl Asset { } else { Err(from_glib_full(error)) }; - let callback: Box = Box::from_raw(user_data as *mut _); + let callback: Box_ = Box_::from_raw(user_data as *mut _); callback(result); } let callback = request_async_trampoline::; @@ -97,12 +98,12 @@ impl Asset { id.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, Some(callback), - Box::into_raw(user_data) as *mut _, + Box_::into_raw(user_data) as *mut _, ); } } - #[cfg(feature = "futures")] + #[cfg(any(feature = "futures", feature = "dox"))] pub fn request_async_future( extractable_type: glib::types::Type, id: &str, @@ -144,7 +145,7 @@ pub trait AssetExt: 'static { fn unproxy>(&self, proxy: &P) -> Result<(), glib::error::BoolError>; - fn set_property_proxy_target(&self, proxy_target: Option<&Asset>); + fn set_property_proxy_target + SetValueOptional>(&self, proxy_target: Option<&P>); fn connect_property_proxy_notify(&self, f: F) -> SignalHandlerId; @@ -225,7 +226,10 @@ impl> AssetExt for O { } } - fn set_property_proxy_target(&self, proxy_target: Option<&Asset>) { + fn set_property_proxy_target + SetValueOptional>( + &self, + proxy_target: Option<&P>, + ) { unsafe { gobject_sys::g_object_set_property( self.to_glib_none().0 as *mut gobject_sys::GObject, diff --git a/gstreamer-editing-services/src/auto/pipeline.rs b/gstreamer-editing-services/src/auto/pipeline.rs index 2e14c5208..5a6a4525d 100644 --- a/gstreamer-editing-services/src/auto/pipeline.rs +++ b/gstreamer-editing-services/src/auto/pipeline.rs @@ -9,6 +9,7 @@ use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; +use glib::value::SetValueOptional; use glib::StaticType; use glib::Value; use glib_sys; @@ -80,21 +81,33 @@ pub trait GESPipelineExt: 'static { fn get_property_audio_filter(&self) -> Option; - fn set_property_audio_filter(&self, audio_filter: Option<&gst::Element>); + fn set_property_audio_filter + SetValueOptional>( + &self, + audio_filter: Option<&P>, + ); fn get_property_audio_sink(&self) -> Option; - fn set_property_audio_sink(&self, audio_sink: Option<&gst::Element>); + fn set_property_audio_sink + SetValueOptional>( + &self, + audio_sink: Option<&P>, + ); fn get_property_timeline(&self) -> Option; fn get_property_video_filter(&self) -> Option; - fn set_property_video_filter(&self, video_filter: Option<&gst::Element>); + fn set_property_video_filter + SetValueOptional>( + &self, + video_filter: Option<&P>, + ); fn get_property_video_sink(&self) -> Option; - fn set_property_video_sink(&self, video_sink: Option<&gst::Element>); + fn set_property_video_sink + SetValueOptional>( + &self, + video_sink: Option<&P>, + ); fn connect_property_audio_filter_notify(&self, f: F) -> SignalHandlerId; @@ -250,7 +263,10 @@ impl> GESPipelineExt for O { } } - fn set_property_audio_filter(&self, audio_filter: Option<&gst::Element>) { + fn set_property_audio_filter + SetValueOptional>( + &self, + audio_filter: Option<&P>, + ) { unsafe { gobject_sys::g_object_set_property( self.to_glib_none().0 as *mut gobject_sys::GObject, @@ -274,7 +290,10 @@ impl> GESPipelineExt for O { } } - fn set_property_audio_sink(&self, audio_sink: Option<&gst::Element>) { + fn set_property_audio_sink + SetValueOptional>( + &self, + audio_sink: Option<&P>, + ) { unsafe { gobject_sys::g_object_set_property( self.to_glib_none().0 as *mut gobject_sys::GObject, @@ -312,7 +331,10 @@ impl> GESPipelineExt for O { } } - fn set_property_video_filter(&self, video_filter: Option<&gst::Element>) { + fn set_property_video_filter + SetValueOptional>( + &self, + video_filter: Option<&P>, + ) { unsafe { gobject_sys::g_object_set_property( self.to_glib_none().0 as *mut gobject_sys::GObject, @@ -336,7 +358,10 @@ impl> GESPipelineExt for O { } } - fn set_property_video_sink(&self, video_sink: Option<&gst::Element>) { + fn set_property_video_sink + SetValueOptional>( + &self, + video_sink: Option<&P>, + ) { unsafe { gobject_sys::g_object_set_property( self.to_glib_none().0 as *mut gobject_sys::GObject, diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-net/src/auto/net_client_clock.rs b/gstreamer-net/src/auto/net_client_clock.rs index 80807b8fc..a88b748ad 100644 --- a/gstreamer-net/src/auto/net_client_clock.rs +++ b/gstreamer-net/src/auto/net_client_clock.rs @@ -2,10 +2,12 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use glib::object::IsA; use glib::object::ObjectType as ObjectType_; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; +use glib::value::SetValueOptional; use glib::GString; use glib::StaticType; use glib::Value; @@ -76,7 +78,7 @@ impl NetClientClock { } } - pub fn set_property_bus(&self, bus: Option<&gst::Bus>) { + pub fn set_property_bus + SetValueOptional>(&self, bus: Option<&P>) { unsafe { gobject_sys::g_object_set_property( self.as_ptr() as *mut gobject_sys::GObject, diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs b/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs index ef943cc65..d5668e2dd 100644 --- a/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs +++ b/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs @@ -2,10 +2,12 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use glib::object::IsA; use glib::object::ObjectType as ObjectType_; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; +use glib::value::SetValueOptional; use glib::StaticType; use glib::Value; use glib_sys; @@ -87,7 +89,10 @@ impl PlayerVideoOverlayVideoRenderer { } } - pub fn set_property_video_sink(&self, video_sink: Option<&gst::Element>) { + pub fn set_property_video_sink + SetValueOptional>( + &self, + video_sink: Option<&P>, + ) { unsafe { gobject_sys::g_object_set_property( self.as_ptr() as *mut gobject_sys::GObject, diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-rtp/src/auto/versions.txt b/gstreamer-rtp/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs index ed8be25d0..a867d5c11 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs @@ -15,6 +15,7 @@ use glib_sys; #[cfg(any(feature = "v1_12", feature = "dox"))] use gst_rtsp; use gst_rtsp_server_sys; +#[cfg(any(feature = "v1_16", feature = "dox"))] use std; use std::boxed::Box as Box_; use std::mem::transmute; diff --git a/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs b/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs index eb79799d3..cf1654fbf 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs @@ -178,7 +178,7 @@ impl> RTSPStreamTransportExt for O { //} fn set_keepalive(&self, keep_alive: P) { - let keep_alive_data: Box_

= Box::new(keep_alive); + let keep_alive_data: Box_

= Box_::new(keep_alive); unsafe extern "C" fn keep_alive_func(user_data: glib_sys::gpointer) { let callback: &P = &*(user_data as *mut _); (*callback)(); @@ -193,7 +193,7 @@ impl> RTSPStreamTransportExt for O { gst_rtsp_server_sys::gst_rtsp_stream_transport_set_keepalive( self.as_ref().to_glib_none().0, keep_alive, - Box::into_raw(super_callback0) as *mut _, + Box_::into_raw(super_callback0) as *mut _, destroy_call3, ); } @@ -205,7 +205,7 @@ impl> RTSPStreamTransportExt for O { //} fn set_message_sent(&self, message_sent: P) { - let message_sent_data: Box_

= Box::new(message_sent); + let message_sent_data: Box_

= Box_::new(message_sent); unsafe extern "C" fn message_sent_func(user_data: glib_sys::gpointer) { let callback: &P = &*(user_data as *mut _); (*callback)(); @@ -220,7 +220,7 @@ impl> RTSPStreamTransportExt for O { gst_rtsp_server_sys::gst_rtsp_stream_transport_set_message_sent( self.as_ref().to_glib_none().0, message_sent, - Box::into_raw(super_callback0) as *mut _, + Box_::into_raw(super_callback0) as *mut _, destroy_call3, ); } diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt index cd893e88b..e0014783a 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 @ 11e59a0) +Generated by gir (https://github.com/gtk-rs/gir @ 7cca816) from gir-files (https://github.com/gtk-rs/gir-files @ ???)