From 47102b0e762cbd17139ef6918b02f7d717144808 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Tue, 1 Dec 2020 20:22:33 +0100 Subject: [PATCH] Regenerate with fresh gir files --- gstreamer-base/src/auto/aggregator.rs | 4 ++-- gstreamer-base/src/auto/base_src.rs | 4 ++-- gstreamer-base/src/auto/base_transform.rs | 4 ++-- gstreamer-player/src/auto/player.rs | 2 +- gstreamer-video/sys/src/lib.rs | 6 +++--- gstreamer/src/auto/date_time.rs | 10 +++++----- gstreamer/src/auto/pad_template.rs | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gstreamer-base/src/auto/aggregator.rs b/gstreamer-base/src/auto/aggregator.rs index 4b5dbb0e1..243005950 100644 --- a/gstreamer-base/src/auto/aggregator.rs +++ b/gstreamer-base/src/auto/aggregator.rs @@ -33,7 +33,7 @@ pub const NONE_AGGREGATOR: Option<&Aggregator> = None; pub trait AggregatorExt: 'static { //#[cfg(any(feature = "v1_14", feature = "dox"))] //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] - //fn get_allocator(&self, allocator: /*Ignored*/gst::Allocator, params: /*Ignored*/gst::AllocationParams); + //fn get_allocator(&self, allocator: /*Ignored*/Option, params: /*Ignored*/gst::AllocationParams); #[cfg(any(feature = "v1_14", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] @@ -121,7 +121,7 @@ pub trait AggregatorExt: 'static { impl> AggregatorExt for O { //#[cfg(any(feature = "v1_14", feature = "dox"))] //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] - //fn get_allocator(&self, allocator: /*Ignored*/gst::Allocator, params: /*Ignored*/gst::AllocationParams) { + //fn get_allocator(&self, allocator: /*Ignored*/Option, params: /*Ignored*/gst::AllocationParams) { // unsafe { TODO: call ffi:gst_aggregator_get_allocator() } //} diff --git a/gstreamer-base/src/auto/base_src.rs b/gstreamer-base/src/auto/base_src.rs index d0dd3ceed..1ff8f64e5 100644 --- a/gstreamer-base/src/auto/base_src.rs +++ b/gstreamer-base/src/auto/base_src.rs @@ -25,7 +25,7 @@ unsafe impl Sync for BaseSrc {} pub const NONE_BASE_SRC: Option<&BaseSrc> = None; pub trait BaseSrcExt: 'static { - //fn get_allocator(&self, allocator: /*Ignored*/gst::Allocator, params: /*Ignored*/gst::AllocationParams); + //fn get_allocator(&self, allocator: /*Ignored*/Option, params: /*Ignored*/gst::AllocationParams); fn get_blocksize(&self) -> u32; @@ -90,7 +90,7 @@ pub trait BaseSrcExt: 'static { } impl> BaseSrcExt for O { - //fn get_allocator(&self, allocator: /*Ignored*/gst::Allocator, params: /*Ignored*/gst::AllocationParams) { + //fn get_allocator(&self, allocator: /*Ignored*/Option, params: /*Ignored*/gst::AllocationParams) { // unsafe { TODO: call ffi:gst_base_src_get_allocator() } //} diff --git a/gstreamer-base/src/auto/base_transform.rs b/gstreamer-base/src/auto/base_transform.rs index 22bf0d58f..9f81f6c07 100644 --- a/gstreamer-base/src/auto/base_transform.rs +++ b/gstreamer-base/src/auto/base_transform.rs @@ -25,7 +25,7 @@ unsafe impl Sync for BaseTransform {} pub const NONE_BASE_TRANSFORM: Option<&BaseTransform> = None; pub trait BaseTransformExt: 'static { - //fn get_allocator(&self, allocator: /*Ignored*/gst::Allocator, params: /*Ignored*/gst::AllocationParams); + //fn get_allocator(&self, allocator: /*Ignored*/Option, params: /*Ignored*/gst::AllocationParams); fn get_buffer_pool(&self) -> Option; @@ -68,7 +68,7 @@ pub trait BaseTransformExt: 'static { } impl> BaseTransformExt for O { - //fn get_allocator(&self, allocator: /*Ignored*/gst::Allocator, params: /*Ignored*/gst::AllocationParams) { + //fn get_allocator(&self, allocator: /*Ignored*/Option, params: /*Ignored*/gst::AllocationParams) { // unsafe { TODO: call ffi:gst_base_transform_get_allocator() } //} diff --git a/gstreamer-player/src/auto/player.rs b/gstreamer-player/src/auto/player.rs index 8b48fbd26..169caf487 100644 --- a/gstreamer-player/src/auto/player.rs +++ b/gstreamer-player/src/auto/player.rs @@ -45,7 +45,7 @@ impl Player { pub fn get_current_subtitle_track(&self) -> Option { unsafe { - from_glib_none(ffi::gst_player_get_current_subtitle_track( + from_glib_full(ffi::gst_player_get_current_subtitle_track( self.to_glib_none().0, )) } diff --git a/gstreamer-video/sys/src/lib.rs b/gstreamer-video/sys/src/lib.rs index f2fff5d59..2e5278a90 100644 --- a/gstreamer-video/sys/src/lib.rs +++ b/gstreamer-video/sys/src/lib.rs @@ -2866,13 +2866,13 @@ extern "C" { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] pub fn gst_video_meta_get_plane_height( meta: *mut GstVideoMeta, - plane_height: *mut c_uint, + plane_height: *mut [c_uint; 4], ) -> gboolean; #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] pub fn gst_video_meta_get_plane_size( meta: *mut GstVideoMeta, - plane_size: *mut size_t, + plane_size: *mut [size_t; 4], ) -> gboolean; pub fn gst_video_meta_map( meta: *mut GstVideoMeta, @@ -3461,7 +3461,7 @@ extern "C" { pub fn gst_video_decoder_set_interlaced_output_state( decoder: *mut GstVideoDecoder, fmt: GstVideoFormat, - mode: GstVideoInterlaceMode, + interlace_mode: GstVideoInterlaceMode, width: c_uint, height: c_uint, reference: *mut GstVideoCodecState, diff --git a/gstreamer/src/auto/date_time.rs b/gstreamer/src/auto/date_time.rs index 4875b7d30..7a4cdb704 100644 --- a/gstreamer/src/auto/date_time.rs +++ b/gstreamer/src/auto/date_time.rs @@ -52,14 +52,14 @@ impl DateTime { } } - pub fn from_unix_epoch_local_time(secs: i64) -> DateTime { + pub fn from_unix_epoch_local_time(secs: i64) -> Option { assert_initialized_main_thread!(); unsafe { from_glib_full(ffi::gst_date_time_new_from_unix_epoch_local_time(secs)) } } #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] - pub fn from_unix_epoch_local_time_usecs(usecs: i64) -> DateTime { + pub fn from_unix_epoch_local_time_usecs(usecs: i64) -> Option { assert_initialized_main_thread!(); unsafe { from_glib_full(ffi::gst_date_time_new_from_unix_epoch_local_time_usecs( @@ -68,14 +68,14 @@ impl DateTime { } } - pub fn from_unix_epoch_utc(secs: i64) -> DateTime { + pub fn from_unix_epoch_utc(secs: i64) -> Option { assert_initialized_main_thread!(); unsafe { from_glib_full(ffi::gst_date_time_new_from_unix_epoch_utc(secs)) } } #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] - pub fn from_unix_epoch_utc_usecs(usecs: i64) -> DateTime { + pub fn from_unix_epoch_utc_usecs(usecs: i64) -> Option { assert_initialized_main_thread!(); unsafe { from_glib_full(ffi::gst_date_time_new_from_unix_epoch_utc_usecs(usecs)) } } @@ -87,7 +87,7 @@ impl DateTime { hour: i32, minute: i32, seconds: f64, - ) -> DateTime { + ) -> Option { assert_initialized_main_thread!(); unsafe { from_glib_full(ffi::gst_date_time_new_local_time( diff --git a/gstreamer/src/auto/pad_template.rs b/gstreamer/src/auto/pad_template.rs index fa5cf2bbf..979526256 100644 --- a/gstreamer/src/auto/pad_template.rs +++ b/gstreamer/src/auto/pad_template.rs @@ -91,7 +91,7 @@ impl PadTemplate { unsafe { ffi::gst_pad_template_set_documentation_caps( self.to_glib_none().0, - caps.to_glib_none().0, + caps.to_glib_full(), ); } }