diff --git a/gstreamer-allocators/src/auto/versions.txt b/gstreamer-allocators/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-allocators/src/auto/versions.txt +++ b/gstreamer-allocators/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-allocators/sys/Cargo.toml b/gstreamer-allocators/sys/Cargo.toml index f9f4936b7..0c78565e4 100644 --- a/gstreamer-allocators/sys/Cargo.toml +++ b/gstreamer-allocators/sys/Cargo.toml @@ -21,7 +21,7 @@ shell-words = "1.0.0" tempfile = "3" [features] -dox = [] +dox = ["glib/dox", "gobject/dox", "gst/dox"] v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] diff --git a/gstreamer-allocators/sys/build.rs b/gstreamer-allocators/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-allocators/sys/build.rs +++ b/gstreamer-allocators/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-allocators/sys/src/auto/versions.txt b/gstreamer-allocators/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-allocators/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-allocators/sys/src/lib.rs b/gstreamer-allocators/sys/src/lib.rs index df3b09898..5c05aac2d 100644 --- a/gstreamer-allocators/sys/src/lib.rs +++ b/gstreamer-allocators/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-allocators/sys/tests/abi.rs b/gstreamer-allocators/sys/tests/abi.rs index 2e02fa8db..e5c155a7a 100644 --- a/gstreamer-allocators/sys/tests/abi.rs +++ b/gstreamer-allocators/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_allocators_sys::*; diff --git a/gstreamer-allocators/sys/tests/constant.c b/gstreamer-allocators/sys/tests/constant.c index ddc05bc66..ae1ebc6d0 100644 --- a/gstreamer-allocators/sys/tests/constant.c +++ b/gstreamer-allocators/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-allocators/sys/tests/layout.c b/gstreamer-allocators/sys/tests/layout.c index 25b4803a3..ce13b5c4d 100644 --- a/gstreamer-allocators/sys/tests/layout.c +++ b/gstreamer-allocators/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-app/src/auto/versions.txt +++ b/gstreamer-app/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-app/sys/Cargo.toml b/gstreamer-app/sys/Cargo.toml index 7e3e1b0ef..f0ac4b5e1 100644 --- a/gstreamer-app/sys/Cargo.toml +++ b/gstreamer-app/sys/Cargo.toml @@ -25,7 +25,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gst/dox", "gst_base/dox"] [lib] name = "gstreamer_app_sys" diff --git a/gstreamer-app/sys/build.rs b/gstreamer-app/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-app/sys/build.rs +++ b/gstreamer-app/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-app/sys/src/auto/versions.txt b/gstreamer-app/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-app/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-app/sys/src/lib.rs b/gstreamer-app/sys/src/lib.rs index 1bbfa6536..fccaabfba 100644 --- a/gstreamer-app/sys/src/lib.rs +++ b/gstreamer-app/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-app/sys/tests/abi.rs b/gstreamer-app/sys/tests/abi.rs index 1cf7be2b9..1173ded24 100644 --- a/gstreamer-app/sys/tests/abi.rs +++ b/gstreamer-app/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_app_sys::*; diff --git a/gstreamer-app/sys/tests/constant.c b/gstreamer-app/sys/tests/constant.c index 2488277d4..982918826 100644 --- a/gstreamer-app/sys/tests/constant.c +++ b/gstreamer-app/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-app/sys/tests/layout.c b/gstreamer-app/sys/tests/layout.c index 2c6c6a8b4..547058742 100644 --- a/gstreamer-app/sys/tests/layout.c +++ b/gstreamer-app/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-audio/src/auto/audio_decoder.rs b/gstreamer-audio/src/auto/audio_decoder.rs index 5e41b6fa3..33c8aa962 100644 --- a/gstreamer-audio/src/auto/audio_decoder.rs +++ b/gstreamer-audio/src/auto/audio_decoder.rs @@ -31,11 +31,11 @@ unsafe impl Sync for AudioDecoder {} pub trait AudioDecoderExt: 'static { #[doc(alias = "gst_audio_decoder_allocate_output_buffer")] - fn allocate_output_buffer(&self, size: usize) -> Result; + fn allocate_output_buffer(&self, size: usize) -> gst::Buffer; #[doc(alias = "gst_audio_decoder_get_audio_info")] #[doc(alias = "get_audio_info")] - fn audio_info(&self) -> Option; + fn audio_info(&self) -> AudioInfo; #[doc(alias = "gst_audio_decoder_get_delay")] #[doc(alias = "get_delay")] @@ -145,17 +145,16 @@ pub trait AudioDecoderExt: 'static { } impl> AudioDecoderExt for O { - fn allocate_output_buffer(&self, size: usize) -> Result { + fn allocate_output_buffer(&self, size: usize) -> gst::Buffer { unsafe { - Option::<_>::from_glib_full(ffi::gst_audio_decoder_allocate_output_buffer( + from_glib_full(ffi::gst_audio_decoder_allocate_output_buffer( self.as_ref().to_glib_none().0, size, )) - .ok_or_else(|| glib::bool_error!("Failed to allocate output buffer")) } } - fn audio_info(&self) -> Option { + fn audio_info(&self) -> AudioInfo { unsafe { from_glib_none(ffi::gst_audio_decoder_get_audio_info( self.as_ref().to_glib_none().0, diff --git a/gstreamer-audio/src/auto/audio_encoder.rs b/gstreamer-audio/src/auto/audio_encoder.rs index 382db74ed..71df8d6b2 100644 --- a/gstreamer-audio/src/auto/audio_encoder.rs +++ b/gstreamer-audio/src/auto/audio_encoder.rs @@ -31,11 +31,11 @@ unsafe impl Sync for AudioEncoder {} pub trait AudioEncoderExt: 'static { #[doc(alias = "gst_audio_encoder_allocate_output_buffer")] - fn allocate_output_buffer(&self, size: usize) -> Result; + fn allocate_output_buffer(&self, size: usize) -> gst::Buffer; #[doc(alias = "gst_audio_encoder_get_audio_info")] #[doc(alias = "get_audio_info")] - fn audio_info(&self) -> Option; + fn audio_info(&self) -> AudioInfo; #[doc(alias = "gst_audio_encoder_get_drainable")] #[doc(alias = "get_drainable")] @@ -152,17 +152,16 @@ pub trait AudioEncoderExt: 'static { } impl> AudioEncoderExt for O { - fn allocate_output_buffer(&self, size: usize) -> Result { + fn allocate_output_buffer(&self, size: usize) -> gst::Buffer { unsafe { - Option::<_>::from_glib_full(ffi::gst_audio_encoder_allocate_output_buffer( + from_glib_full(ffi::gst_audio_encoder_allocate_output_buffer( self.as_ref().to_glib_none().0, size, )) - .ok_or_else(|| glib::bool_error!("Failed to allocate output buffer")) } } - fn audio_info(&self) -> Option { + fn audio_info(&self) -> AudioInfo { unsafe { from_glib_none(ffi::gst_audio_encoder_get_audio_info( self.as_ref().to_glib_none().0, diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-audio/src/auto/versions.txt +++ b/gstreamer-audio/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-audio/sys/Cargo.toml b/gstreamer-audio/sys/Cargo.toml index 6d20bea57..ed9f6b941 100644 --- a/gstreamer-audio/sys/Cargo.toml +++ b/gstreamer-audio/sys/Cargo.toml @@ -29,7 +29,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gst/dox", "gst_base/dox"] [lib] name = "gstreamer_audio_sys" diff --git a/gstreamer-audio/sys/build.rs b/gstreamer-audio/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-audio/sys/build.rs +++ b/gstreamer-audio/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-audio/sys/src/auto/versions.txt b/gstreamer-audio/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-audio/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-audio/sys/src/lib.rs b/gstreamer-audio/sys/src/lib.rs index 803bf9358..f416ea2c0 100644 --- a/gstreamer-audio/sys/src/lib.rs +++ b/gstreamer-audio/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-audio/sys/tests/abi.rs b/gstreamer-audio/sys/tests/abi.rs index 07b6bc43c..b4fd8fcbf 100644 --- a/gstreamer-audio/sys/tests/abi.rs +++ b/gstreamer-audio/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_audio_sys::*; diff --git a/gstreamer-audio/sys/tests/constant.c b/gstreamer-audio/sys/tests/constant.c index 413cecaca..41b5d6d8a 100644 --- a/gstreamer-audio/sys/tests/constant.c +++ b/gstreamer-audio/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-audio/sys/tests/layout.c b/gstreamer-audio/sys/tests/layout.c index acd50657d..5de514d03 100644 --- a/gstreamer-audio/sys/tests/layout.c +++ b/gstreamer-audio/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-base/src/auto/versions.txt +++ b/gstreamer-base/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-base/sys/Cargo.toml b/gstreamer-base/sys/Cargo.toml index 1ec8f8187..7dd3b7ef1 100644 --- a/gstreamer-base/sys/Cargo.toml +++ b/gstreamer-base/sys/Cargo.toml @@ -27,7 +27,7 @@ v1_16 = ["v1_14_3"] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gst/dox"] [lib] name = "gstreamer_base_sys" diff --git a/gstreamer-base/sys/build.rs b/gstreamer-base/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-base/sys/build.rs +++ b/gstreamer-base/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-base/sys/src/auto/versions.txt b/gstreamer-base/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-base/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-base/sys/src/lib.rs b/gstreamer-base/sys/src/lib.rs index 19200375b..32e97df04 100644 --- a/gstreamer-base/sys/src/lib.rs +++ b/gstreamer-base/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-base/sys/tests/abi.rs b/gstreamer-base/sys/tests/abi.rs index 92de4e064..0eb5c031a 100644 --- a/gstreamer-base/sys/tests/abi.rs +++ b/gstreamer-base/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_base_sys::*; diff --git a/gstreamer-base/sys/tests/constant.c b/gstreamer-base/sys/tests/constant.c index 0e63e45dc..bfb2a7d6f 100644 --- a/gstreamer-base/sys/tests/constant.c +++ b/gstreamer-base/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-base/sys/tests/layout.c b/gstreamer-base/sys/tests/layout.c index 87cd550ef..406c900c8 100644 --- a/gstreamer-base/sys/tests/layout.c +++ b/gstreamer-base/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-check/src/auto/versions.txt b/gstreamer-check/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-check/src/auto/versions.txt +++ b/gstreamer-check/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-check/sys/Cargo.toml b/gstreamer-check/sys/Cargo.toml index 6b8b12d1a..508646196 100644 --- a/gstreamer-check/sys/Cargo.toml +++ b/gstreamer-check/sys/Cargo.toml @@ -25,7 +25,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gst/dox"] [lib] name = "gstreamer_check_sys" diff --git a/gstreamer-check/sys/build.rs b/gstreamer-check/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-check/sys/build.rs +++ b/gstreamer-check/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-check/sys/src/auto/versions.txt b/gstreamer-check/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-check/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-check/sys/src/lib.rs b/gstreamer-check/sys/src/lib.rs index 24040e2c4..a93fe4b26 100644 --- a/gstreamer-check/sys/src/lib.rs +++ b/gstreamer-check/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-check/sys/tests/abi.rs b/gstreamer-check/sys/tests/abi.rs index 5d8f6f197..7c63d4a53 100644 --- a/gstreamer-check/sys/tests/abi.rs +++ b/gstreamer-check/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_check_sys::*; diff --git a/gstreamer-check/sys/tests/constant.c b/gstreamer-check/sys/tests/constant.c index 91dd07916..d37bc26f5 100644 --- a/gstreamer-check/sys/tests/constant.c +++ b/gstreamer-check/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-check/sys/tests/layout.c b/gstreamer-check/sys/tests/layout.c index d526d83c9..604df5879 100644 --- a/gstreamer-check/sys/tests/layout.c +++ b/gstreamer-check/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-controller/src/auto/versions.txt b/gstreamer-controller/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-controller/src/auto/versions.txt +++ b/gstreamer-controller/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-controller/sys/Cargo.toml b/gstreamer-controller/sys/Cargo.toml index b8dd6b5bb..c681acae8 100644 --- a/gstreamer-controller/sys/Cargo.toml +++ b/gstreamer-controller/sys/Cargo.toml @@ -26,7 +26,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gst/dox"] [lib] name = "gstreamer_controller_sys" diff --git a/gstreamer-controller/sys/build.rs b/gstreamer-controller/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-controller/sys/build.rs +++ b/gstreamer-controller/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-controller/sys/src/auto/versions.txt b/gstreamer-controller/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-controller/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-controller/sys/src/lib.rs b/gstreamer-controller/sys/src/lib.rs index 9a1f67585..89f509d17 100644 --- a/gstreamer-controller/sys/src/lib.rs +++ b/gstreamer-controller/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-controller/sys/tests/abi.rs b/gstreamer-controller/sys/tests/abi.rs index 27e0cae69..d14cf3e99 100644 --- a/gstreamer-controller/sys/tests/abi.rs +++ b/gstreamer-controller/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_controller_sys::*; diff --git a/gstreamer-controller/sys/tests/constant.c b/gstreamer-controller/sys/tests/constant.c index 80642e6e0..49fa3a087 100644 --- a/gstreamer-controller/sys/tests/constant.c +++ b/gstreamer-controller/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-controller/sys/tests/layout.c b/gstreamer-controller/sys/tests/layout.c index e71010a9e..368eb5765 100644 --- a/gstreamer-controller/sys/tests/layout.c +++ b/gstreamer-controller/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-editing-services/src/auto/asset.rs b/gstreamer-editing-services/src/auto/asset.rs index de6b96f45..64060c4a5 100644 --- a/gstreamer-editing-services/src/auto/asset.rs +++ b/gstreamer-editing-services/src/auto/asset.rs @@ -144,7 +144,7 @@ pub trait AssetExt: 'static { #[doc(alias = "ges_asset_get_id")] #[doc(alias = "get_id")] - fn id(&self) -> Option; + fn id(&self) -> glib::GString; #[doc(alias = "ges_asset_get_proxy")] #[doc(alias = "get_proxy")] @@ -197,7 +197,7 @@ impl> AssetExt for O { } } - fn id(&self) -> Option { + fn id(&self) -> glib::GString { unsafe { from_glib_none(ffi::ges_asset_get_id(self.as_ref().to_glib_none().0)) } } diff --git a/gstreamer-editing-services/src/auto/extractable.rs b/gstreamer-editing-services/src/auto/extractable.rs index a6011f614..5f0c71ccc 100644 --- a/gstreamer-editing-services/src/auto/extractable.rs +++ b/gstreamer-editing-services/src/auto/extractable.rs @@ -27,7 +27,7 @@ pub trait ExtractableExt: 'static { #[doc(alias = "ges_extractable_get_id")] #[doc(alias = "get_id")] - fn id(&self) -> Option; + fn id(&self) -> glib::GString; #[doc(alias = "ges_extractable_set_asset")] fn set_asset(&self, asset: &impl IsA) -> Result<(), glib::error::BoolError>; @@ -42,7 +42,7 @@ impl> ExtractableExt for O { } } - fn id(&self) -> Option { + fn id(&self) -> glib::GString { unsafe { from_glib_full(ffi::ges_extractable_get_id(self.as_ref().to_glib_none().0)) } } diff --git a/gstreamer-editing-services/src/auto/formatter.rs b/gstreamer-editing-services/src/auto/formatter.rs index d3c3d5ae7..163dd6764 100644 --- a/gstreamer-editing-services/src/auto/formatter.rs +++ b/gstreamer-editing-services/src/auto/formatter.rs @@ -54,7 +54,7 @@ impl Formatter { #[doc(alias = "ges_formatter_get_default")] #[doc(alias = "get_default")] - pub fn default() -> Option { + pub fn default() -> Asset { assert_initialized_main_thread!(); unsafe { from_glib_none(ffi::ges_formatter_get_default()) } } diff --git a/gstreamer-editing-services/src/auto/marker_list.rs b/gstreamer-editing-services/src/auto/marker_list.rs index e2a7d3df8..d7155a910 100644 --- a/gstreamer-editing-services/src/auto/marker_list.rs +++ b/gstreamer-editing-services/src/auto/marker_list.rs @@ -37,7 +37,7 @@ impl MarkerList { } #[doc(alias = "ges_marker_list_add")] - pub fn add(&self, position: impl Into>) -> Option { + pub fn add(&self, position: impl Into>) -> Marker { unsafe { from_glib_none(ffi::ges_marker_list_add( self.to_glib_none().0, diff --git a/gstreamer-editing-services/src/auto/meta_container.rs b/gstreamer-editing-services/src/auto/meta_container.rs index d19c190cb..127b5116c 100644 --- a/gstreamer-editing-services/src/auto/meta_container.rs +++ b/gstreamer-editing-services/src/auto/meta_container.rs @@ -91,7 +91,7 @@ pub trait MetaContainerExt: 'static { fn uint64(&self, meta_item: &str) -> Option; #[doc(alias = "ges_meta_container_metas_to_string")] - fn metas_to_string(&self) -> Option; + fn metas_to_string(&self) -> glib::GString; #[doc(alias = "ges_meta_container_register_meta")] fn register_meta(&self, flags: MetaFlag, meta_item: &str, value: &glib::Value) -> bool; @@ -416,7 +416,7 @@ impl> MetaContainerExt for O { } } - fn metas_to_string(&self) -> Option { + fn metas_to_string(&self) -> glib::GString { unsafe { from_glib_full(ffi::ges_meta_container_metas_to_string( self.as_ref().to_glib_none().0, diff --git a/gstreamer-editing-services/src/auto/pipeline.rs b/gstreamer-editing-services/src/auto/pipeline.rs index c737aa1d2..68690f8ff 100644 --- a/gstreamer-editing-services/src/auto/pipeline.rs +++ b/gstreamer-editing-services/src/auto/pipeline.rs @@ -61,10 +61,10 @@ pub trait GESPipelineExt: 'static { fn preview_get_video_sink(&self) -> Option; #[doc(alias = "ges_pipeline_preview_set_audio_sink")] - fn preview_set_audio_sink(&self, sink: &impl IsA); + fn preview_set_audio_sink(&self, sink: Option<&impl IsA>); #[doc(alias = "ges_pipeline_preview_set_video_sink")] - fn preview_set_video_sink(&self, sink: &impl IsA); + fn preview_set_video_sink(&self, sink: Option<&impl IsA>); #[doc(alias = "ges_pipeline_save_thumbnail")] fn save_thumbnail( @@ -173,20 +173,20 @@ impl> GESPipelineExt for O { } } - fn preview_set_audio_sink(&self, sink: &impl IsA) { + fn preview_set_audio_sink(&self, sink: Option<&impl IsA>) { unsafe { ffi::ges_pipeline_preview_set_audio_sink( self.as_ref().to_glib_none().0, - sink.as_ref().to_glib_none().0, + sink.map(|p| p.as_ref()).to_glib_none().0, ); } } - fn preview_set_video_sink(&self, sink: &impl IsA) { + fn preview_set_video_sink(&self, sink: Option<&impl IsA>) { unsafe { ffi::ges_pipeline_preview_set_video_sink( self.as_ref().to_glib_none().0, - sink.as_ref().to_glib_none().0, + sink.map(|p| p.as_ref()).to_glib_none().0, ); } } diff --git a/gstreamer-editing-services/src/auto/text_overlay.rs b/gstreamer-editing-services/src/auto/text_overlay.rs index 5e5f2bcc9..14b512a21 100644 --- a/gstreamer-editing-services/src/auto/text_overlay.rs +++ b/gstreamer-editing-services/src/auto/text_overlay.rs @@ -66,13 +66,13 @@ pub trait TextOverlayExt: 'static { fn set_color(&self, color: u32); #[doc(alias = "ges_text_overlay_set_font_desc")] - fn set_font_desc(&self, font_desc: &str); + fn set_font_desc(&self, font_desc: Option<&str>); #[doc(alias = "ges_text_overlay_set_halignment")] fn set_halignment(&self, halign: TextHAlign); #[doc(alias = "ges_text_overlay_set_text")] - fn set_text(&self, text: &str); + fn set_text(&self, text: Option<&str>); #[doc(alias = "ges_text_overlay_set_valignment")] fn set_valignment(&self, valign: TextVAlign); @@ -135,7 +135,7 @@ impl> TextOverlayExt for O { } } - fn set_font_desc(&self, font_desc: &str) { + fn set_font_desc(&self, font_desc: Option<&str>) { unsafe { ffi::ges_text_overlay_set_font_desc( self.as_ref().to_glib_none().0, @@ -153,7 +153,7 @@ impl> TextOverlayExt for O { } } - fn set_text(&self, text: &str) { + fn set_text(&self, text: Option<&str>) { unsafe { ffi::ges_text_overlay_set_text(self.as_ref().to_glib_none().0, text.to_glib_none().0); } diff --git a/gstreamer-editing-services/src/auto/text_overlay_clip.rs b/gstreamer-editing-services/src/auto/text_overlay_clip.rs index 75819fc99..e2a780938 100644 --- a/gstreamer-editing-services/src/auto/text_overlay_clip.rs +++ b/gstreamer-editing-services/src/auto/text_overlay_clip.rs @@ -73,13 +73,13 @@ pub trait TextOverlayClipExt: 'static { fn set_color(&self, color: u32); #[doc(alias = "ges_text_overlay_clip_set_font_desc")] - fn set_font_desc(&self, font_desc: &str); + fn set_font_desc(&self, font_desc: Option<&str>); #[doc(alias = "ges_text_overlay_clip_set_halign")] fn set_halign(&self, halign: TextHAlign); #[doc(alias = "ges_text_overlay_clip_set_text")] - fn set_text(&self, text: &str); + fn set_text(&self, text: Option<&str>); #[doc(alias = "ges_text_overlay_clip_set_valign")] fn set_valign(&self, valign: TextVAlign); @@ -167,7 +167,7 @@ impl> TextOverlayClipExt for O { } } - fn set_font_desc(&self, font_desc: &str) { + fn set_font_desc(&self, font_desc: Option<&str>) { unsafe { ffi::ges_text_overlay_clip_set_font_desc( self.as_ref().to_glib_none().0, @@ -185,7 +185,7 @@ impl> TextOverlayClipExt for O { } } - fn set_text(&self, text: &str) { + fn set_text(&self, text: Option<&str>) { unsafe { ffi::ges_text_overlay_clip_set_text( self.as_ref().to_glib_none().0, diff --git a/gstreamer-editing-services/src/auto/timeline.rs b/gstreamer-editing-services/src/auto/timeline.rs index 1055b60eb..5c93254d6 100644 --- a/gstreamer-editing-services/src/auto/timeline.rs +++ b/gstreamer-editing-services/src/auto/timeline.rs @@ -52,7 +52,7 @@ impl Timeline { #[doc(alias = "ges_timeline_new_from_uri")] #[doc(alias = "new_from_uri")] - pub fn from_uri(uri: &str) -> Result, glib::Error> { + pub fn from_uri(uri: &str) -> Result { assert_initialized_main_thread!(); unsafe { let mut error = ptr::null_mut(); @@ -212,7 +212,7 @@ pub trait TimelineExt: 'static { #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(alias = "select-element-track")] - fn connect_select_element_track Track + 'static>( + fn connect_select_element_track Option + 'static>( &self, f: F, ) -> SignalHandlerId; @@ -646,13 +646,15 @@ impl> TimelineExt for O { #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] - fn connect_select_element_track Track + 'static>( + fn connect_select_element_track< + F: Fn(&Self, &Clip, &TrackElement) -> Option + 'static, + >( &self, f: F, ) -> SignalHandlerId { unsafe extern "C" fn select_element_track_trampoline< P: IsA, - F: Fn(&P, &Clip, &TrackElement) -> Track + 'static, + F: Fn(&P, &Clip, &TrackElement) -> Option + 'static, >( this: *mut ffi::GESTimeline, clip: *mut ffi::GESClip, diff --git a/gstreamer-editing-services/src/auto/timeline_element.rs b/gstreamer-editing-services/src/auto/timeline_element.rs index a6e5d91bb..efbc79759 100644 --- a/gstreamer-editing-services/src/auto/timeline_element.rs +++ b/gstreamer-editing-services/src/auto/timeline_element.rs @@ -50,7 +50,8 @@ pub trait TimelineElementExt: 'static { ) -> Result<(), glib::error::BoolError>; #[doc(alias = "ges_timeline_element_copy")] - fn copy(&self, deep: bool) -> Result; + #[must_use] + fn copy(&self, deep: bool) -> TimelineElement; #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] @@ -139,7 +140,7 @@ pub trait TimelineElementExt: 'static { #[doc(alias = "ges_timeline_element_get_toplevel_parent")] #[doc(alias = "get_toplevel_parent")] #[must_use] - fn toplevel_parent(&self) -> Option; + fn toplevel_parent(&self) -> TimelineElement; #[doc(alias = "ges_timeline_element_get_track_types")] #[doc(alias = "get_track_types")] @@ -305,13 +306,12 @@ impl> TimelineElementExt for O { } } - fn copy(&self, deep: bool) -> Result { + fn copy(&self, deep: bool) -> TimelineElement { unsafe { - Option::<_>::from_glib_none(ffi::ges_timeline_element_copy( + from_glib_none(ffi::ges_timeline_element_copy( self.as_ref().to_glib_none().0, deep.into_glib(), )) - .ok_or_else(|| glib::bool_error!("Failed to copy timeline element")) } } @@ -489,7 +489,7 @@ impl> TimelineElementExt for O { } } - fn toplevel_parent(&self) -> Option { + fn toplevel_parent(&self) -> TimelineElement { unsafe { from_glib_full(ffi::ges_timeline_element_get_toplevel_parent( self.as_ref().to_glib_none().0, diff --git a/gstreamer-editing-services/src/auto/title_clip.rs b/gstreamer-editing-services/src/auto/title_clip.rs index 0aeb396d5..327bc0d10 100644 --- a/gstreamer-editing-services/src/auto/title_clip.rs +++ b/gstreamer-editing-services/src/auto/title_clip.rs @@ -90,7 +90,7 @@ pub trait TitleClipExt: 'static { #[deprecated = "Since 1.6"] #[doc(alias = "ges_title_clip_set_font_desc")] - fn set_font_desc(&self, font_desc: &str); + fn set_font_desc(&self, font_desc: Option<&str>); #[deprecated = "Since 1.6"] #[doc(alias = "ges_title_clip_set_halignment")] @@ -98,7 +98,7 @@ pub trait TitleClipExt: 'static { #[deprecated = "Since 1.6"] #[doc(alias = "ges_title_clip_set_text")] - fn set_text(&self, text: &str); + fn set_text(&self, text: Option<&str>); #[deprecated = "Since 1.6"] #[doc(alias = "ges_title_clip_set_valignment")] @@ -158,7 +158,7 @@ impl> TitleClipExt for O { fn font_desc(&self) -> Option { unsafe { - from_glib_none(ffi::ges_title_clip_get_font_desc( + from_glib_full(ffi::ges_title_clip_get_font_desc( self.as_ref().to_glib_none().0, )) } @@ -173,7 +173,7 @@ impl> TitleClipExt for O { } fn text(&self) -> Option { - unsafe { from_glib_none(ffi::ges_title_clip_get_text(self.as_ref().to_glib_none().0)) } + unsafe { from_glib_full(ffi::ges_title_clip_get_text(self.as_ref().to_glib_none().0)) } } fn text_color(&self) -> u32 { @@ -208,7 +208,7 @@ impl> TitleClipExt for O { } } - fn set_font_desc(&self, font_desc: &str) { + fn set_font_desc(&self, font_desc: Option<&str>) { unsafe { ffi::ges_title_clip_set_font_desc( self.as_ref().to_glib_none().0, @@ -223,7 +223,7 @@ impl> TitleClipExt for O { } } - fn set_text(&self, text: &str) { + fn set_text(&self, text: Option<&str>) { unsafe { ffi::ges_title_clip_set_text(self.as_ref().to_glib_none().0, text.to_glib_none().0); } diff --git a/gstreamer-editing-services/src/auto/title_source.rs b/gstreamer-editing-services/src/auto/title_source.rs index 4011ad050..062dcacbe 100644 --- a/gstreamer-editing-services/src/auto/title_source.rs +++ b/gstreamer-editing-services/src/auto/title_source.rs @@ -66,13 +66,13 @@ pub trait TitleSourceExt: 'static { fn set_background_color(&self, color: u32); #[doc(alias = "ges_title_source_set_font_desc")] - fn set_font_desc(&self, font_desc: &str); + fn set_font_desc(&self, font_desc: Option<&str>); #[doc(alias = "ges_title_source_set_halignment")] fn set_halignment(&self, halign: TextHAlign); #[doc(alias = "ges_title_source_set_text")] - fn set_text(&self, text: &str); + fn set_text(&self, text: Option<&str>); #[doc(alias = "ges_title_source_set_text_color")] fn set_text_color(&self, color: u32); @@ -142,7 +142,7 @@ impl> TitleSourceExt for O { } } - fn set_font_desc(&self, font_desc: &str) { + fn set_font_desc(&self, font_desc: Option<&str>) { unsafe { ffi::ges_title_source_set_font_desc( self.as_ref().to_glib_none().0, @@ -160,7 +160,7 @@ impl> TitleSourceExt for O { } } - fn set_text(&self, text: &str) { + fn set_text(&self, text: Option<&str>) { unsafe { ffi::ges_title_source_set_text(self.as_ref().to_glib_none().0, text.to_glib_none().0); } diff --git a/gstreamer-editing-services/src/auto/track_element.rs b/gstreamer-editing-services/src/auto/track_element.rs index f505bb2df..7775c05d2 100644 --- a/gstreamer-editing-services/src/auto/track_element.rs +++ b/gstreamer-editing-services/src/auto/track_element.rs @@ -95,11 +95,11 @@ pub trait TrackElementExt: 'static { #[doc(alias = "ges_track_element_get_gnlobject")] #[doc(alias = "get_gnlobject")] - fn gnlobject(&self) -> Option; + fn gnlobject(&self) -> gst::Element; #[doc(alias = "ges_track_element_get_nleobject")] #[doc(alias = "get_nleobject")] - fn nleobject(&self) -> Option; + fn nleobject(&self) -> gst::Element; #[doc(alias = "ges_track_element_get_track")] #[doc(alias = "get_track")] @@ -324,7 +324,7 @@ impl> TrackElementExt for O { } } - fn gnlobject(&self) -> Option { + fn gnlobject(&self) -> gst::Element { unsafe { from_glib_none(ffi::ges_track_element_get_gnlobject( self.as_ref().to_glib_none().0, @@ -332,7 +332,7 @@ impl> TrackElementExt for O { } } - fn nleobject(&self) -> Option { + fn nleobject(&self) -> gst::Element { unsafe { from_glib_none(ffi::ges_track_element_get_nleobject( self.as_ref().to_glib_none().0, diff --git a/gstreamer-editing-services/src/auto/uri_clip.rs b/gstreamer-editing-services/src/auto/uri_clip.rs index c35367e27..12883e024 100644 --- a/gstreamer-editing-services/src/auto/uri_clip.rs +++ b/gstreamer-editing-services/src/auto/uri_clip.rs @@ -42,7 +42,7 @@ impl UriClip { pub trait UriClipExt: 'static { #[doc(alias = "ges_uri_clip_get_uri")] #[doc(alias = "get_uri")] - fn uri(&self) -> Option; + fn uri(&self) -> glib::GString; #[doc(alias = "ges_uri_clip_is_image")] fn is_image(&self) -> bool; @@ -64,7 +64,7 @@ pub trait UriClipExt: 'static { } impl> UriClipExt for O { - fn uri(&self) -> Option { + fn uri(&self) -> glib::GString { unsafe { from_glib_none(ffi::ges_uri_clip_get_uri(self.as_ref().to_glib_none().0)) } } diff --git a/gstreamer-editing-services/src/auto/uri_clip_asset.rs b/gstreamer-editing-services/src/auto/uri_clip_asset.rs index 33bd18db9..a27c6020f 100644 --- a/gstreamer-editing-services/src/auto/uri_clip_asset.rs +++ b/gstreamer-editing-services/src/auto/uri_clip_asset.rs @@ -81,7 +81,7 @@ pub trait UriClipAssetExt: 'static { #[doc(alias = "ges_uri_clip_asset_get_info")] #[doc(alias = "get_info")] - fn info(&self) -> Option; + fn info(&self) -> gst_pbutils::DiscovererInfo; #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] @@ -123,7 +123,7 @@ impl> UriClipAssetExt for O { } } - fn info(&self) -> Option { + fn info(&self) -> gst_pbutils::DiscovererInfo { unsafe { from_glib_none(ffi::ges_uri_clip_asset_get_info(const_override( self.as_ref().to_glib_none().0, diff --git a/gstreamer-editing-services/src/auto/uri_source_asset.rs b/gstreamer-editing-services/src/auto/uri_source_asset.rs index 3b6718b3b..cafa93639 100644 --- a/gstreamer-editing-services/src/auto/uri_source_asset.rs +++ b/gstreamer-editing-services/src/auto/uri_source_asset.rs @@ -26,15 +26,15 @@ impl UriSourceAsset { pub trait UriSourceAssetExt: 'static { #[doc(alias = "ges_uri_source_asset_get_filesource_asset")] #[doc(alias = "get_filesource_asset")] - fn filesource_asset(&self) -> Option; + fn filesource_asset(&self) -> UriClipAsset; #[doc(alias = "ges_uri_source_asset_get_stream_info")] #[doc(alias = "get_stream_info")] - fn stream_info(&self) -> Option; + fn stream_info(&self) -> gst_pbutils::DiscovererStreamInfo; #[doc(alias = "ges_uri_source_asset_get_stream_uri")] #[doc(alias = "get_stream_uri")] - fn stream_uri(&self) -> Option; + fn stream_uri(&self) -> glib::GString; #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] @@ -43,7 +43,7 @@ pub trait UriSourceAssetExt: 'static { } impl> UriSourceAssetExt for O { - fn filesource_asset(&self) -> Option { + fn filesource_asset(&self) -> UriClipAsset { unsafe { from_glib_none(ffi::ges_uri_source_asset_get_filesource_asset( self.as_ref().to_glib_none().0, @@ -51,7 +51,7 @@ impl> UriSourceAssetExt for O { } } - fn stream_info(&self) -> Option { + fn stream_info(&self) -> gst_pbutils::DiscovererStreamInfo { unsafe { from_glib_none(ffi::ges_uri_source_asset_get_stream_info( self.as_ref().to_glib_none().0, @@ -59,7 +59,7 @@ impl> UriSourceAssetExt for O { } } - fn stream_uri(&self) -> Option { + fn stream_uri(&self) -> glib::GString { unsafe { from_glib_none(ffi::ges_uri_source_asset_get_stream_uri( self.as_ref().to_glib_none().0, diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-editing-services/src/auto/versions.txt +++ b/gstreamer-editing-services/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-editing-services/sys/Cargo.toml b/gstreamer-editing-services/sys/Cargo.toml index a5b799ae2..35686dae4 100644 --- a/gstreamer-editing-services/sys/Cargo.toml +++ b/gstreamer-editing-services/sys/Cargo.toml @@ -33,7 +33,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gio/dox", "gst/dox", "gst_pbutils/dox"] [lib] name = "gstreamer_editing_services_sys" diff --git a/gstreamer-editing-services/sys/build.rs b/gstreamer-editing-services/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-editing-services/sys/build.rs +++ b/gstreamer-editing-services/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-editing-services/sys/src/auto/versions.txt b/gstreamer-editing-services/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-editing-services/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-editing-services/sys/src/lib.rs b/gstreamer-editing-services/sys/src/lib.rs index c7f74f682..df0ea307f 100644 --- a/gstreamer-editing-services/sys/src/lib.rs +++ b/gstreamer-editing-services/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-editing-services/sys/tests/abi.rs b/gstreamer-editing-services/sys/tests/abi.rs index d72165f75..8ed504443 100644 --- a/gstreamer-editing-services/sys/tests/abi.rs +++ b/gstreamer-editing-services/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_editing_services_sys::*; diff --git a/gstreamer-editing-services/sys/tests/constant.c b/gstreamer-editing-services/sys/tests/constant.c index 01f8aee74..3abcd2b10 100644 --- a/gstreamer-editing-services/sys/tests/constant.c +++ b/gstreamer-editing-services/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-editing-services/sys/tests/layout.c b/gstreamer-editing-services/sys/tests/layout.c index 486926b28..9c8083144 100644 --- a/gstreamer-editing-services/sys/tests/layout.c +++ b/gstreamer-editing-services/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-gl/egl/Gir.toml b/gstreamer-gl/egl/Gir.toml index e83e276ea..1bb6f2f96 100644 --- a/gstreamer-gl/egl/Gir.toml +++ b/gstreamer-gl/egl/Gir.toml @@ -8,6 +8,7 @@ concurrency = "send+sync" generate_safety_asserts = true single_version_file = true generate_display_trait = false +trust_return_value_nullability = true external_libraries = [ "GLib", @@ -18,9 +19,7 @@ external_libraries = [ "GstVideo", ] -generate = [ - "GstGLEGL.GLDisplayEGL", -] +generate = [] manual = [ "GLib.Error", @@ -52,3 +51,11 @@ ref_mode = "ref" name = "Gst.Structure" status = "manual" ref_mode = "ref" + +[[object]] +name = "GstGLEGL.GLDisplayEGL" +status = "generate" + [[object.function]] + name = "new" + [object.function.return] + nullable_return_is_error = "Failed to create EGL display" diff --git a/gstreamer-gl/egl/src/auto/gl_display_egl.rs b/gstreamer-gl/egl/src/auto/gl_display_egl.rs index 5e290a02f..915c24923 100644 --- a/gstreamer-gl/egl/src/auto/gl_display_egl.rs +++ b/gstreamer-gl/egl/src/auto/gl_display_egl.rs @@ -19,9 +19,12 @@ impl GLDisplayEGL { pub const NONE: Option<&'static GLDisplayEGL> = None; #[doc(alias = "gst_gl_display_egl_new")] - pub fn new() -> GLDisplayEGL { + pub fn new() -> Result { assert_initialized_main_thread!(); - unsafe { from_glib_full(ffi::gst_gl_display_egl_new()) } + unsafe { + Option::<_>::from_glib_full(ffi::gst_gl_display_egl_new()) + .ok_or_else(|| glib::bool_error!("Failed to create EGL display")) + } } //#[doc(alias = "gst_gl_display_egl_new_with_egl_display")] @@ -47,11 +50,5 @@ impl GLDisplayEGL { //} } -impl Default for GLDisplayEGL { - fn default() -> Self { - Self::new() - } -} - unsafe impl Send for GLDisplayEGL {} unsafe impl Sync for GLDisplayEGL {} diff --git a/gstreamer-gl/egl/src/auto/versions.txt b/gstreamer-gl/egl/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-gl/egl/src/auto/versions.txt +++ b/gstreamer-gl/egl/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-gl/egl/sys/Cargo.toml b/gstreamer-gl/egl/sys/Cargo.toml index b5998ec30..5fde70d62 100644 --- a/gstreamer-gl/egl/sys/Cargo.toml +++ b/gstreamer-gl/egl/sys/Cargo.toml @@ -53,7 +53,7 @@ shell-words = "1.0.0" tempfile = "3" [features] -dox = [] +dox = ["glib/dox", "gst_gl/dox"] v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] diff --git a/gstreamer-gl/egl/sys/build.rs b/gstreamer-gl/egl/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-gl/egl/sys/build.rs +++ b/gstreamer-gl/egl/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-gl/egl/sys/src/auto/versions.txt b/gstreamer-gl/egl/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-gl/egl/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-gl/egl/sys/src/lib.rs b/gstreamer-gl/egl/sys/src/lib.rs index c94ceb091..ee4179900 100644 --- a/gstreamer-gl/egl/sys/src/lib.rs +++ b/gstreamer-gl/egl/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-gl/egl/sys/tests/abi.rs b/gstreamer-gl/egl/sys/tests/abi.rs index 02c4be55b..8aacecc16 100644 --- a/gstreamer-gl/egl/sys/tests/abi.rs +++ b/gstreamer-gl/egl/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_gl_egl_sys::*; diff --git a/gstreamer-gl/egl/sys/tests/constant.c b/gstreamer-gl/egl/sys/tests/constant.c index e3ad944cb..c5dc0c48b 100644 --- a/gstreamer-gl/egl/sys/tests/constant.c +++ b/gstreamer-gl/egl/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-gl/egl/sys/tests/layout.c b/gstreamer-gl/egl/sys/tests/layout.c index ec395d4f2..b63c2412a 100644 --- a/gstreamer-gl/egl/sys/tests/layout.c +++ b/gstreamer-gl/egl/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-gl/src/auto/gl_color_convert.rs b/gstreamer-gl/src/auto/gl_color_convert.rs index b8a2553e1..26ff96770 100644 --- a/gstreamer-gl/src/auto/gl_color_convert.rs +++ b/gstreamer-gl/src/auto/gl_color_convert.rs @@ -51,7 +51,7 @@ impl GLColorConvert { direction: gst::PadDirection, caps: &gst::Caps, filter: &gst::Caps, - ) -> Option { + ) -> gst::Caps { skip_assert_initialized!(); unsafe { from_glib_full(ffi::gst_gl_color_convert_transform_caps( diff --git a/gstreamer-gl/src/auto/gl_display.rs b/gstreamer-gl/src/auto/gl_display.rs index b927a35fd..442f54562 100644 --- a/gstreamer-gl/src/auto/gl_display.rs +++ b/gstreamer-gl/src/auto/gl_display.rs @@ -93,7 +93,9 @@ pub trait GLDisplayExt: 'static { //fn retrieve_window(&self, data: /*Unimplemented*/Option, compare_func: /*Unimplemented*/FnMut(/*Unimplemented*/Option, /*Unimplemented*/Option) -> i32) -> Option; #[doc(alias = "create-context")] - fn connect_create_context GLContext + Send + Sync + 'static>( + fn connect_create_context< + F: Fn(&Self, &GLContext) -> Option + Send + Sync + 'static, + >( &self, f: F, ) -> SignalHandlerId; @@ -202,13 +204,15 @@ impl> GLDisplayExt for O { // unsafe { TODO: call ffi:gst_gl_display_retrieve_window() } //} - fn connect_create_context GLContext + Send + Sync + 'static>( + fn connect_create_context< + F: Fn(&Self, &GLContext) -> Option + Send + Sync + 'static, + >( &self, f: F, ) -> SignalHandlerId { unsafe extern "C" fn create_context_trampoline< P: IsA, - F: Fn(&P, &GLContext) -> GLContext + Send + Sync + 'static, + F: Fn(&P, &GLContext) -> Option + Send + Sync + 'static, >( this: *mut ffi::GstGLDisplay, context: *mut ffi::GstGLContext, diff --git a/gstreamer-gl/src/auto/gl_memory_allocator.rs b/gstreamer-gl/src/auto/gl_memory_allocator.rs index 12d4a3823..e61c5bffd 100644 --- a/gstreamer-gl/src/auto/gl_memory_allocator.rs +++ b/gstreamer-gl/src/auto/gl_memory_allocator.rs @@ -22,7 +22,7 @@ impl GLMemoryAllocator { #[doc(alias = "gst_gl_memory_allocator_get_default")] #[doc(alias = "get_default")] - pub fn default(context: &impl IsA) -> Option { + pub fn default(context: &impl IsA) -> GLMemoryAllocator { skip_assert_initialized!(); unsafe { from_glib_full(ffi::gst_gl_memory_allocator_get_default( diff --git a/gstreamer-gl/src/auto/gl_overlay_compositor.rs b/gstreamer-gl/src/auto/gl_overlay_compositor.rs index 92bf04759..25c2074f1 100644 --- a/gstreamer-gl/src/auto/gl_overlay_compositor.rs +++ b/gstreamer-gl/src/auto/gl_overlay_compositor.rs @@ -75,7 +75,7 @@ impl GLOverlayCompositor { } #[doc(alias = "gst_gl_overlay_compositor_add_caps")] - pub fn add_caps(caps: &gst::Caps) -> Option { + pub fn add_caps(caps: &gst::Caps) -> gst::Caps { assert_initialized_main_thread!(); unsafe { from_glib_full(ffi::gst_gl_overlay_compositor_add_caps( diff --git a/gstreamer-gl/src/auto/gl_shader.rs b/gstreamer-gl/src/auto/gl_shader.rs index eaf3b4c7f..81f1a53a6 100644 --- a/gstreamer-gl/src/auto/gl_shader.rs +++ b/gstreamer-gl/src/auto/gl_shader.rs @@ -383,7 +383,7 @@ impl GLShader { context: &impl IsA, version: GLSLVersion, profile: GLSLProfile, - ) -> Option { + ) -> glib::GString { skip_assert_initialized!(); unsafe { from_glib_full(ffi::gst_gl_shader_string_fragment_external_oes_get_default( @@ -401,7 +401,7 @@ impl GLShader { context: &impl IsA, version: GLSLVersion, profile: GLSLProfile, - ) -> Option { + ) -> glib::GString { skip_assert_initialized!(); unsafe { from_glib_full(ffi::gst_gl_shader_string_fragment_get_default( @@ -419,7 +419,7 @@ impl GLShader { context: &impl IsA, version: GLSLVersion, profile: GLSLProfile, - ) -> Option { + ) -> glib::GString { skip_assert_initialized!(); unsafe { from_glib_none(ffi::gst_gl_shader_string_get_highest_precision( diff --git a/gstreamer-gl/src/auto/gl_upload.rs b/gstreamer-gl/src/auto/gl_upload.rs index 12fd83330..a118e3790 100644 --- a/gstreamer-gl/src/auto/gl_upload.rs +++ b/gstreamer-gl/src/auto/gl_upload.rs @@ -70,7 +70,7 @@ impl GLUpload { direction: gst::PadDirection, caps: &gst::Caps, filter: &gst::Caps, - ) -> Option { + ) -> gst::Caps { unsafe { from_glib_full(ffi::gst_gl_upload_transform_caps( self.to_glib_none().0, diff --git a/gstreamer-gl/src/auto/gl_window.rs b/gstreamer-gl/src/auto/gl_window.rs index 0b730cb0a..12830a08a 100644 --- a/gstreamer-gl/src/auto/gl_window.rs +++ b/gstreamer-gl/src/auto/gl_window.rs @@ -47,7 +47,7 @@ pub trait GLWindowExt: 'static { #[doc(alias = "gst_gl_window_get_context")] #[doc(alias = "get_context")] - fn context(&self) -> Option; + fn context(&self) -> GLContext; #[doc(alias = "gst_gl_window_get_surface_dimensions")] #[doc(alias = "get_surface_dimensions")] @@ -145,7 +145,7 @@ impl> GLWindowExt for O { } } - fn context(&self) -> Option { + fn context(&self) -> GLContext { unsafe { from_glib_full(ffi::gst_gl_window_get_context( self.as_ref().to_glib_none().0, diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-gl/src/auto/versions.txt +++ b/gstreamer-gl/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-gl/sys/Cargo.toml b/gstreamer-gl/sys/Cargo.toml index 7896cc09b..bc5166707 100644 --- a/gstreamer-gl/sys/Cargo.toml +++ b/gstreamer-gl/sys/Cargo.toml @@ -33,7 +33,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gst/dox", "gst_base/dox", "gst_video/dox"] [lib] name = "gstreamer_gl_sys" diff --git a/gstreamer-gl/sys/build.rs b/gstreamer-gl/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-gl/sys/build.rs +++ b/gstreamer-gl/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-gl/sys/src/auto/versions.txt b/gstreamer-gl/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-gl/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-gl/sys/src/lib.rs b/gstreamer-gl/sys/src/lib.rs index 2acad4560..3e93c8f9b 100644 --- a/gstreamer-gl/sys/src/lib.rs +++ b/gstreamer-gl/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-gl/sys/tests/abi.rs b/gstreamer-gl/sys/tests/abi.rs index de921761a..faf20292d 100644 --- a/gstreamer-gl/sys/tests/abi.rs +++ b/gstreamer-gl/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_gl_sys::*; diff --git a/gstreamer-gl/sys/tests/constant.c b/gstreamer-gl/sys/tests/constant.c index c14b1131e..2fdea7083 100644 --- a/gstreamer-gl/sys/tests/constant.c +++ b/gstreamer-gl/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-gl/sys/tests/layout.c b/gstreamer-gl/sys/tests/layout.c index fcb8629e6..cdbd6c976 100644 --- a/gstreamer-gl/sys/tests/layout.c +++ b/gstreamer-gl/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-gl/wayland/Gir.toml b/gstreamer-gl/wayland/Gir.toml index bb7acd39d..2e18a9982 100644 --- a/gstreamer-gl/wayland/Gir.toml +++ b/gstreamer-gl/wayland/Gir.toml @@ -8,6 +8,7 @@ concurrency = "send+sync" generate_safety_asserts = true single_version_file = true generate_display_trait = false +trust_return_value_nullability = true external_libraries = [ "GLib", @@ -18,9 +19,7 @@ external_libraries = [ "GstVideo", ] -generate = [ - "GstGLWayland.GLDisplayWayland", -] +generate = [] manual = [ "GLib.Error", @@ -51,3 +50,11 @@ ref_mode = "ref" name = "Gst.Structure" status = "manual" ref_mode = "ref" + +[[object]] +name = "GstGLWayland.GLDisplayWayland" +status = "generate" + [[object.function]] + name = "new" + [object.function.return] + nullable_return_is_error = "Failed to create Wayland display" diff --git a/gstreamer-gl/wayland/src/auto/gl_display_wayland.rs b/gstreamer-gl/wayland/src/auto/gl_display_wayland.rs index d7ff5348e..932707b15 100644 --- a/gstreamer-gl/wayland/src/auto/gl_display_wayland.rs +++ b/gstreamer-gl/wayland/src/auto/gl_display_wayland.rs @@ -18,9 +18,12 @@ impl GLDisplayWayland { pub const NONE: Option<&'static GLDisplayWayland> = None; #[doc(alias = "gst_gl_display_wayland_new")] - pub fn new(name: Option<&str>) -> GLDisplayWayland { + pub fn new(name: Option<&str>) -> Result { assert_initialized_main_thread!(); - unsafe { from_glib_full(ffi::gst_gl_display_wayland_new(name.to_glib_none().0)) } + unsafe { + Option::<_>::from_glib_full(ffi::gst_gl_display_wayland_new(name.to_glib_none().0)) + .ok_or_else(|| glib::bool_error!("Failed to create Wayland display")) + } } //#[doc(alias = "gst_gl_display_wayland_new_with_display")] diff --git a/gstreamer-gl/wayland/src/auto/versions.txt b/gstreamer-gl/wayland/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-gl/wayland/src/auto/versions.txt +++ b/gstreamer-gl/wayland/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-gl/wayland/sys/Cargo.toml b/gstreamer-gl/wayland/sys/Cargo.toml index e52e045e6..0ab08ad71 100644 --- a/gstreamer-gl/wayland/sys/Cargo.toml +++ b/gstreamer-gl/wayland/sys/Cargo.toml @@ -53,7 +53,7 @@ shell-words = "1.0.0" tempfile = "3" [features] -dox = [] +dox = ["glib/dox", "gst_gl/dox"] v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] diff --git a/gstreamer-gl/wayland/sys/build.rs b/gstreamer-gl/wayland/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-gl/wayland/sys/build.rs +++ b/gstreamer-gl/wayland/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-gl/wayland/sys/src/auto/versions.txt b/gstreamer-gl/wayland/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-gl/wayland/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-gl/wayland/sys/src/lib.rs b/gstreamer-gl/wayland/sys/src/lib.rs index bb2b15590..d65e534c7 100644 --- a/gstreamer-gl/wayland/sys/src/lib.rs +++ b/gstreamer-gl/wayland/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-gl/wayland/sys/tests/abi.rs b/gstreamer-gl/wayland/sys/tests/abi.rs index 9a0f44ac1..23699f625 100644 --- a/gstreamer-gl/wayland/sys/tests/abi.rs +++ b/gstreamer-gl/wayland/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_gl_wayland_sys::*; diff --git a/gstreamer-gl/wayland/sys/tests/constant.c b/gstreamer-gl/wayland/sys/tests/constant.c index 91dd07916..d37bc26f5 100644 --- a/gstreamer-gl/wayland/sys/tests/constant.c +++ b/gstreamer-gl/wayland/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-gl/wayland/sys/tests/layout.c b/gstreamer-gl/wayland/sys/tests/layout.c index 8878902db..5e957c04e 100644 --- a/gstreamer-gl/wayland/sys/tests/layout.c +++ b/gstreamer-gl/wayland/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-gl/x11/Gir.toml b/gstreamer-gl/x11/Gir.toml index 1a43bca9f..5d851d517 100644 --- a/gstreamer-gl/x11/Gir.toml +++ b/gstreamer-gl/x11/Gir.toml @@ -8,6 +8,7 @@ concurrency = "send+sync" generate_safety_asserts = true single_version_file = true generate_display_trait = false +trust_return_value_nullability = true external_libraries = [ "GLib", @@ -18,9 +19,7 @@ external_libraries = [ "GstVideo", ] -generate = [ - "GstGLX11.GLDisplayX11", -] +generate = [] manual = [ "GLib.Error", @@ -51,3 +50,11 @@ ref_mode = "ref" name = "Gst.Structure" status = "manual" ref_mode = "ref" + +[[object]] +name = "GstGLX11.GLDisplayX11" +status = "generate" + [[object.function]] + name = "new" + [object.function.return] + nullable_return_is_error = "Failed to create X11 display" diff --git a/gstreamer-gl/x11/src/auto/gl_display_x11.rs b/gstreamer-gl/x11/src/auto/gl_display_x11.rs index 4df94d1fc..a0be99443 100644 --- a/gstreamer-gl/x11/src/auto/gl_display_x11.rs +++ b/gstreamer-gl/x11/src/auto/gl_display_x11.rs @@ -18,9 +18,12 @@ impl GLDisplayX11 { pub const NONE: Option<&'static GLDisplayX11> = None; #[doc(alias = "gst_gl_display_x11_new")] - pub fn new(name: Option<&str>) -> GLDisplayX11 { + pub fn new(name: Option<&str>) -> Result { assert_initialized_main_thread!(); - unsafe { from_glib_full(ffi::gst_gl_display_x11_new(name.to_glib_none().0)) } + unsafe { + Option::<_>::from_glib_full(ffi::gst_gl_display_x11_new(name.to_glib_none().0)) + .ok_or_else(|| glib::bool_error!("Failed to create X11 display")) + } } //#[doc(alias = "gst_gl_display_x11_new_with_display")] diff --git a/gstreamer-gl/x11/src/auto/versions.txt b/gstreamer-gl/x11/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-gl/x11/src/auto/versions.txt +++ b/gstreamer-gl/x11/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-gl/x11/sys/Cargo.toml b/gstreamer-gl/x11/sys/Cargo.toml index eeba3facf..db9aa3dba 100644 --- a/gstreamer-gl/x11/sys/Cargo.toml +++ b/gstreamer-gl/x11/sys/Cargo.toml @@ -53,7 +53,7 @@ shell-words = "1.0.0" tempfile = "3" [features] -dox = [] +dox = ["glib/dox", "gst_gl/dox"] v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] diff --git a/gstreamer-gl/x11/sys/build.rs b/gstreamer-gl/x11/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-gl/x11/sys/build.rs +++ b/gstreamer-gl/x11/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-gl/x11/sys/src/auto/versions.txt b/gstreamer-gl/x11/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-gl/x11/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-gl/x11/sys/src/lib.rs b/gstreamer-gl/x11/sys/src/lib.rs index a058d3d4c..749f8d784 100644 --- a/gstreamer-gl/x11/sys/src/lib.rs +++ b/gstreamer-gl/x11/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-gl/x11/sys/tests/abi.rs b/gstreamer-gl/x11/sys/tests/abi.rs index 0d0382e2c..12f4c940c 100644 --- a/gstreamer-gl/x11/sys/tests/abi.rs +++ b/gstreamer-gl/x11/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_gl_x11_sys::*; diff --git a/gstreamer-gl/x11/sys/tests/constant.c b/gstreamer-gl/x11/sys/tests/constant.c index 91dd07916..d37bc26f5 100644 --- a/gstreamer-gl/x11/sys/tests/constant.c +++ b/gstreamer-gl/x11/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-gl/x11/sys/tests/layout.c b/gstreamer-gl/x11/sys/tests/layout.c index c99c9c76e..77394fd7f 100644 --- a/gstreamer-gl/x11/sys/tests/layout.c +++ b/gstreamer-gl/x11/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-mpegts/src/auto/versions.txt b/gstreamer-mpegts/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-mpegts/src/auto/versions.txt +++ b/gstreamer-mpegts/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-mpegts/sys/Cargo.toml b/gstreamer-mpegts/sys/Cargo.toml index 4ad79fc72..d0cc64e83 100644 --- a/gstreamer-mpegts/sys/Cargo.toml +++ b/gstreamer-mpegts/sys/Cargo.toml @@ -60,4 +60,4 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gst/dox"] diff --git a/gstreamer-mpegts/sys/build.rs b/gstreamer-mpegts/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-mpegts/sys/build.rs +++ b/gstreamer-mpegts/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-mpegts/sys/src/auto/versions.txt b/gstreamer-mpegts/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-mpegts/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-mpegts/sys/src/lib.rs b/gstreamer-mpegts/sys/src/lib.rs index a433d2d7c..86dc481f3 100644 --- a/gstreamer-mpegts/sys/src/lib.rs +++ b/gstreamer-mpegts/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-mpegts/sys/tests/abi.rs b/gstreamer-mpegts/sys/tests/abi.rs index 2e1543a63..f4618ded6 100644 --- a/gstreamer-mpegts/sys/tests/abi.rs +++ b/gstreamer-mpegts/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_mpegts_sys::*; diff --git a/gstreamer-mpegts/sys/tests/constant.c b/gstreamer-mpegts/sys/tests/constant.c index 015417c13..64ccf27ca 100644 --- a/gstreamer-mpegts/sys/tests/constant.c +++ b/gstreamer-mpegts/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-mpegts/sys/tests/layout.c b/gstreamer-mpegts/sys/tests/layout.c index e1e7c3c0d..597e517d9 100644 --- a/gstreamer-mpegts/sys/tests/layout.c +++ b/gstreamer-mpegts/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-net/src/auto/net_time_provider.rs b/gstreamer-net/src/auto/net_time_provider.rs index 47356ab87..cf5e10f81 100644 --- a/gstreamer-net/src/auto/net_time_provider.rs +++ b/gstreamer-net/src/auto/net_time_provider.rs @@ -24,14 +24,19 @@ glib::wrapper! { impl NetTimeProvider { #[doc(alias = "gst_net_time_provider_new")] - pub fn new(clock: &impl IsA, address: Option<&str>, port: i32) -> NetTimeProvider { + pub fn new( + clock: &impl IsA, + address: Option<&str>, + port: i32, + ) -> Result { assert_initialized_main_thread!(); unsafe { - from_glib_full(ffi::gst_net_time_provider_new( + Option::<_>::from_glib_full(ffi::gst_net_time_provider_new( clock.as_ref().to_glib_none().0, address.to_glib_none().0, port, )) + .ok_or_else(|| glib::bool_error!("Failed to create NetTimeProvider")) } } diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-net/src/auto/versions.txt +++ b/gstreamer-net/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-net/sys/Cargo.toml b/gstreamer-net/sys/Cargo.toml index 19df85d39..f28a53077 100644 --- a/gstreamer-net/sys/Cargo.toml +++ b/gstreamer-net/sys/Cargo.toml @@ -25,7 +25,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gio/dox", "gst/dox"] [lib] name = "gstreamer_net_sys" diff --git a/gstreamer-net/sys/build.rs b/gstreamer-net/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-net/sys/build.rs +++ b/gstreamer-net/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-net/sys/src/auto/versions.txt b/gstreamer-net/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-net/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-net/sys/src/lib.rs b/gstreamer-net/sys/src/lib.rs index 0e44ab81c..dd256a12f 100644 --- a/gstreamer-net/sys/src/lib.rs +++ b/gstreamer-net/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-net/sys/tests/abi.rs b/gstreamer-net/sys/tests/abi.rs index e471d2cc5..f3029f21d 100644 --- a/gstreamer-net/sys/tests/abi.rs +++ b/gstreamer-net/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_net_sys::*; diff --git a/gstreamer-net/sys/tests/constant.c b/gstreamer-net/sys/tests/constant.c index 95fce5639..c13c427de 100644 --- a/gstreamer-net/sys/tests/constant.c +++ b/gstreamer-net/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-net/sys/tests/layout.c b/gstreamer-net/sys/tests/layout.c index 6a494365b..e84b31f6e 100644 --- a/gstreamer-net/sys/tests/layout.c +++ b/gstreamer-net/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-pbutils/src/auto/discoverer_info.rs b/gstreamer-pbutils/src/auto/discoverer_info.rs index 98cbaf9ff..99c09150b 100644 --- a/gstreamer-pbutils/src/auto/discoverer_info.rs +++ b/gstreamer-pbutils/src/auto/discoverer_info.rs @@ -142,7 +142,7 @@ impl DiscovererInfo { #[doc(alias = "gst_discoverer_info_get_uri")] #[doc(alias = "get_uri")] - pub fn uri(&self) -> Option { + pub fn uri(&self) -> glib::GString { unsafe { from_glib_none(ffi::gst_discoverer_info_get_uri(self.to_glib_none().0)) } } @@ -157,27 +157,22 @@ impl DiscovererInfo { } #[doc(alias = "gst_discoverer_info_to_variant")] - pub fn to_variant( - &self, - flags: DiscovererSerializeFlags, - ) -> Result { + pub fn to_variant(&self, flags: DiscovererSerializeFlags) -> glib::Variant { unsafe { - Option::<_>::from_glib_full(ffi::gst_discoverer_info_to_variant( + from_glib_full(ffi::gst_discoverer_info_to_variant( self.to_glib_none().0, flags.into_glib(), )) - .ok_or_else(|| glib::bool_error!("Failed to serialize DiscovererInfo to Variant")) } } #[doc(alias = "gst_discoverer_info_from_variant")] - pub fn from_variant(variant: &glib::Variant) -> Result { + pub fn from_variant(variant: &glib::Variant) -> DiscovererInfo { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_full(ffi::gst_discoverer_info_from_variant( + from_glib_full(ffi::gst_discoverer_info_from_variant( variant.to_glib_none().0, )) - .ok_or_else(|| glib::bool_error!("Failed to deserialize DiscovererInfo from Variant")) } } } diff --git a/gstreamer-pbutils/src/auto/discoverer_stream_info.rs b/gstreamer-pbutils/src/auto/discoverer_stream_info.rs index e2696f530..6fc4a9a85 100644 --- a/gstreamer-pbutils/src/auto/discoverer_stream_info.rs +++ b/gstreamer-pbutils/src/auto/discoverer_stream_info.rs @@ -43,7 +43,7 @@ pub trait DiscovererStreamInfoExt: 'static { #[doc(alias = "gst_discoverer_stream_info_get_stream_id")] #[doc(alias = "get_stream_id")] - fn stream_id(&self) -> Option; + fn stream_id(&self) -> glib::GString; #[cfg(any(feature = "v1_20", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))] @@ -97,7 +97,7 @@ impl> DiscovererStreamInfoExt for O { } } - fn stream_id(&self) -> Option { + fn stream_id(&self) -> glib::GString { unsafe { from_glib_none(ffi::gst_discoverer_stream_info_get_stream_id( self.as_ref().to_glib_none().0, diff --git a/gstreamer-pbutils/src/auto/encoding_profile.rs b/gstreamer-pbutils/src/auto/encoding_profile.rs index 9293d5881..eae304eb2 100644 --- a/gstreamer-pbutils/src/auto/encoding_profile.rs +++ b/gstreamer-pbutils/src/auto/encoding_profile.rs @@ -116,7 +116,7 @@ pub trait EncodingProfileExt: 'static { #[doc(alias = "gst_encoding_profile_get_type_nick")] #[doc(alias = "get_type_nick")] - fn type_nick(&self) -> Option; + fn type_nick(&self) -> glib::GString; #[doc(alias = "gst_encoding_profile_is_enabled")] fn is_enabled(&self) -> bool; @@ -220,7 +220,7 @@ impl> EncodingProfileExt for O { } } - fn type_nick(&self) -> Option { + fn type_nick(&self) -> glib::GString { unsafe { from_glib_none(ffi::gst_encoding_profile_get_type_nick( self.as_ref().to_glib_none().0, diff --git a/gstreamer-pbutils/src/auto/encoding_target.rs b/gstreamer-pbutils/src/auto/encoding_target.rs index d5cc53b51..c1be548b3 100644 --- a/gstreamer-pbutils/src/auto/encoding_target.rs +++ b/gstreamer-pbutils/src/auto/encoding_target.rs @@ -24,15 +24,16 @@ impl EncodingTarget { category: &str, description: &str, profiles: &[EncodingProfile], - ) -> EncodingTarget { + ) -> Result { assert_initialized_main_thread!(); unsafe { - from_glib_full(ffi::gst_encoding_target_new( + Option::<_>::from_glib_full(ffi::gst_encoding_target_new( name.to_glib_none().0, category.to_glib_none().0, description.to_glib_none().0, profiles.to_glib_none().0, )) + .ok_or_else(|| glib::bool_error!("Failed to create EncodingTarget")) } } @@ -62,7 +63,7 @@ impl EncodingTarget { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(alias = "gst_encoding_target_get_path")] #[doc(alias = "get_path")] - pub fn path(&self) -> Option { + pub fn path(&self) -> Option { unsafe { from_glib_none(ffi::gst_encoding_target_get_path(self.to_glib_none().0)) } } diff --git a/gstreamer-pbutils/src/auto/functions.rs b/gstreamer-pbutils/src/auto/functions.rs index 37af8b65c..2e9628269 100644 --- a/gstreamer-pbutils/src/auto/functions.rs +++ b/gstreamer-pbutils/src/auto/functions.rs @@ -244,15 +244,12 @@ pub fn pb_utils_get_caps_description_flags(caps: &gst::Caps) -> PbUtilsCapsDescr } #[doc(alias = "gst_pb_utils_get_element_description")] -pub fn pb_utils_get_element_description( - factory_name: &str, -) -> Result { +pub fn pb_utils_get_element_description(factory_name: &str) -> glib::GString { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_full(ffi::gst_pb_utils_get_element_description( + from_glib_full(ffi::gst_pb_utils_get_element_description( factory_name.to_glib_none().0, )) - .ok_or_else(|| glib::bool_error!("Failed to get element description")) } } @@ -269,24 +266,22 @@ pub fn pb_utils_get_file_extension_from_caps(caps: &gst::Caps) -> Option Result { +pub fn pb_utils_get_sink_description(protocol: &str) -> glib::GString { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_full(ffi::gst_pb_utils_get_sink_description( + from_glib_full(ffi::gst_pb_utils_get_sink_description( protocol.to_glib_none().0, )) - .ok_or_else(|| glib::bool_error!("Failed to get sink description")) } } #[doc(alias = "gst_pb_utils_get_source_description")] -pub fn pb_utils_get_source_description(protocol: &str) -> Result { +pub fn pb_utils_get_source_description(protocol: &str) -> glib::GString { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_full(ffi::gst_pb_utils_get_source_description( + from_glib_full(ffi::gst_pb_utils_get_source_description( protocol.to_glib_none().0, )) - .ok_or_else(|| glib::bool_error!("Failed to get source description")) } } diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-pbutils/src/auto/versions.txt +++ b/gstreamer-pbutils/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-pbutils/sys/Cargo.toml b/gstreamer-pbutils/sys/Cargo.toml index 397c1e1f0..12fe8e21c 100644 --- a/gstreamer-pbutils/sys/Cargo.toml +++ b/gstreamer-pbutils/sys/Cargo.toml @@ -33,7 +33,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gst/dox", "gst_audio/dox", "gst_video/dox"] [lib] name = "gstreamer_pbutils_sys" diff --git a/gstreamer-pbutils/sys/build.rs b/gstreamer-pbutils/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-pbutils/sys/build.rs +++ b/gstreamer-pbutils/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-pbutils/sys/src/auto/versions.txt b/gstreamer-pbutils/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-pbutils/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-pbutils/sys/src/lib.rs b/gstreamer-pbutils/sys/src/lib.rs index b2be46445..a38f5ee3e 100644 --- a/gstreamer-pbutils/sys/src/lib.rs +++ b/gstreamer-pbutils/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-pbutils/sys/tests/abi.rs b/gstreamer-pbutils/sys/tests/abi.rs index 760709781..2da9d75d3 100644 --- a/gstreamer-pbutils/sys/tests/abi.rs +++ b/gstreamer-pbutils/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_pbutils_sys::*; diff --git a/gstreamer-pbutils/sys/tests/constant.c b/gstreamer-pbutils/sys/tests/constant.c index 086698d57..7c5d2d7fa 100644 --- a/gstreamer-pbutils/sys/tests/constant.c +++ b/gstreamer-pbutils/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-pbutils/sys/tests/layout.c b/gstreamer-pbutils/sys/tests/layout.c index 9520e48c3..bfdb99c27 100644 --- a/gstreamer-pbutils/sys/tests/layout.c +++ b/gstreamer-pbutils/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-play/src/auto/play_signal_adapter.rs b/gstreamer-play/src/auto/play_signal_adapter.rs index d2c82da00..f61d25213 100644 --- a/gstreamer-play/src/auto/play_signal_adapter.rs +++ b/gstreamer-play/src/auto/play_signal_adapter.rs @@ -115,15 +115,15 @@ impl PlaySignalAdapter { F: Fn(&PlaySignalAdapter, &glib::Error, Option<&gst::Structure>) + Send + 'static, >( this: *mut ffi::GstPlaySignalAdapter, - object: *mut glib::ffi::GError, - p0: *mut gst::ffi::GstStructure, + error: *mut glib::ffi::GError, + details: *mut gst::ffi::GstStructure, f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f( &from_glib_borrow(this), - &from_glib_borrow(object), - Option::::from_glib_borrow(p0) + &from_glib_borrow(error), + Option::::from_glib_borrow(details) .as_ref() .as_ref(), ) @@ -319,15 +319,15 @@ impl PlaySignalAdapter { F: Fn(&PlaySignalAdapter, &glib::Error, Option<&gst::Structure>) + Send + 'static, >( this: *mut ffi::GstPlaySignalAdapter, - object: *mut glib::ffi::GError, - p0: *mut gst::ffi::GstStructure, + error: *mut glib::ffi::GError, + details: *mut gst::ffi::GstStructure, f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f( &from_glib_borrow(this), - &from_glib_borrow(object), - Option::::from_glib_borrow(p0) + &from_glib_borrow(error), + Option::::from_glib_borrow(details) .as_ref() .as_ref(), ) diff --git a/gstreamer-play/src/auto/versions.txt b/gstreamer-play/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-play/src/auto/versions.txt +++ b/gstreamer-play/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-play/sys/Cargo.toml b/gstreamer-play/sys/Cargo.toml index cf3b11c95..7d1a3643f 100644 --- a/gstreamer-play/sys/Cargo.toml +++ b/gstreamer-play/sys/Cargo.toml @@ -26,7 +26,7 @@ tempfile = "3" [features] v1_22 = [] -dox = [] +dox = ["glib/dox", "gobject/dox", "gst/dox", "gst_video/dox"] [lib] name = "gstreamer_play_sys" diff --git a/gstreamer-play/sys/build.rs b/gstreamer-play/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-play/sys/build.rs +++ b/gstreamer-play/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-play/sys/src/auto/versions.txt b/gstreamer-play/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-play/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-play/sys/src/lib.rs b/gstreamer-play/sys/src/lib.rs index ba25981e4..5557586f9 100644 --- a/gstreamer-play/sys/src/lib.rs +++ b/gstreamer-play/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-play/sys/tests/abi.rs b/gstreamer-play/sys/tests/abi.rs index 4256c38df..4ab8136c5 100644 --- a/gstreamer-play/sys/tests/abi.rs +++ b/gstreamer-play/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_play_sys::*; diff --git a/gstreamer-play/sys/tests/constant.c b/gstreamer-play/sys/tests/constant.c index 32751fdda..0c8397192 100644 --- a/gstreamer-play/sys/tests/constant.c +++ b/gstreamer-play/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-play/sys/tests/layout.c b/gstreamer-play/sys/tests/layout.c index 81ac7be19..317e98af8 100644 --- a/gstreamer-play/sys/tests/layout.c +++ b/gstreamer-play/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-player/src/auto/versions.txt +++ b/gstreamer-player/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-player/sys/Cargo.toml b/gstreamer-player/sys/Cargo.toml index 0e0a506f4..ee8074a3e 100644 --- a/gstreamer-player/sys/Cargo.toml +++ b/gstreamer-player/sys/Cargo.toml @@ -29,7 +29,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gst/dox", "gst_video/dox"] [lib] name = "gstreamer_player_sys" diff --git a/gstreamer-player/sys/build.rs b/gstreamer-player/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-player/sys/build.rs +++ b/gstreamer-player/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-player/sys/src/auto/versions.txt b/gstreamer-player/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-player/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-player/sys/src/lib.rs b/gstreamer-player/sys/src/lib.rs index 1e785d871..0548f50c8 100644 --- a/gstreamer-player/sys/src/lib.rs +++ b/gstreamer-player/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-player/sys/tests/abi.rs b/gstreamer-player/sys/tests/abi.rs index fc8e2908c..7e7bdafc7 100644 --- a/gstreamer-player/sys/tests/abi.rs +++ b/gstreamer-player/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_player_sys::*; diff --git a/gstreamer-player/sys/tests/constant.c b/gstreamer-player/sys/tests/constant.c index f6b72f758..7ca048f1f 100644 --- a/gstreamer-player/sys/tests/constant.c +++ b/gstreamer-player/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-player/sys/tests/layout.c b/gstreamer-player/sys/tests/layout.c index 4cdc86e26..4dd67f80f 100644 --- a/gstreamer-player/sys/tests/layout.c +++ b/gstreamer-player/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtp/src/auto/functions.rs b/gstreamer-rtp/src/auto/functions.rs index fabeb9b19..c1bde0f31 100644 --- a/gstreamer-rtp/src/auto/functions.rs +++ b/gstreamer-rtp/src/auto/functions.rs @@ -9,7 +9,7 @@ use glib::translate::*; //#[cfg(any(feature = "v1_16", feature = "dox"))] //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] //#[doc(alias = "gst_buffer_add_rtp_source_meta")] -//pub fn buffer_add_rtp_source_meta(buffer: &gst::Buffer, ssrc: u32, csrc: u32, csrc_count: u32) -> /*Ignored*/Option { +//pub fn buffer_add_rtp_source_meta(buffer: &gst::Buffer, ssrc: u32, csrc: &[u32]) -> /*Ignored*/RTPSourceMeta { // unsafe { TODO: call ffi:gst_buffer_add_rtp_source_meta() } //} @@ -33,7 +33,7 @@ pub fn rtcp_sdes_name_to_type(name: &str) -> RTCPSDESType { } #[doc(alias = "gst_rtcp_sdes_type_to_name")] -pub fn rtcp_sdes_type_to_name(type_: RTCPSDESType) -> Option { +pub fn rtcp_sdes_type_to_name(type_: RTCPSDESType) -> glib::GString { assert_initialized_main_thread!(); unsafe { from_glib_none(ffi::gst_rtcp_sdes_type_to_name(type_.into_glib())) } } diff --git a/gstreamer-rtp/src/auto/rtp_base_payload.rs b/gstreamer-rtp/src/auto/rtp_base_payload.rs index 6577402b6..828f41777 100644 --- a/gstreamer-rtp/src/auto/rtp_base_payload.rs +++ b/gstreamer-rtp/src/auto/rtp_base_payload.rs @@ -39,12 +39,7 @@ pub trait RTPBasePayloadExt: 'static { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(alias = "gst_rtp_base_payload_allocate_output_buffer")] - fn allocate_output_buffer( - &self, - payload_len: u32, - pad_len: u8, - csrc_count: u8, - ) -> Result; + fn allocate_output_buffer(&self, payload_len: u32, pad_len: u8, csrc_count: u8) -> gst::Buffer; #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] @@ -289,20 +284,14 @@ pub trait RTPBasePayloadExt: 'static { impl> RTPBasePayloadExt for O { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] - fn allocate_output_buffer( - &self, - payload_len: u32, - pad_len: u8, - csrc_count: u8, - ) -> Result { + fn allocate_output_buffer(&self, payload_len: u32, pad_len: u8, csrc_count: u8) -> gst::Buffer { unsafe { - Option::<_>::from_glib_full(ffi::gst_rtp_base_payload_allocate_output_buffer( + from_glib_full(ffi::gst_rtp_base_payload_allocate_output_buffer( self.as_ref().to_glib_none().0, payload_len, pad_len, csrc_count, )) - .ok_or_else(|| glib::bool_error!("Failed to allocate output buffer")) } } diff --git a/gstreamer-rtp/src/auto/versions.txt b/gstreamer-rtp/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-rtp/src/auto/versions.txt +++ b/gstreamer-rtp/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-rtp/sys/Cargo.toml b/gstreamer-rtp/sys/Cargo.toml index 10d6054e4..647ee32bc 100644 --- a/gstreamer-rtp/sys/Cargo.toml +++ b/gstreamer-rtp/sys/Cargo.toml @@ -25,7 +25,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gst/dox", "gst_base/dox"] [lib] name = "gstreamer_rtp_sys" diff --git a/gstreamer-rtp/sys/build.rs b/gstreamer-rtp/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-rtp/sys/build.rs +++ b/gstreamer-rtp/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-rtp/sys/src/auto/versions.txt b/gstreamer-rtp/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-rtp/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-rtp/sys/src/lib.rs b/gstreamer-rtp/sys/src/lib.rs index 77302388f..113f421df 100644 --- a/gstreamer-rtp/sys/src/lib.rs +++ b/gstreamer-rtp/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-rtp/sys/tests/abi.rs b/gstreamer-rtp/sys/tests/abi.rs index 66e78f703..9c05677ab 100644 --- a/gstreamer-rtp/sys/tests/abi.rs +++ b/gstreamer-rtp/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_rtp_sys::*; diff --git a/gstreamer-rtp/sys/tests/constant.c b/gstreamer-rtp/sys/tests/constant.c index 33f7c854d..64ff38a0c 100644 --- a/gstreamer-rtp/sys/tests/constant.c +++ b/gstreamer-rtp/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtp/sys/tests/layout.c b/gstreamer-rtp/sys/tests/layout.c index 7142bd539..b4b18c95e 100644 --- a/gstreamer-rtp/sys/tests/layout.c +++ b/gstreamer-rtp/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs index bda761119..7b7fceeb3 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs @@ -109,7 +109,7 @@ pub trait RTSPAuthExt: 'static { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(alias = "gst_rtsp_auth_set_realm")] - fn set_realm(&self, realm: &str); + fn set_realm(&self, realm: Option<&str>); #[doc(alias = "gst_rtsp_auth_set_supported_methods")] fn set_supported_methods(&self, methods: gst_rtsp::RTSPAuthMethod); @@ -229,7 +229,7 @@ impl> RTSPAuthExt for O { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] - fn set_realm(&self, realm: &str) { + fn set_realm(&self, realm: Option<&str>) { unsafe { ffi::gst_rtsp_auth_set_realm(self.as_ref().to_glib_none().0, realm.to_glib_none().0); } diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_media.rs index cc89b341f..bbd520e5d 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_media.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_media.rs @@ -58,7 +58,7 @@ pub trait RTSPMediaExt: 'static { &self, payloader: &impl IsA, pad: &impl IsA, - ) -> Option; + ) -> RTSPStream; #[doc(alias = "gst_rtsp_media_find_stream")] fn find_stream(&self, control: &str) -> Option; @@ -93,7 +93,7 @@ pub trait RTSPMediaExt: 'static { #[doc(alias = "gst_rtsp_media_get_element")] #[doc(alias = "get_element")] - fn element(&self) -> Option; + fn element(&self) -> gst::Element; #[doc(alias = "gst_rtsp_media_get_latency")] #[doc(alias = "get_latency")] @@ -480,7 +480,7 @@ impl> RTSPMediaExt for O { &self, payloader: &impl IsA, pad: &impl IsA, - ) -> Option { + ) -> RTSPStream { unsafe { from_glib_none(ffi::gst_rtsp_media_create_stream( self.as_ref().to_glib_none().0, @@ -543,7 +543,7 @@ impl> RTSPMediaExt for O { unsafe { ffi::gst_rtsp_media_get_dscp_qos(self.as_ref().to_glib_none().0) } } - fn element(&self) -> Option { + fn element(&self) -> gst::Element { unsafe { from_glib_full(ffi::gst_rtsp_media_get_element( self.as_ref().to_glib_none().0, 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 5be326295..14fe82e60 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs @@ -45,7 +45,7 @@ unsafe impl Sync for RTSPMediaFactoryURI {} pub trait RTSPMediaFactoryURIExt: 'static { #[doc(alias = "gst_rtsp_media_factory_uri_get_uri")] #[doc(alias = "get_uri")] - fn uri(&self) -> Option; + fn uri(&self) -> glib::GString; #[doc(alias = "gst_rtsp_media_factory_uri_set_uri")] fn set_uri(&self, uri: &str); @@ -67,7 +67,7 @@ pub trait RTSPMediaFactoryURIExt: 'static { } impl> RTSPMediaFactoryURIExt for O { - fn uri(&self) -> Option { + fn uri(&self) -> glib::GString { unsafe { from_glib_full(ffi::gst_rtsp_media_factory_uri_get_uri( self.as_ref().to_glib_none().0, diff --git a/gstreamer-rtsp-server/src/auto/rtsp_onvif_media_factory.rs b/gstreamer-rtsp-server/src/auto/rtsp_onvif_media_factory.rs index f5e2c19c1..a48e99675 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_onvif_media_factory.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_onvif_media_factory.rs @@ -59,7 +59,7 @@ pub trait RTSPOnvifMediaFactoryExt: 'static { fn set_backchannel_bandwidth(&self, bandwidth: u32); #[doc(alias = "gst_rtsp_onvif_media_factory_set_backchannel_launch")] - fn set_backchannel_launch(&self, launch: &str); + fn set_backchannel_launch(&self, launch: Option<&str>); #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] @@ -111,7 +111,7 @@ impl> RTSPOnvifMediaFactoryExt for O { } } - fn set_backchannel_launch(&self, launch: &str) { + fn set_backchannel_launch(&self, launch: Option<&str>) { unsafe { ffi::gst_rtsp_onvif_media_factory_set_backchannel_launch( self.as_ref().to_glib_none().0, diff --git a/gstreamer-rtsp-server/src/auto/rtsp_server.rs b/gstreamer-rtsp-server/src/auto/rtsp_server.rs index 5ff4813cb..4e5d718d6 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_server.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_server.rs @@ -114,7 +114,7 @@ pub trait RTSPServerExt: 'static { #[doc(alias = "gst_rtsp_server_get_service")] #[doc(alias = "get_service")] - fn service(&self) -> Option; + fn service(&self) -> glib::GString; #[doc(alias = "gst_rtsp_server_get_session_pool")] #[doc(alias = "get_session_pool")] @@ -326,7 +326,7 @@ impl> RTSPServerExt for O { } } - fn service(&self) -> Option { + fn service(&self) -> glib::GString { unsafe { from_glib_full(ffi::gst_rtsp_server_get_service( self.as_ref().to_glib_none().0, diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session.rs b/gstreamer-rtsp-server/src/auto/rtsp_session.rs index 1f5bcc029..36f1156db 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_session.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_session.rs @@ -67,11 +67,7 @@ pub trait RTSPSessionExt: 'static { fn is_expired_usec(&self, now: i64) -> bool; #[doc(alias = "gst_rtsp_session_manage_media")] - fn manage_media( - &self, - path: &str, - media: &impl IsA, - ) -> Result; + fn manage_media(&self, path: &str, media: &impl IsA) -> RTSPSessionMedia; //#[doc(alias = "gst_rtsp_session_next_timeout")] //fn next_timeout(&self, now: /*Ignored*/&mut glib::TimeVal) -> i32; @@ -204,18 +200,13 @@ impl> RTSPSessionExt for O { } } - fn manage_media( - &self, - path: &str, - media: &impl IsA, - ) -> Result { + fn manage_media(&self, path: &str, media: &impl IsA) -> RTSPSessionMedia { unsafe { - Option::<_>::from_glib_none(ffi::gst_rtsp_session_manage_media( + from_glib_none(ffi::gst_rtsp_session_manage_media( self.as_ref().to_glib_none().0, path.to_glib_none().0, media.as_ref().to_glib_full(), )) - .ok_or_else(|| glib::bool_error!("Failed to manage media")) } } diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs index 6055af50e..e7404a859 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs @@ -74,7 +74,7 @@ pub trait RTSPSessionMediaExt: 'static { fn set_state(&self, state: gst::State) -> Result<(), glib::error::BoolError>; //#[doc(alias = "gst_rtsp_session_media_set_transport")] - //fn set_transport(&self, stream: &impl IsA, tr: /*Ignored*/&mut gst_rtsp::RTSPTransport) -> Option; + //fn set_transport(&self, stream: &impl IsA, tr: /*Ignored*/&mut gst_rtsp::RTSPTransport) -> RTSPStreamTransport; } impl> RTSPSessionMediaExt for O { @@ -159,7 +159,7 @@ impl> RTSPSessionMediaExt for O { } } - //fn set_transport(&self, stream: &impl IsA, tr: /*Ignored*/&mut gst_rtsp::RTSPTransport) -> Option { + //fn set_transport(&self, stream: &impl IsA, tr: /*Ignored*/&mut gst_rtsp::RTSPTransport) -> RTSPStreamTransport { // unsafe { TODO: call ffi:gst_rtsp_session_media_set_transport() } //} } diff --git a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs index ff9584887..5db8a976c 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs @@ -123,7 +123,7 @@ pub trait RTSPStreamExt: 'static { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(alias = "gst_rtsp_stream_get_multicast_client_addresses")] #[doc(alias = "get_multicast_client_addresses")] - fn multicast_client_addresses(&self) -> Option; + fn multicast_client_addresses(&self) -> glib::GString; #[doc(alias = "gst_rtsp_stream_get_multicast_iface")] #[doc(alias = "get_multicast_iface")] @@ -561,7 +561,7 @@ impl> RTSPStreamExt for O { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] - fn multicast_client_addresses(&self) -> Option { + fn multicast_client_addresses(&self) -> glib::GString { unsafe { from_glib_full(ffi::gst_rtsp_stream_get_multicast_client_addresses( self.as_ref().to_glib_none().0, diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-rtsp-server/src/auto/versions.txt +++ b/gstreamer-rtsp-server/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-rtsp-server/sys/Cargo.toml b/gstreamer-rtsp-server/sys/Cargo.toml index 2a06998d4..7c6a9f872 100644 --- a/gstreamer-rtsp-server/sys/Cargo.toml +++ b/gstreamer-rtsp-server/sys/Cargo.toml @@ -41,7 +41,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gio/dox", "gst/dox", "gst_net/dox", "gst_sdp/dox", "gst_rtsp/dox"] [lib] name = "gstreamer_rtsp_server_sys" diff --git a/gstreamer-rtsp-server/sys/build.rs b/gstreamer-rtsp-server/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-rtsp-server/sys/build.rs +++ b/gstreamer-rtsp-server/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-rtsp-server/sys/src/auto/versions.txt b/gstreamer-rtsp-server/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-rtsp-server/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-rtsp-server/sys/src/lib.rs b/gstreamer-rtsp-server/sys/src/lib.rs index 3aa74ff70..76d005f62 100644 --- a/gstreamer-rtsp-server/sys/src/lib.rs +++ b/gstreamer-rtsp-server/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-rtsp-server/sys/tests/abi.rs b/gstreamer-rtsp-server/sys/tests/abi.rs index 30acb2738..b12aacf67 100644 --- a/gstreamer-rtsp-server/sys/tests/abi.rs +++ b/gstreamer-rtsp-server/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_rtsp_server_sys::*; diff --git a/gstreamer-rtsp-server/sys/tests/constant.c b/gstreamer-rtsp-server/sys/tests/constant.c index 990c6c4ce..bc733e7af 100644 --- a/gstreamer-rtsp-server/sys/tests/constant.c +++ b/gstreamer-rtsp-server/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtsp-server/sys/tests/layout.c b/gstreamer-rtsp-server/sys/tests/layout.c index 924b56514..41b355707 100644 --- a/gstreamer-rtsp-server/sys/tests/layout.c +++ b/gstreamer-rtsp-server/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtsp/src/auto/rtsp_url.rs b/gstreamer-rtsp/src/auto/rtsp_url.rs index f613c9f26..ed2c0ac9e 100644 --- a/gstreamer-rtsp/src/auto/rtsp_url.rs +++ b/gstreamer-rtsp/src/auto/rtsp_url.rs @@ -30,7 +30,7 @@ impl RTSPUrl { #[doc(alias = "gst_rtsp_url_get_request_uri")] #[doc(alias = "get_request_uri")] - pub fn request_uri(&self) -> Option { + pub fn request_uri(&self) -> glib::GString { unsafe { from_glib_full(ffi::gst_rtsp_url_get_request_uri(self.to_glib_none().0)) } } @@ -38,7 +38,7 @@ impl RTSPUrl { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(alias = "gst_rtsp_url_get_request_uri_with_control")] #[doc(alias = "get_request_uri_with_control")] - pub fn request_uri_with_control(&self, control_path: &str) -> Option { + pub fn request_uri_with_control(&self, control_path: &str) -> glib::GString { unsafe { from_glib_full(ffi::gst_rtsp_url_get_request_uri_with_control( self.to_glib_none().0, @@ -53,7 +53,7 @@ impl RTSPUrl { } #[doc(alias = "gst_rtsp_url_parse")] - pub fn parse(urlstr: &str) -> (RTSPResult, RTSPUrl) { + pub fn parse(urlstr: &str) -> (RTSPResult, Option) { assert_initialized_main_thread!(); unsafe { let mut url = ptr::null_mut(); diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-rtsp/src/auto/versions.txt +++ b/gstreamer-rtsp/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-rtsp/sys/Cargo.toml b/gstreamer-rtsp/sys/Cargo.toml index 94cbd02c9..d2819c400 100644 --- a/gstreamer-rtsp/sys/Cargo.toml +++ b/gstreamer-rtsp/sys/Cargo.toml @@ -33,7 +33,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gio/dox", "gst/dox", "gst_sdp/dox"] [lib] name = "gstreamer_rtsp_sys" diff --git a/gstreamer-rtsp/sys/build.rs b/gstreamer-rtsp/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-rtsp/sys/build.rs +++ b/gstreamer-rtsp/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-rtsp/sys/src/auto/versions.txt b/gstreamer-rtsp/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-rtsp/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-rtsp/sys/src/lib.rs b/gstreamer-rtsp/sys/src/lib.rs index 81dca8efe..4d312384a 100644 --- a/gstreamer-rtsp/sys/src/lib.rs +++ b/gstreamer-rtsp/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] @@ -1069,19 +1069,6 @@ extern "C" { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] pub fn gst_rtsp_message_has_body_buffer(msg: *const GstRTSPMessage) -> gboolean; - pub fn gst_rtsp_message_init(msg: *mut GstRTSPMessage) -> GstRTSPResult; - pub fn gst_rtsp_message_init_data(msg: *mut GstRTSPMessage, channel: u8) -> GstRTSPResult; - pub fn gst_rtsp_message_init_request( - msg: *mut GstRTSPMessage, - method: GstRTSPMethod, - uri: *const c_char, - ) -> GstRTSPResult; - pub fn gst_rtsp_message_init_response( - msg: *mut GstRTSPMessage, - code: GstRTSPStatusCode, - reason: *const c_char, - request: *const GstRTSPMessage, - ) -> GstRTSPResult; pub fn gst_rtsp_message_parse_auth_credentials( msg: *mut GstRTSPMessage, field: GstRTSPHeaderField, @@ -1183,7 +1170,6 @@ extern "C" { transport: *mut GstRTSPTransport, media_type: *mut *const c_char, ) -> GstRTSPResult; - pub fn gst_rtsp_transport_init(transport: *mut GstRTSPTransport) -> GstRTSPResult; pub fn gst_rtsp_transport_get_manager( trans: GstRTSPTransMode, manager: *mut *const c_char, @@ -1193,6 +1179,7 @@ extern "C" { trans: GstRTSPTransMode, mime: *mut *const c_char, ) -> GstRTSPResult; + pub fn gst_rtsp_transport_init(transport: *mut GstRTSPTransport) -> GstRTSPResult; pub fn gst_rtsp_transport_new(transport: *mut *mut GstRTSPTransport) -> GstRTSPResult; pub fn gst_rtsp_transport_parse( str: *const c_char, @@ -1348,6 +1335,19 @@ extern "C" { ) -> *mut c_char; pub fn gst_rtsp_header_allow_multiple(field: GstRTSPHeaderField) -> gboolean; pub fn gst_rtsp_header_as_text(field: GstRTSPHeaderField) -> *const c_char; + pub fn gst_rtsp_message_init(msg: *mut GstRTSPMessage) -> GstRTSPResult; + pub fn gst_rtsp_message_init_data(msg: *mut GstRTSPMessage, channel: u8) -> GstRTSPResult; + pub fn gst_rtsp_message_init_request( + msg: *mut GstRTSPMessage, + method: GstRTSPMethod, + uri: *const c_char, + ) -> GstRTSPResult; + pub fn gst_rtsp_message_init_response( + msg: *mut GstRTSPMessage, + code: GstRTSPStatusCode, + reason: *const c_char, + request: *const GstRTSPMessage, + ) -> GstRTSPResult; pub fn gst_rtsp_message_new(msg: *mut *mut GstRTSPMessage) -> GstRTSPResult; pub fn gst_rtsp_message_new_data(msg: *mut *mut GstRTSPMessage, channel: u8) -> GstRTSPResult; pub fn gst_rtsp_message_new_request( diff --git a/gstreamer-rtsp/sys/tests/abi.rs b/gstreamer-rtsp/sys/tests/abi.rs index 75ed52fe8..0458aa1c7 100644 --- a/gstreamer-rtsp/sys/tests/abi.rs +++ b/gstreamer-rtsp/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_rtsp_sys::*; diff --git a/gstreamer-rtsp/sys/tests/constant.c b/gstreamer-rtsp/sys/tests/constant.c index 820247a68..2639b6b7d 100644 --- a/gstreamer-rtsp/sys/tests/constant.c +++ b/gstreamer-rtsp/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtsp/sys/tests/layout.c b/gstreamer-rtsp/sys/tests/layout.c index 042f68f10..b73ebf5e8 100644 --- a/gstreamer-rtsp/sys/tests/layout.c +++ b/gstreamer-rtsp/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-sdp/src/auto/versions.txt +++ b/gstreamer-sdp/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-sdp/sys/Cargo.toml b/gstreamer-sdp/sys/Cargo.toml index dd7f87f9d..51de3fb92 100644 --- a/gstreamer-sdp/sys/Cargo.toml +++ b/gstreamer-sdp/sys/Cargo.toml @@ -21,7 +21,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gst/dox"] [lib] name = "gstreamer_sdp_sys" diff --git a/gstreamer-sdp/sys/build.rs b/gstreamer-sdp/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-sdp/sys/build.rs +++ b/gstreamer-sdp/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-sdp/sys/src/auto/versions.txt b/gstreamer-sdp/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-sdp/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-sdp/sys/src/lib.rs b/gstreamer-sdp/sys/src/lib.rs index 20bd968a1..595926233 100644 --- a/gstreamer-sdp/sys/src/lib.rs +++ b/gstreamer-sdp/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] @@ -831,7 +831,6 @@ extern "C" { pub fn gst_sdp_media_get_num_ports(media: *const GstSDPMedia) -> c_uint; pub fn gst_sdp_media_get_port(media: *const GstSDPMedia) -> c_uint; pub fn gst_sdp_media_get_proto(media: *const GstSDPMedia) -> *const c_char; - pub fn gst_sdp_media_init(media: *mut GstSDPMedia) -> GstSDPResult; pub fn gst_sdp_media_insert_attribute( media: *mut GstSDPMedia, idx: c_int, @@ -897,6 +896,7 @@ extern "C" { ) -> GstSDPResult; pub fn gst_sdp_media_set_proto(media: *mut GstSDPMedia, proto: *const c_char) -> GstSDPResult; pub fn gst_sdp_media_uninit(media: *mut GstSDPMedia) -> GstSDPResult; + pub fn gst_sdp_media_init(media: *mut GstSDPMedia) -> GstSDPResult; pub fn gst_sdp_media_new(media: *mut *mut GstSDPMedia) -> GstSDPResult; pub fn gst_sdp_media_set_media_from_caps( caps: *const gst::GstCaps, @@ -979,7 +979,6 @@ extern "C" { pub fn gst_sdp_message_get_uri(msg: *const GstSDPMessage) -> *const c_char; pub fn gst_sdp_message_get_version(msg: *const GstSDPMessage) -> *const c_char; pub fn gst_sdp_message_get_zone(msg: *const GstSDPMessage, idx: c_uint) -> *const GstSDPZone; - pub fn gst_sdp_message_init(msg: *mut GstSDPMessage) -> GstSDPResult; pub fn gst_sdp_message_insert_attribute( msg: *mut GstSDPMessage, idx: c_int, @@ -1091,6 +1090,7 @@ extern "C" { pub fn gst_sdp_message_uninit(msg: *mut GstSDPMessage) -> GstSDPResult; pub fn gst_sdp_message_zones_len(msg: *const GstSDPMessage) -> c_uint; pub fn gst_sdp_message_as_uri(scheme: *const c_char, msg: *const GstSDPMessage) -> *mut c_char; + pub fn gst_sdp_message_init(msg: *mut GstSDPMessage) -> GstSDPResult; pub fn gst_sdp_message_new(msg: *mut *mut GstSDPMessage) -> GstSDPResult; #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] diff --git a/gstreamer-sdp/sys/tests/abi.rs b/gstreamer-sdp/sys/tests/abi.rs index 7d06a3a48..46a35adbd 100644 --- a/gstreamer-sdp/sys/tests/abi.rs +++ b/gstreamer-sdp/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_sdp_sys::*; diff --git a/gstreamer-sdp/sys/tests/constant.c b/gstreamer-sdp/sys/tests/constant.c index 27e05c729..087cbe1c0 100644 --- a/gstreamer-sdp/sys/tests/constant.c +++ b/gstreamer-sdp/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-sdp/sys/tests/layout.c b/gstreamer-sdp/sys/tests/layout.c index b59a487e0..1907d368b 100644 --- a/gstreamer-sdp/sys/tests/layout.c +++ b/gstreamer-sdp/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-tag/sys/Cargo.toml b/gstreamer-tag/sys/Cargo.toml index 1eef64d34..1af967084 100644 --- a/gstreamer-tag/sys/Cargo.toml +++ b/gstreamer-tag/sys/Cargo.toml @@ -25,7 +25,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gst/dox"] [lib] name = "gstreamer_tag_sys" diff --git a/gstreamer-tag/sys/build.rs b/gstreamer-tag/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-tag/sys/build.rs +++ b/gstreamer-tag/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-tag/sys/src/auto/versions.txt b/gstreamer-tag/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-tag/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-tag/sys/src/lib.rs b/gstreamer-tag/sys/src/lib.rs index d64f52e6e..4635bb1e4 100644 --- a/gstreamer-tag/sys/src/lib.rs +++ b/gstreamer-tag/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-tag/sys/tests/abi.rs b/gstreamer-tag/sys/tests/abi.rs index 6d6f5efda..57b12c70a 100644 --- a/gstreamer-tag/sys/tests/abi.rs +++ b/gstreamer-tag/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_tag_sys::*; diff --git a/gstreamer-tag/sys/tests/constant.c b/gstreamer-tag/sys/tests/constant.c index d6c795c95..998cf32a8 100644 --- a/gstreamer-tag/sys/tests/constant.c +++ b/gstreamer-tag/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-tag/sys/tests/layout.c b/gstreamer-tag/sys/tests/layout.c index 35cd26d7b..57224d68e 100644 --- a/gstreamer-tag/sys/tests/layout.c +++ b/gstreamer-tag/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-validate/src/auto/enums.rs b/gstreamer-validate/src/auto/enums.rs index 628bdc4ef..8a947af17 100644 --- a/gstreamer-validate/src/auto/enums.rs +++ b/gstreamer-validate/src/auto/enums.rs @@ -8,6 +8,8 @@ use glib::value::FromValue; use glib::value::ToValue; use glib::StaticType; use glib::Type; +use std::ffi::CStr; +use std::fmt; #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[non_exhaustive] @@ -42,11 +44,23 @@ impl ReportLevel { } } - #[doc(alias = "gst_validate_report_level_get_name")] - #[doc(alias = "get_name")] - pub fn name(self) -> Option { - assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gst_validate_report_level_get_name(self.into_glib())) } + pub fn name<'a>(self) -> &'a str { + unsafe { + CStr::from_ptr( + ffi::gst_validate_report_level_get_name(self.into_glib()) + .as_ref() + .expect("gst_validate_report_level_get_name returned NULL"), + ) + .to_str() + .expect("gst_validate_report_level_get_name returned an invalid string") + } + } +} + +impl fmt::Display for ReportLevel { + #[inline] + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + f.write_str(&self.name()) } } diff --git a/gstreamer-validate/src/auto/monitor.rs b/gstreamer-validate/src/auto/monitor.rs index ce0299ca8..aeea7c9e2 100644 --- a/gstreamer-validate/src/auto/monitor.rs +++ b/gstreamer-validate/src/auto/monitor.rs @@ -32,7 +32,7 @@ impl Monitor { target: &impl IsA, runner: &impl IsA, parent: Option<&impl IsA>, - ) -> Option { + ) -> Monitor { skip_assert_initialized!(); unsafe { from_glib_full(ffi::gst_validate_monitor_factory_create( diff --git a/gstreamer-validate/src/auto/report.rs b/gstreamer-validate/src/auto/report.rs index d1a8ed402..5856d91a4 100644 --- a/gstreamer-validate/src/auto/report.rs +++ b/gstreamer-validate/src/auto/report.rs @@ -68,7 +68,7 @@ impl Report { #[doc(alias = "gst_validate_report_get_issue")] #[doc(alias = "get_issue")] - pub fn issue(&self) -> Option { + pub fn issue(&self) -> Issue { unsafe { from_glib_full(ffi::gst_validate_report_get_issue(self.to_glib_none().0)) } } @@ -86,19 +86,19 @@ impl Report { #[doc(alias = "gst_validate_report_get_message")] #[doc(alias = "get_message")] - pub fn message(&self) -> Option { + pub fn message(&self) -> glib::GString { unsafe { from_glib_full(ffi::gst_validate_report_get_message(self.to_glib_none().0)) } } #[doc(alias = "gst_validate_report_get_reporter")] #[doc(alias = "get_reporter")] - pub fn reporter(&self) -> Option { + pub fn reporter(&self) -> Reporter { unsafe { from_glib_full(ffi::gst_validate_report_get_reporter(self.to_glib_none().0)) } } #[doc(alias = "gst_validate_report_get_reporter_name")] #[doc(alias = "get_reporter_name")] - pub fn reporter_name(&self) -> Option { + pub fn reporter_name(&self) -> glib::GString { unsafe { from_glib_full(ffi::gst_validate_report_get_reporter_name( self.to_glib_none().0, diff --git a/gstreamer-validate/src/auto/reporter.rs b/gstreamer-validate/src/auto/reporter.rs index 3e6aa0c56..0508858cd 100644 --- a/gstreamer-validate/src/auto/reporter.rs +++ b/gstreamer-validate/src/auto/reporter.rs @@ -68,7 +68,7 @@ pub trait ReporterExt: 'static { fn set_handle_g_logs(&self); #[doc(alias = "gst_validate_reporter_set_name")] - fn set_name(&self, name: &str); + fn set_name(&self, name: Option<&str>); #[doc(alias = "gst_validate_reporter_set_runner")] fn set_runner(&self, runner: &impl IsA); @@ -148,7 +148,7 @@ impl> ReporterExt for O { } } - fn set_name(&self, name: &str) { + fn set_name(&self, name: Option<&str>) { unsafe { ffi::gst_validate_reporter_set_name( self.as_ref().to_glib_none().0, diff --git a/gstreamer-validate/src/auto/versions.txt b/gstreamer-validate/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-validate/src/auto/versions.txt +++ b/gstreamer-validate/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-validate/sys/Cargo.toml b/gstreamer-validate/sys/Cargo.toml index 7bbb1cf2f..d366846e6 100644 --- a/gstreamer-validate/sys/Cargo.toml +++ b/gstreamer-validate/sys/Cargo.toml @@ -48,4 +48,4 @@ shell-words = "1.0.0" tempfile = "3" [features] -dox = [] +dox = ["glib/dox", "gio/dox", "gobject/dox", "gst/dox"] diff --git a/gstreamer-validate/sys/build.rs b/gstreamer-validate/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-validate/sys/build.rs +++ b/gstreamer-validate/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-validate/sys/src/auto/versions.txt b/gstreamer-validate/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-validate/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-validate/sys/src/lib.rs b/gstreamer-validate/sys/src/lib.rs index 6fb0fa685..3911e57ba 100644 --- a/gstreamer-validate/sys/src/lib.rs +++ b/gstreamer-validate/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-validate/sys/tests/abi.rs b/gstreamer-validate/sys/tests/abi.rs index 8d03d4a4c..2dbd527d9 100644 --- a/gstreamer-validate/sys/tests/abi.rs +++ b/gstreamer-validate/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_validate_sys::*; diff --git a/gstreamer-validate/sys/tests/constant.c b/gstreamer-validate/sys/tests/constant.c index de23b7139..cc23e7f15 100644 --- a/gstreamer-validate/sys/tests/constant.c +++ b/gstreamer-validate/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-validate/sys/tests/layout.c b/gstreamer-validate/sys/tests/layout.c index f1f9df10c..e5349c816 100644 --- a/gstreamer-validate/sys/tests/layout.c +++ b/gstreamer-validate/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-video/src/auto/enums.rs b/gstreamer-video/src/auto/enums.rs index 68a203cdd..37c6ee010 100644 --- a/gstreamer-video/src/auto/enums.rs +++ b/gstreamer-video/src/auto/enums.rs @@ -810,7 +810,7 @@ impl VideoCaptionType { } #[doc(alias = "gst_video_caption_type_to_caps")] - pub fn to_caps(self) -> Option { + pub fn to_caps(self) -> gst::Caps { assert_initialized_main_thread!(); unsafe { from_glib_full(ffi::gst_video_caption_type_to_caps(self.into_glib())) } } @@ -1131,7 +1131,7 @@ impl VideoColorPrimaries { //#[doc(alias = "gst_video_color_primaries_get_info")] //#[doc(alias = "get_info")] - //pub fn info(self) -> /*Ignored*/Option { + //pub fn info(self) -> /*Ignored*/VideoColorPrimariesInfo { // unsafe { TODO: call ffi:gst_video_color_primaries_get_info() } //} diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-video/src/auto/versions.txt +++ b/gstreamer-video/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-video/src/auto/video_aggregator.rs b/gstreamer-video/src/auto/video_aggregator.rs index 4209af484..145a49b5e 100644 --- a/gstreamer-video/src/auto/video_aggregator.rs +++ b/gstreamer-video/src/auto/video_aggregator.rs @@ -26,13 +26,13 @@ pub trait VideoAggregatorExt: 'static { //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))] //#[doc(alias = "gst_video_aggregator_get_execution_task_pool")] //#[doc(alias = "get_execution_task_pool")] - //fn execution_task_pool(&self) -> /*Ignored*/Option; + //fn execution_task_pool(&self) -> /*Ignored*/gst::TaskPool; } impl> VideoAggregatorExt for O { //#[cfg(any(feature = "v1_20", feature = "dox"))] //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))] - //fn execution_task_pool(&self) -> /*Ignored*/Option { + //fn execution_task_pool(&self) -> /*Ignored*/gst::TaskPool { // unsafe { TODO: call ffi:gst_video_aggregator_get_execution_task_pool() } //} } diff --git a/gstreamer-video/src/auto/video_encoder.rs b/gstreamer-video/src/auto/video_encoder.rs index ee5d6bec2..15e75c530 100644 --- a/gstreamer-video/src/auto/video_encoder.rs +++ b/gstreamer-video/src/auto/video_encoder.rs @@ -32,7 +32,7 @@ unsafe impl Sync for VideoEncoder {} pub trait VideoEncoderExt: 'static { #[doc(alias = "gst_video_encoder_allocate_output_buffer")] - fn allocate_output_buffer(&self, size: usize) -> Result; + fn allocate_output_buffer(&self, size: usize) -> gst::Buffer; #[doc(alias = "gst_video_encoder_get_max_encode_time")] #[doc(alias = "get_max_encode_time")] @@ -84,13 +84,12 @@ pub trait VideoEncoderExt: 'static { } impl> VideoEncoderExt for O { - fn allocate_output_buffer(&self, size: usize) -> Result { + fn allocate_output_buffer(&self, size: usize) -> gst::Buffer { unsafe { - Option::<_>::from_glib_full(ffi::gst_video_encoder_allocate_output_buffer( + from_glib_full(ffi::gst_video_encoder_allocate_output_buffer( self.as_ref().to_glib_none().0, size, )) - .ok_or_else(|| glib::bool_error!("Failed to allocate output buffer")) } } diff --git a/gstreamer-video/sys/Cargo.toml b/gstreamer-video/sys/Cargo.toml index 0d4896755..5cd911bbf 100644 --- a/gstreamer-video/sys/Cargo.toml +++ b/gstreamer-video/sys/Cargo.toml @@ -29,7 +29,7 @@ v1_16 = [] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gobject/dox", "gst/dox", "gst_base/dox"] [lib] name = "gstreamer_video_sys" diff --git a/gstreamer-video/sys/build.rs b/gstreamer-video/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-video/sys/build.rs +++ b/gstreamer-video/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-video/sys/src/auto/versions.txt b/gstreamer-video/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-video/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-video/sys/src/lib.rs b/gstreamer-video/sys/src/lib.rs index 39baeb6f2..9f5ab62ef 100644 --- a/gstreamer-video/sys/src/lib.rs +++ b/gstreamer-video/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-video/sys/tests/abi.rs b/gstreamer-video/sys/tests/abi.rs index 002e3267b..c8adacc4a 100644 --- a/gstreamer-video/sys/tests/abi.rs +++ b/gstreamer-video/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_video_sys::*; diff --git a/gstreamer-video/sys/tests/constant.c b/gstreamer-video/sys/tests/constant.c index 46476d30a..c1bcb6e68 100644 --- a/gstreamer-video/sys/tests/constant.c +++ b/gstreamer-video/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-video/sys/tests/layout.c b/gstreamer-video/sys/tests/layout.c index 3a7b33ed7..1d6610f4b 100644 --- a/gstreamer-video/sys/tests/layout.c +++ b/gstreamer-video/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer-webrtc/src/auto/versions.txt +++ b/gstreamer-webrtc/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-webrtc/src/auto/web_rtcice.rs b/gstreamer-webrtc/src/auto/web_rtcice.rs index 2fd2008b5..0768c66ce 100644 --- a/gstreamer-webrtc/src/auto/web_rtcice.rs +++ b/gstreamer-webrtc/src/auto/web_rtcice.rs @@ -109,13 +109,13 @@ pub trait WebRTCICEExt: 'static { ) -> bool; #[doc(alias = "gst_webrtc_ice_set_stun_server")] - fn set_stun_server(&self, uri: &str); + fn set_stun_server(&self, uri: Option<&str>); #[doc(alias = "gst_webrtc_ice_set_tos")] fn set_tos(&self, stream: &impl IsA, tos: u32); #[doc(alias = "gst_webrtc_ice_set_turn_server")] - fn set_turn_server(&self, uri: &str); + fn set_turn_server(&self, uri: Option<&str>); #[cfg(any(feature = "v1_20", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))] @@ -319,7 +319,7 @@ impl> WebRTCICEExt for O { unsafe extern "C" fn func_func( ice: *mut ffi::GstWebRTCICE, stream_id: libc::c_uint, - candidate: *mut libc::c_char, + candidate: *const libc::c_char, user_data: glib::ffi::gpointer, ) { let ice = from_glib_borrow(ice); @@ -361,7 +361,7 @@ impl> WebRTCICEExt for O { } } - fn set_stun_server(&self, uri: &str) { + fn set_stun_server(&self, uri: Option<&str>) { unsafe { ffi::gst_webrtc_ice_set_stun_server( self.as_ref().to_glib_none().0, @@ -380,7 +380,7 @@ impl> WebRTCICEExt for O { } } - fn set_turn_server(&self, uri: &str) { + fn set_turn_server(&self, uri: Option<&str>) { unsafe { ffi::gst_webrtc_ice_set_turn_server( self.as_ref().to_glib_none().0, diff --git a/gstreamer-webrtc/sys/Cargo.toml b/gstreamer-webrtc/sys/Cargo.toml index 3906f8cd7..f1389be94 100644 --- a/gstreamer-webrtc/sys/Cargo.toml +++ b/gstreamer-webrtc/sys/Cargo.toml @@ -26,7 +26,7 @@ v1_16 = ["v1_14_1"] v1_18 = ["v1_16"] v1_20 = ["v1_18"] v1_22 = ["v1_20"] -dox = [] +dox = ["glib/dox", "gst_sdp/dox"] [lib] name = "gstreamer_webrtc_sys" diff --git a/gstreamer-webrtc/sys/build.rs b/gstreamer-webrtc/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer-webrtc/sys/build.rs +++ b/gstreamer-webrtc/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-webrtc/sys/src/auto/versions.txt b/gstreamer-webrtc/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer-webrtc/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer-webrtc/sys/src/lib.rs b/gstreamer-webrtc/sys/src/lib.rs index 414857ac5..4f6672583 100644 --- a/gstreamer-webrtc/sys/src/lib.rs +++ b/gstreamer-webrtc/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] @@ -158,7 +158,7 @@ pub const GST_WEBRTC_STATS_CERTIFICATE: GstWebRTCStatsType = 14; // Callbacks pub type GstWebRTCICEOnCandidateFunc = - Option; + Option; // Records #[repr(C)] @@ -228,16 +228,16 @@ pub struct GstWebRTCICEClass { unsafe extern "C" fn( *mut GstWebRTCICE, *mut GstWebRTCICEStream, - *mut c_char, - *mut c_char, + *const c_char, + *const c_char, ) -> gboolean, >, pub set_remote_credentials: Option< unsafe extern "C" fn( *mut GstWebRTCICE, *mut GstWebRTCICEStream, - *mut c_char, - *mut c_char, + *const c_char, + *const c_char, ) -> gboolean, >, pub add_turn_server: Option gboolean>, @@ -806,8 +806,8 @@ extern "C" { pub fn gst_webrtc_ice_set_local_credentials( ice: *mut GstWebRTCICE, stream: *mut GstWebRTCICEStream, - ufrag: *mut c_char, - pwd: *mut c_char, + ufrag: *const c_char, + pwd: *const c_char, ) -> gboolean; #[cfg(any(feature = "v1_22", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))] @@ -822,8 +822,8 @@ extern "C" { pub fn gst_webrtc_ice_set_remote_credentials( ice: *mut GstWebRTCICE, stream: *mut GstWebRTCICEStream, - ufrag: *mut c_char, - pwd: *mut c_char, + ufrag: *const c_char, + pwd: *const c_char, ) -> gboolean; #[cfg(any(feature = "v1_22", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))] @@ -871,7 +871,7 @@ extern "C" { ice: *mut GstWebRTCICETransport, stream_id: c_uint, component: GstWebRTCICEComponent, - attr: *mut c_char, + attr: *const c_char, ); pub fn gst_webrtc_ice_transport_selected_pair_change(ice: *mut GstWebRTCICETransport); diff --git a/gstreamer-webrtc/sys/tests/abi.rs b/gstreamer-webrtc/sys/tests/abi.rs index 6a2d8b73f..83a86970b 100644 --- a/gstreamer-webrtc/sys/tests/abi.rs +++ b/gstreamer-webrtc/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_webrtc_sys::*; diff --git a/gstreamer-webrtc/sys/tests/constant.c b/gstreamer-webrtc/sys/tests/constant.c index 855ca3317..5bd9e57ac 100644 --- a/gstreamer-webrtc/sys/tests/constant.c +++ b/gstreamer-webrtc/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-webrtc/sys/tests/layout.c b/gstreamer-webrtc/sys/tests/layout.c index 3f992a4c9..39b3a32aa 100644 --- a/gstreamer-webrtc/sys/tests/layout.c +++ b/gstreamer-webrtc/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer/src/auto/object.rs b/gstreamer/src/auto/object.rs index 43401b8f3..68ff716c4 100644 --- a/gstreamer/src/auto/object.rs +++ b/gstreamer/src/auto/object.rs @@ -99,7 +99,7 @@ pub trait GstObjectExt: 'static { //#[doc(alias = "gst_object_get_value_array")] //#[doc(alias = "get_value_array")] - //fn is_value_array(&self, property_name: &str, timestamp: impl Into>, interval: impl Into>, n_values: u32, values: /*Unimplemented*/Option) -> bool; + //fn is_value_array(&self, property_name: &str, timestamp: impl Into>, interval: impl Into>, values: /*Unimplemented*/&[&Basic: Pointer]) -> bool; #[doc(alias = "gst_object_has_active_control_bindings")] fn has_active_control_bindings(&self) -> bool; @@ -217,7 +217,7 @@ impl> GstObjectExt for O { } } - //fn is_value_array(&self, property_name: &str, timestamp: impl Into>, interval: impl Into>, n_values: u32, values: /*Unimplemented*/Option) -> bool { + //fn is_value_array(&self, property_name: &str, timestamp: impl Into>, interval: impl Into>, values: /*Unimplemented*/&[&Basic: Pointer]) -> bool { // unsafe { TODO: call ffi:gst_object_get_value_array() } //} diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt index 4133cf20b..a18bf5ca8 100644 --- a/gstreamer/src/auto/versions.txt +++ b/gstreamer/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer/sys/Cargo.toml b/gstreamer/sys/Cargo.toml index 24f69cd7e..8f86a760f 100644 --- a/gstreamer/sys/Cargo.toml +++ b/gstreamer/sys/Cargo.toml @@ -22,7 +22,7 @@ v1_18 = ["v1_16"] v1_18_3 = ["v1_18"] v1_20 = ["v1_18_3"] v1_22 = ["v1_20_4"] -dox = [] +dox = ["glib/dox", "gobject/dox"] v1_20_4 = ["v1_20"] [lib] diff --git a/gstreamer/sys/build.rs b/gstreamer/sys/build.rs index c8ef202cf..5762ce067 100644 --- a/gstreamer/sys/build.rs +++ b/gstreamer/sys/build.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer/sys/src/auto/versions.txt b/gstreamer/sys/src/auto/versions.txt new file mode 100644 index 000000000..a18bf5ca8 --- /dev/null +++ b/gstreamer/sys/src/auto/versions.txt @@ -0,0 +1,3 @@ +Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) +from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d0371b812964) diff --git a/gstreamer/sys/src/lib.rs b/gstreamer/sys/src/lib.rs index e316b996b..bc833b5a2 100644 --- a/gstreamer/sys/src/lib.rs +++ b/gstreamer/sys/src/lib.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer/sys/tests/abi.rs b/gstreamer/sys/tests/abi.rs index 5c647efff..2abc58a55 100644 --- a/gstreamer/sys/tests/abi.rs +++ b/gstreamer/sys/tests/abi.rs @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT use gstreamer_sys::*; diff --git a/gstreamer/sys/tests/constant.c b/gstreamer/sys/tests/constant.c index 51172632d..818456c22 100644 --- a/gstreamer/sys/tests/constant.c +++ b/gstreamer/sys/tests/constant.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer/sys/tests/layout.c b/gstreamer/sys/tests/layout.c index d8991e117..e83d24507 100644 --- a/gstreamer/sys/tests/layout.c +++ b/gstreamer/sys/tests/layout.c @@ -1,6 +1,6 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043) -// from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d) -// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 2860909848fa) +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git) // DO NOT EDIT #include "manual.h"