From 6fac36a355ebd88a8b5f80133ab775e5711b6959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 4 Oct 2019 19:21:53 +0300 Subject: [PATCH] Regenerate everything with new gir-files --- gstreamer-editing-services-sys/src/lib.rs | 6 +++++- gstreamer-editing-services-sys/tests/abi.rs | 2 +- gstreamer-gl-sys/src/lib.rs | 4 ++-- gstreamer-sys/src/lib.rs | 2 +- gstreamer-sys/tests/abi.rs | 2 +- gstreamer-video-sys/src/lib.rs | 3 ++- gstreamer-video-sys/tests/abi.rs | 1 + 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/gstreamer-editing-services-sys/src/lib.rs b/gstreamer-editing-services-sys/src/lib.rs index e2773b421..9cb66b0f7 100644 --- a/gstreamer-editing-services-sys/src/lib.rs +++ b/gstreamer-editing-services-sys/src/lib.rs @@ -183,7 +183,7 @@ pub const GES_PADDING: c_int = 4; pub const GES_PADDING_LARGE: c_int = 20; pub const GES_TIMELINE_ELEMENT_NO_LAYER_PRIORITY: u32 = 4294967295; pub const GES_VERSION_MAJOR: c_int = 1; -pub const GES_VERSION_MICRO: c_int = 0; +pub const GES_VERSION_MICRO: c_int = 1; pub const GES_VERSION_MINOR: c_int = 16; pub const GES_VERSION_NANO: c_int = 0; @@ -2998,6 +2998,7 @@ extern "C" { uri: *const c_char, error: *mut *mut glib::GError, ) -> gboolean; + #[cfg(any(feature = "v1_16", feature = "dox"))] pub fn ges_timeline_move_layer( timeline: *mut GESTimeline, layer: *mut GESLayer, @@ -3055,6 +3056,7 @@ extern "C" { //pub fn ges_timeline_element_get_child_property_valist(self_: *mut GESTimelineElement, first_property_name: *const c_char, var_args: /*Unimplemented*/va_list); pub fn ges_timeline_element_get_duration(self_: *mut GESTimelineElement) -> gst::GstClockTime; pub fn ges_timeline_element_get_inpoint(self_: *mut GESTimelineElement) -> gst::GstClockTime; + #[cfg(any(feature = "v1_16", feature = "dox"))] pub fn ges_timeline_element_get_layer_priority(self_: *mut GESTimelineElement) -> u32; pub fn ges_timeline_element_get_max_duration( self_: *mut GESTimelineElement, @@ -3351,6 +3353,7 @@ extern "C" { // GESUriClipAsset //========================================================================= pub fn ges_uri_clip_asset_get_type() -> GType; + #[cfg(any(feature = "v1_16", feature = "dox"))] pub fn ges_uri_clip_asset_finish( res: *mut gio::GAsyncResult, error: *mut *mut glib::GError, @@ -3649,6 +3652,7 @@ extern "C" { error: *mut *mut glib::GError, ) -> gboolean; pub fn ges_init_get_option_group() -> *mut glib::GOptionGroup; + #[cfg(any(feature = "v1_16", feature = "dox"))] pub fn ges_is_initialized() -> gboolean; pub fn ges_list_assets(filter: GType) -> *mut glib::GList; pub fn ges_play_sink_convert_frame( diff --git a/gstreamer-editing-services-sys/tests/abi.rs b/gstreamer-editing-services-sys/tests/abi.rs index 36df068fc..3edba3207 100644 --- a/gstreamer-editing-services-sys/tests/abi.rs +++ b/gstreamer-editing-services-sys/tests/abi.rs @@ -1117,7 +1117,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(guint) GES_TRACK_TYPE_UNKNOWN", "1"), ("(guint) GES_TRACK_TYPE_VIDEO", "4"), ("GES_VERSION_MAJOR", "1"), - ("GES_VERSION_MICRO", "0"), + ("GES_VERSION_MICRO", "1"), ("GES_VERSION_MINOR", "16"), ("GES_VERSION_NANO", "0"), ( diff --git a/gstreamer-gl-sys/src/lib.rs b/gstreamer-gl-sys/src/lib.rs index 3d9215668..3f024b996 100644 --- a/gstreamer-gl-sys/src/lib.rs +++ b/gstreamer-gl-sys/src/lib.rs @@ -1251,7 +1251,7 @@ pub struct GstGLDisplayWayland { pub registry: gpointer, pub compositor: gpointer, pub subcompositor: gpointer, - pub wl_shell: gpointer, + pub shell: gpointer, pub foreign_display: gboolean, pub _padding: [gpointer; 4], } @@ -1265,7 +1265,7 @@ impl ::std::fmt::Debug for GstGLDisplayWayland { .field("registry", &self.registry) .field("compositor", &self.compositor) .field("subcompositor", &self.subcompositor) - .field("wl_shell", &self.wl_shell) + .field("shell", &self.shell) .finish() } } diff --git a/gstreamer-sys/src/lib.rs b/gstreamer-sys/src/lib.rs index afb61464f..7e7baf91b 100644 --- a/gstreamer-sys/src/lib.rs +++ b/gstreamer-sys/src/lib.rs @@ -810,7 +810,7 @@ pub const GST_MESSAGE_PROPERTY_NOTIFY: GstMessageType = 2147483651; pub const GST_MESSAGE_STREAM_COLLECTION: GstMessageType = 2147483652; pub const GST_MESSAGE_STREAMS_SELECTED: GstMessageType = 2147483653; pub const GST_MESSAGE_REDIRECT: GstMessageType = 2147483654; -pub const GST_MESSAGE_DEVICE_CHANGED: GstMessageType = 2147483654; +pub const GST_MESSAGE_DEVICE_CHANGED: GstMessageType = 2147483655; pub const GST_MESSAGE_ANY: GstMessageType = 4294967295; pub type GstMetaFlags = c_uint; diff --git a/gstreamer-sys/tests/abi.rs b/gstreamer-sys/tests/abi.rs index 73aa67d79..cbeac91d8 100644 --- a/gstreamer-sys/tests/abi.rs +++ b/gstreamer-sys/tests/abi.rs @@ -1752,7 +1752,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(guint) GST_MESSAGE_CLOCK_LOST", "1024"), ("(guint) GST_MESSAGE_CLOCK_PROVIDE", "512"), ("(guint) GST_MESSAGE_DEVICE_ADDED", "2147483649"), - ("(guint) GST_MESSAGE_DEVICE_CHANGED", "2147483654"), + ("(guint) GST_MESSAGE_DEVICE_CHANGED", "2147483655"), ("(guint) GST_MESSAGE_DEVICE_REMOVED", "2147483650"), ("(guint) GST_MESSAGE_DURATION_CHANGED", "262144"), ("(guint) GST_MESSAGE_ELEMENT", "32768"), diff --git a/gstreamer-video-sys/src/lib.rs b/gstreamer-video-sys/src/lib.rs index e3c2b8729..2cf05a648 100644 --- a/gstreamer-video-sys/src/lib.rs +++ b/gstreamer-video-sys/src/lib.rs @@ -89,6 +89,7 @@ pub const GST_VIDEO_ANCILLARY_DID_HANC_SDTV_AUDIO_DATA_2_LAST: GstVideoAncillary pub type GstVideoAncillaryDID16 = c_int; pub const GST_VIDEO_ANCILLARY_DID16_S334_EIA_708: GstVideoAncillaryDID16 = 24833; pub const GST_VIDEO_ANCILLARY_DID16_S334_EIA_608: GstVideoAncillaryDID16 = 24834; +pub const GST_VIDEO_ANCILLARY_DID16_S2016_3_AFD_BAR: GstVideoAncillaryDID16 = 16645; pub type GstVideoCaptionType = c_int; pub const GST_VIDEO_CAPTION_TYPE_UNKNOWN: GstVideoCaptionType = 0; @@ -2352,7 +2353,7 @@ extern "C" { #[cfg(any(feature = "v1_8", feature = "dox"))] pub fn gst_video_affine_transformation_meta_apply_matrix( meta: *mut GstVideoAffineTransformationMeta, - matrix: *const c_float, + matrix: *const [c_float; 16], ); pub fn gst_video_affine_transformation_meta_get_info() -> *const gst::GstMetaInfo; diff --git a/gstreamer-video-sys/tests/abi.rs b/gstreamer-video-sys/tests/abi.rs index 4537eea0a..420b1ff9c 100644 --- a/gstreamer-video-sys/tests/abi.rs +++ b/gstreamer-video-sys/tests/abi.rs @@ -940,6 +940,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(gint) GST_VIDEO_ALPHA_MODE_COPY", "0"), ("(gint) GST_VIDEO_ALPHA_MODE_MULT", "2"), ("(gint) GST_VIDEO_ALPHA_MODE_SET", "1"), + ("(gint) GST_VIDEO_ANCILLARY_DID16_S2016_3_AFD_BAR", "16645"), ("(gint) GST_VIDEO_ANCILLARY_DID16_S334_EIA_608", "24834"), ("(gint) GST_VIDEO_ANCILLARY_DID16_S334_EIA_708", "24833"), ("(gint) GST_VIDEO_ANCILLARY_DID_CAMERA_POSITION", "240"),