From ad24ab96389daf1c0b9ddca985f4573a795a5a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 21 Jan 2019 22:00:48 +0200 Subject: [PATCH] Regenerate everything with latest gir --- Gir_Gst.toml | 18 +- Gir_GstApp.toml | 4 +- Gir_GstBase.toml | 4 +- Gir_GstCheck.toml | 2 +- Gir_GstGL.toml | 14 +- Gir_GstNet.toml | 8 +- Gir_GstPbutils.toml | 15 +- Gir_GstPlayer.toml | 14 +- Gir_GstWebRTC.toml | 12 +- gstreamer-app/src/auto/app_sink.rs | 2 - gstreamer-app/src/auto/app_src.rs | 2 - gstreamer-app/src/auto/mod.rs | 4 +- gstreamer-app/src/auto/versions.txt | 2 +- gstreamer-audio/src/auto/versions.txt | 2 +- gstreamer-base/src/auto/adapter.rs | 2 - gstreamer-base/src/auto/mod.rs | 2 +- gstreamer-base/src/auto/versions.txt | 2 +- gstreamer-check/src/auto/mod.rs | 2 +- gstreamer-check/src/auto/test_clock.rs | 2 - gstreamer-check/src/auto/versions.txt | 2 +- .../src/auto/versions.txt | 2 +- gstreamer-gl/src/auto/gl_color_convert.rs | 2 - gstreamer-gl/src/auto/gl_display_egl.rs | 2 - .../src/auto/gl_overlay_compositor.rs | 2 - gstreamer-gl/src/auto/gl_shader.rs | 22 +- gstreamer-gl/src/auto/gl_upload.rs | 2 - gstreamer-gl/src/auto/gl_view_convert.rs | 2 - gstreamer-gl/src/auto/glsl_stage.rs | 2 - gstreamer-gl/src/auto/mod.rs | 14 +- gstreamer-gl/src/auto/versions.txt | 2 +- gstreamer-net/src/auto/mod.rs | 8 +- gstreamer-net/src/auto/net_client_clock.rs | 2 - gstreamer-net/src/auto/net_time_provider.rs | 2 - gstreamer-net/src/auto/ntp_clock.rs | 2 - gstreamer-net/src/auto/ptp_clock.rs | 2 - gstreamer-net/src/auto/versions.txt | 2 +- gstreamer-pbutils/src/auto/discoverer.rs | 2 - .../src/auto/discoverer_audio_info.rs | 2 - .../src/auto/discoverer_container_info.rs | 2 - gstreamer-pbutils/src/auto/discoverer_info.rs | 262 ++++++++---------- .../src/auto/discoverer_subtitle_info.rs | 2 - .../src/auto/discoverer_video_info.rs | 2 - .../src/auto/encoding_audio_profile.rs | 2 - .../src/auto/encoding_profile.rs | 4 +- gstreamer-pbutils/src/auto/encoding_target.rs | 113 +++----- .../src/auto/encoding_video_profile.rs | 2 - gstreamer-pbutils/src/auto/mod.rs | 22 +- gstreamer-pbutils/src/auto/versions.txt | 2 +- gstreamer-player/src/auto/mod.rs | 14 +- gstreamer-player/src/auto/player.rs | 15 +- .../src/auto/player_audio_info.rs | 2 - .../player_gmain_context_signal_dispatcher.rs | 2 - .../src/auto/player_media_info.rs | 2 - .../src/auto/player_subtitle_info.rs | 2 - .../src/auto/player_video_info.rs | 2 - .../player_video_overlay_video_renderer.rs | 2 - gstreamer-player/src/auto/versions.txt | 2 +- gstreamer-rtsp-server/src/auto/versions.txt | 2 +- gstreamer-rtsp/src/auto/versions.txt | 2 +- gstreamer-sdp/src/auto/versions.txt | 2 +- gstreamer-video/src/auto/versions.txt | 2 +- gstreamer-webrtc/src/auto/mod.rs | 10 +- gstreamer-webrtc/src/auto/versions.txt | 2 +- .../src/auto/web_rtcdtls_transport.rs | 7 +- .../src/auto/web_rtcice_transport.rs | 2 - .../src/auto/web_rtcrtp_receiver.rs | 11 +- .../src/auto/web_rtcrtp_sender.rs | 11 +- .../src/auto/web_rtcrtp_transceiver.rs | 2 - gstreamer/src/auto/bus.rs | 2 - gstreamer/src/auto/device_provider.rs | 4 +- gstreamer/src/auto/device_provider_factory.rs | 2 - gstreamer/src/auto/element.rs | 22 +- gstreamer/src/auto/element_factory.rs | 2 - gstreamer/src/auto/ghost_pad.rs | 4 +- gstreamer/src/auto/mod.rs | 18 +- gstreamer/src/auto/pad.rs | 8 +- gstreamer/src/auto/pad_template.rs | 2 - gstreamer/src/auto/plugin.rs | 2 - gstreamer/src/auto/registry.rs | 10 +- gstreamer/src/auto/stream.rs | 2 - gstreamer/src/auto/stream_collection.rs | 2 - gstreamer/src/auto/type_find_factory.rs | 2 - gstreamer/src/auto/versions.txt | 2 +- 83 files changed, 312 insertions(+), 470 deletions(-) diff --git a/Gir_Gst.toml b/Gir_Gst.toml index a4f7dcdcd..694f50701 100644 --- a/Gir_Gst.toml +++ b/Gir_Gst.toml @@ -114,7 +114,7 @@ trait_name = "GstBinExt" [[object]] name = "Gst.Bus" status = "generate" -trait = false +final_type = true [[object.function]] name = "add_signal_watch_full" # Priority @@ -504,17 +504,17 @@ status = "generate" [[object]] name = "Gst.ElementFactory" status = "generate" -trait = false +final_type = true [[object]] name = "Gst.TypeFindFactory" status = "generate" -trait = false +final_type = true [[object]] name = "Gst.DeviceProviderFactory" status = "generate" -trait = false +final_type = true [[object]] name = "Gst.DeviceProvider" @@ -798,7 +798,7 @@ status = "generate" [[object]] name = "Gst.PadTemplate" status = "generate" -trait = false +final_type = true [[object.function]] name = "new_from_static_pad_template_with_gtype" # static pad template manual @@ -857,7 +857,7 @@ status = "generate" [[object]] name = "Gst.Stream" status = "generate" -trait = false +final_type = true [[object.function]] name = "new" # Work-around for 1.14 switch from transfer-floating to transfer-full @@ -866,7 +866,7 @@ trait = false [[object]] name = "Gst.StreamCollection" status = "generate" -trait = false +final_type = true [[object.function]] name = "new" # Work-around for 1.14 switch from transfer-floating to transfer-full @@ -880,7 +880,7 @@ trait = false [[object]] name = "Gst.Plugin" status = "generate" -trait = false +final_type = true [[object.function]] name = "list_free" @@ -946,7 +946,7 @@ status = "generate" [[object]] name = "Gst.Registry" status = "generate" -trait = false +final_type = true [[object.function]] pattern = "fork_.*" diff --git a/Gir_GstApp.toml b/Gir_GstApp.toml index 58bbed88b..45f0a501e 100644 --- a/Gir_GstApp.toml +++ b/Gir_GstApp.toml @@ -35,7 +35,7 @@ manual = [ [[object]] name = "GstApp.AppSink" status = "generate" -trait = false +final_type = true [[object.signal]] name = "pull-sample" @@ -76,7 +76,7 @@ trait = false [[object]] name = "GstApp.AppSrc" status = "generate" -trait = false +final_type = true [[object.function]] name = "push_buffer" diff --git a/Gir_GstBase.toml b/Gir_GstBase.toml index 5c227cb4d..d75ebc231 100644 --- a/Gir_GstBase.toml +++ b/Gir_GstBase.toml @@ -37,7 +37,7 @@ manual = [ [[object]] name = "GstBase.Adapter" status = "generate" -trait = false +final_type = true concurrency = "send-unique" [[object.function]] @@ -69,7 +69,7 @@ concurrency = "send-unique" name = "GstBase.FlowCombiner" # Manual because ref/unref functions were added much later status = "manual" -trait = false +final_type = true concurrency = "none" [[object]] diff --git a/Gir_GstCheck.toml b/Gir_GstCheck.toml index 8ec24f333..281fda760 100644 --- a/Gir_GstCheck.toml +++ b/Gir_GstCheck.toml @@ -36,4 +36,4 @@ conversion_type = "scalar" [[object]] name = "GstCheck.TestClock" status = "generate" -trait = false +final_type = true diff --git a/Gir_GstGL.toml b/Gir_GstGL.toml index ec1e69282..f99325414 100644 --- a/Gir_GstGL.toml +++ b/Gir_GstGL.toml @@ -185,7 +185,7 @@ status = "generate" [[object]] name = "GstGL.GLDisplayEGL" status = "generate" -trait = false +final_type = true cfg_condition = "feature = \"egl\"" [[object]] @@ -240,7 +240,7 @@ status = "generate" [[object]] name = "GstGL.GLColorConvert" status = "generate" -trait = false +final_type = true [[object.function]] name = "decide_allocation" @@ -260,7 +260,7 @@ trait = false [[object]] name = "GstGL.GLOverlayCompositor" status = "generate" -trait = false +final_type = true [[object.function]] name = "upload_overlays" @@ -270,12 +270,12 @@ trait = false [[object]] name = "GstGL.GLSLStage" status = "generate" -trait = false +final_type = true [[object]] name = "GstGL.GLShader" status = "generate" -trait = false +final_type = true [[object.function]] name = "set_uniform_matrix_2fv" @@ -325,7 +325,7 @@ trait = false [[object]] name = "GstGL.GLUpload" status = "generate" -trait = false +final_type = true [[object.function]] name = "perform_with_buffer" @@ -345,7 +345,7 @@ trait = false [[object]] name = "GstGL.GLViewConvert" status = "generate" -trait = false +final_type = true [[object.function]] name = "fixate_caps" diff --git a/Gir_GstNet.toml b/Gir_GstNet.toml index 2b1a51e8d..c4cdc7c4f 100644 --- a/Gir_GstNet.toml +++ b/Gir_GstNet.toml @@ -35,7 +35,7 @@ conversion_type = "scalar" [[object]] name = "GstNet.NtpClock" status = "generate" -trait = false +final_type = true [[object.function]] name = "new" @@ -45,7 +45,7 @@ trait = false [[object]] name = "GstNet.PtpClock" status = "generate" -trait = false +final_type = true [[object.function]] name = "new" @@ -55,7 +55,7 @@ trait = false [[object]] name = "GstNet.NetClientClock" status = "generate" -trait = false +final_type = true [[object.function]] name = "new" @@ -65,7 +65,7 @@ trait = false [[object]] name = "GstNet.NetTimeProvider" status = "generate" -trait = false +final_type = true [[object.function]] name = "new" diff --git a/Gir_GstPbutils.toml b/Gir_GstPbutils.toml index 17edcbef6..4927a1ae0 100644 --- a/Gir_GstPbutils.toml +++ b/Gir_GstPbutils.toml @@ -74,7 +74,7 @@ conversion_type = "scalar" [[object]] name = "GstPbutils.Discoverer" status = "generate" -trait = false +final_type = true [[object.function]] name = "discover_uri_async" @@ -98,6 +98,7 @@ status = "generate" [[object]] name = "GstPbutils.DiscovererStreamInfo" status = "generate" +final_type = false # Not useful [[object.function]] @@ -112,12 +113,12 @@ status = "generate" [[object]] name = "GstPbutils.DiscovererAudioInfo" status = "generate" -trait = false +final_type = true [[object]] name = "GstPbutils.DiscovererVideoInfo" status = "generate" -trait = false +final_type = true # Implement manually to expose as gst::Fraction [[object.function]] @@ -136,12 +137,12 @@ trait = false [[object]] name = "GstPbutils.DiscovererSubtitleInfo" status = "generate" -trait = false +final_type = true [[object]] name = "GstPbutils.DiscovererContainerInfo" status = "generate" -trait = false +final_type = true [[object]] name = "GstPbutils.EncodingProfile" @@ -214,7 +215,7 @@ status = "generate" [[object]] name = "GstPbutils.EncodingAudioProfile" status = "generate" -trait = false +final_type = true # Ignore all setters, making it immutable. A builder will be provided. [[object.function]] name = "new" @@ -226,7 +227,7 @@ trait = false [[object]] name = "GstPbutils.EncodingVideoProfile" status = "generate" -trait = false +final_type = true # Ignore all setters, making it immutable. A builder will be provided. [[object.function]] name = "new" diff --git a/Gir_GstPlayer.toml b/Gir_GstPlayer.toml index 40a794ece..d80036d52 100644 --- a/Gir_GstPlayer.toml +++ b/Gir_GstPlayer.toml @@ -60,7 +60,7 @@ ref_mode = "ref-mut" [[object]] name = "GstPlayer.Player" status = "generate" -trait = false +final_type = true [[object.function]] name = "visualizations_free" @@ -186,12 +186,12 @@ status = "generate" [[object]] name = "GstPlayer.PlayerAudioInfo" status = "generate" -trait = false +final_type = true [[object]] name = "GstPlayer.PlayerVideoInfo" status = "generate" -trait = false +final_type = true [[object.function]] name = "get_framerate" @@ -206,12 +206,12 @@ trait = false [[object]] name = "GstPlayer.PlayerSubtitleInfo" status = "generate" -trait = false +final_type = true [[object]] name = "GstPlayer.PlayerMediaInfo" status = "generate" -trait = false +final_type = true [[object.function]] name = "get_uri" @@ -221,12 +221,12 @@ trait = false [[object]] name = "GstPlayer.PlayerVideoOverlayVideoRenderer" status = "generate" -trait = false +final_type = true [[object]] name = "GstPlayer.PlayerGMainContextSignalDispatcher" status = "generate" -trait = false +final_type = true [[object.function]] name = "new" diff --git a/Gir_GstWebRTC.toml b/Gir_GstWebRTC.toml index be750bbb2..91aac8030 100644 --- a/Gir_GstWebRTC.toml +++ b/Gir_GstWebRTC.toml @@ -40,32 +40,32 @@ manual = [ [[object]] name = "GstWebRTC.WebRTCDTLSTransport" status = "generate" -trait = false +final_type = true [[object]] name = "GstWebRTC.WebRTCICETransport" status = "generate" -trait = false +final_type = true [[object]] name = "GstWebRTC.WebRTCRTPReceiver" status = "generate" -trait = false +final_type = true [[object]] name = "GstWebRTC.WebRTCRTPSender" status = "generate" -trait = false +final_type = true [[object]] name = "GstWebRTC.WebRTCRTPTransceiver" status = "generate" -trait = false +final_type = true [[object]] name = "GstWebRTC.WebRTCSessionDescription" status = "generate" -trait = false +final_type = true [[object.function]] name = "new" diff --git a/gstreamer-app/src/auto/app_sink.rs b/gstreamer-app/src/auto/app_sink.rs index fd710cd65..06f45b84c 100644 --- a/gstreamer-app/src/auto/app_sink.rs +++ b/gstreamer-app/src/auto/app_sink.rs @@ -226,8 +226,6 @@ impl AppSink { unsafe impl Send for AppSink {} unsafe impl Sync for AppSink {} -pub const NONE_APP_SINK: Option<&AppSink> = None; - unsafe extern "C" fn eos_trampoline(this: *mut ffi::GstAppSink, f: glib_ffi::gpointer) { let f: &&(Fn(&AppSink) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer-app/src/auto/app_src.rs b/gstreamer-app/src/auto/app_src.rs index 7c095e8c4..357e1e63c 100644 --- a/gstreamer-app/src/auto/app_src.rs +++ b/gstreamer-app/src/auto/app_src.rs @@ -342,8 +342,6 @@ impl AppSrc { unsafe impl Send for AppSrc {} unsafe impl Sync for AppSrc {} -pub const NONE_APP_SRC: Option<&AppSrc> = None; - unsafe extern "C" fn enough_data_trampoline(this: *mut ffi::GstAppSrc, f: glib_ffi::gpointer) { let f: &&(Fn(&AppSrc) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer-app/src/auto/mod.rs b/gstreamer-app/src/auto/mod.rs index c3f9ada6e..cc575cc49 100644 --- a/gstreamer-app/src/auto/mod.rs +++ b/gstreamer-app/src/auto/mod.rs @@ -3,10 +3,10 @@ // DO NOT EDIT mod app_sink; -pub use self::app_sink::{AppSink, AppSinkClass, NONE_APP_SINK}; +pub use self::app_sink::{AppSink, AppSinkClass}; mod app_src; -pub use self::app_src::{AppSrc, AppSrcClass, NONE_APP_SRC}; +pub use self::app_src::{AppSrc, AppSrcClass}; mod enums; pub use self::enums::AppStreamType; diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-app/src/auto/versions.txt +++ b/gstreamer-app/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-audio/src/auto/versions.txt +++ b/gstreamer-audio/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-base/src/auto/adapter.rs b/gstreamer-base/src/auto/adapter.rs index 61665c0c8..d513b5061 100644 --- a/gstreamer-base/src/auto/adapter.rs +++ b/gstreamer-base/src/auto/adapter.rs @@ -197,5 +197,3 @@ unsafe impl glib::SendUnique for Adapter { self.ref_count() == 1 } } - -pub const NONE_ADAPTER: Option<&Adapter> = None; diff --git a/gstreamer-base/src/auto/mod.rs b/gstreamer-base/src/auto/mod.rs index 57ae2b5ed..715c87970 100644 --- a/gstreamer-base/src/auto/mod.rs +++ b/gstreamer-base/src/auto/mod.rs @@ -3,7 +3,7 @@ // DO NOT EDIT mod adapter; -pub use self::adapter::{Adapter, AdapterClass, NONE_ADAPTER}; +pub use self::adapter::{Adapter, AdapterClass}; #[cfg(any(feature = "v1_14", feature = "dox"))] mod aggregator; diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-base/src/auto/versions.txt +++ b/gstreamer-base/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-check/src/auto/mod.rs b/gstreamer-check/src/auto/mod.rs index 0dabd69f2..8b013a1db 100644 --- a/gstreamer-check/src/auto/mod.rs +++ b/gstreamer-check/src/auto/mod.rs @@ -3,7 +3,7 @@ // DO NOT EDIT mod test_clock; -pub use self::test_clock::{TestClock, TestClockClass, NONE_TEST_CLOCK}; +pub use self::test_clock::{TestClock, TestClockClass}; #[doc(hidden)] pub mod traits { diff --git a/gstreamer-check/src/auto/test_clock.rs b/gstreamer-check/src/auto/test_clock.rs index 23b2963ac..ddae351fc 100644 --- a/gstreamer-check/src/auto/test_clock.rs +++ b/gstreamer-check/src/auto/test_clock.rs @@ -143,8 +143,6 @@ impl Default for TestClock { unsafe impl Send for TestClock {} unsafe impl Sync for TestClock {} -pub const NONE_TEST_CLOCK: Option<&TestClock> = None; - unsafe extern "C" fn notify_clock_type_trampoline(this: *mut ffi::GstTestClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { let f: &&(Fn(&TestClock) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer-check/src/auto/versions.txt b/gstreamer-check/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-check/src/auto/versions.txt +++ b/gstreamer-check/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-editing-services/src/auto/versions.txt +++ b/gstreamer-editing-services/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-gl/src/auto/gl_color_convert.rs b/gstreamer-gl/src/auto/gl_color_convert.rs index 88ce54def..9a8f4875c 100644 --- a/gstreamer-gl/src/auto/gl_color_convert.rs +++ b/gstreamer-gl/src/auto/gl_color_convert.rs @@ -40,5 +40,3 @@ impl GLColorConvert { unsafe impl Send for GLColorConvert {} unsafe impl Sync for GLColorConvert {} - -pub const NONE_GL_COLOR_CONVERT: Option<&GLColorConvert> = None; diff --git a/gstreamer-gl/src/auto/gl_display_egl.rs b/gstreamer-gl/src/auto/gl_display_egl.rs index cbc445022..0a97f0880 100644 --- a/gstreamer-gl/src/auto/gl_display_egl.rs +++ b/gstreamer-gl/src/auto/gl_display_egl.rs @@ -40,5 +40,3 @@ impl Default for GLDisplayEGL { unsafe impl Send for GLDisplayEGL {} unsafe impl Sync for GLDisplayEGL {} - -pub const NONE_GL_DISPLAY_EGL: Option<&GLDisplayEGL> = None; diff --git a/gstreamer-gl/src/auto/gl_overlay_compositor.rs b/gstreamer-gl/src/auto/gl_overlay_compositor.rs index 3c285dcce..aaccf1e97 100644 --- a/gstreamer-gl/src/auto/gl_overlay_compositor.rs +++ b/gstreamer-gl/src/auto/gl_overlay_compositor.rs @@ -46,5 +46,3 @@ impl GLOverlayCompositor { unsafe impl Send for GLOverlayCompositor {} unsafe impl Sync for GLOverlayCompositor {} - -pub const NONE_GL_OVERLAY_COMPOSITOR: Option<&GLOverlayCompositor> = None; diff --git a/gstreamer-gl/src/auto/gl_shader.rs b/gstreamer-gl/src/auto/gl_shader.rs index 2c1678192..2e9a9efe2 100644 --- a/gstreamer-gl/src/auto/gl_shader.rs +++ b/gstreamer-gl/src/auto/gl_shader.rs @@ -53,15 +53,15 @@ impl GLShader { // unsafe { TODO: call ffi::gst_gl_shader_new_with_stages() } //} - pub fn attach>(&self, stage: &P) -> bool { + pub fn attach(&self, stage: &GLSLStage) -> bool { unsafe { - from_glib(ffi::gst_gl_shader_attach(self.to_glib_none().0, stage.as_ref().to_glib_none().0)) + from_glib(ffi::gst_gl_shader_attach(self.to_glib_none().0, stage.to_glib_none().0)) } } - pub fn attach_unlocked>(&self, stage: &P) -> bool { + pub fn attach_unlocked(&self, stage: &GLSLStage) -> bool { unsafe { - from_glib(ffi::gst_gl_shader_attach_unlocked(self.to_glib_none().0, stage.as_ref().to_glib_none().0)) + from_glib(ffi::gst_gl_shader_attach_unlocked(self.to_glib_none().0, stage.to_glib_none().0)) } } @@ -77,23 +77,23 @@ impl GLShader { } } - pub fn compile_attach_stage>(&self, stage: &P) -> Result<(), Error> { + pub fn compile_attach_stage(&self, stage: &GLSLStage) -> Result<(), Error> { unsafe { let mut error = ptr::null_mut(); - let _ = ffi::gst_gl_shader_compile_attach_stage(self.to_glib_none().0, stage.as_ref().to_glib_none().0, &mut error); + let _ = ffi::gst_gl_shader_compile_attach_stage(self.to_glib_none().0, stage.to_glib_none().0, &mut error); if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } } } - pub fn detach>(&self, stage: &P) { + pub fn detach(&self, stage: &GLSLStage) { unsafe { - ffi::gst_gl_shader_detach(self.to_glib_none().0, stage.as_ref().to_glib_none().0); + ffi::gst_gl_shader_detach(self.to_glib_none().0, stage.to_glib_none().0); } } - pub fn detach_unlocked>(&self, stage: &P) { + pub fn detach_unlocked(&self, stage: &GLSLStage) { unsafe { - ffi::gst_gl_shader_detach_unlocked(self.to_glib_none().0, stage.as_ref().to_glib_none().0); + ffi::gst_gl_shader_detach_unlocked(self.to_glib_none().0, stage.to_glib_none().0); } } @@ -265,8 +265,6 @@ impl GLShader { unsafe impl Send for GLShader {} unsafe impl Sync for GLShader {} -pub const NONE_GL_SHADER: Option<&GLShader> = None; - unsafe extern "C" fn notify_linked_trampoline(this: *mut ffi::GstGLShader, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { let f: &&(Fn(&GLShader) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer-gl/src/auto/gl_upload.rs b/gstreamer-gl/src/auto/gl_upload.rs index ee0799520..f1714d5f7 100644 --- a/gstreamer-gl/src/auto/gl_upload.rs +++ b/gstreamer-gl/src/auto/gl_upload.rs @@ -62,5 +62,3 @@ impl GLUpload { unsafe impl Send for GLUpload {} unsafe impl Sync for GLUpload {} - -pub const NONE_GL_UPLOAD: Option<&GLUpload> = None; diff --git a/gstreamer-gl/src/auto/gl_view_convert.rs b/gstreamer-gl/src/auto/gl_view_convert.rs index f7be19bb8..60cb5a1f1 100644 --- a/gstreamer-gl/src/auto/gl_view_convert.rs +++ b/gstreamer-gl/src/auto/gl_view_convert.rs @@ -185,8 +185,6 @@ impl Default for GLViewConvert { unsafe impl Send for GLViewConvert {} unsafe impl Sync for GLViewConvert {} -pub const NONE_GL_VIEW_CONVERT: Option<&GLViewConvert> = None; - unsafe extern "C" fn notify_downmix_mode_trampoline(this: *mut ffi::GstGLViewConvert, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { let f: &&(Fn(&GLViewConvert) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer-gl/src/auto/glsl_stage.rs b/gstreamer-gl/src/auto/glsl_stage.rs index 5b89c1e8d..8cb41433b 100644 --- a/gstreamer-gl/src/auto/glsl_stage.rs +++ b/gstreamer-gl/src/auto/glsl_stage.rs @@ -100,5 +100,3 @@ impl GLSLStage { unsafe impl Send for GLSLStage {} unsafe impl Sync for GLSLStage {} - -pub const NONE_GLSL_STAGE: Option<&GLSLStage> = None; diff --git a/gstreamer-gl/src/auto/mod.rs b/gstreamer-gl/src/auto/mod.rs index a0cd2e5b8..460cf8730 100644 --- a/gstreamer-gl/src/auto/mod.rs +++ b/gstreamer-gl/src/auto/mod.rs @@ -7,7 +7,7 @@ pub use self::gl_base_filter::{GLBaseFilter, GLBaseFilterClass, NONE_GL_BASE_FIL pub use self::gl_base_filter::GLBaseFilterExt; mod gl_color_convert; -pub use self::gl_color_convert::{GLColorConvert, GLColorConvertClass, NONE_GL_COLOR_CONVERT}; +pub use self::gl_color_convert::{GLColorConvert, GLColorConvertClass}; mod gl_context; pub use self::gl_context::{GLContext, GLContextClass, NONE_GL_CONTEXT}; @@ -20,26 +20,26 @@ pub use self::gl_display::GLDisplayExt; #[cfg(any(feature = "egl", feature = "dox"))] mod gl_display_egl; #[cfg(any(feature = "egl", feature = "dox"))] -pub use self::gl_display_egl::{GLDisplayEGL, GLDisplayEGLClass, NONE_GL_DISPLAY_EGL}; +pub use self::gl_display_egl::{GLDisplayEGL, GLDisplayEGLClass}; mod gl_framebuffer; pub use self::gl_framebuffer::{GLFramebuffer, GLFramebufferClass, NONE_GL_FRAMEBUFFER}; pub use self::gl_framebuffer::GLFramebufferExt; mod gl_overlay_compositor; -pub use self::gl_overlay_compositor::{GLOverlayCompositor, GLOverlayCompositorClass, NONE_GL_OVERLAY_COMPOSITOR}; +pub use self::gl_overlay_compositor::{GLOverlayCompositor, GLOverlayCompositorClass}; mod glsl_stage; -pub use self::glsl_stage::{GLSLStage, GLSLStageClass, NONE_GLSL_STAGE}; +pub use self::glsl_stage::{GLSLStage, GLSLStageClass}; mod gl_shader; -pub use self::gl_shader::{GLShader, GLShaderClass, NONE_GL_SHADER}; +pub use self::gl_shader::{GLShader, GLShaderClass}; mod gl_upload; -pub use self::gl_upload::{GLUpload, GLUploadClass, NONE_GL_UPLOAD}; +pub use self::gl_upload::{GLUpload, GLUploadClass}; mod gl_view_convert; -pub use self::gl_view_convert::{GLViewConvert, GLViewConvertClass, NONE_GL_VIEW_CONVERT}; +pub use self::gl_view_convert::{GLViewConvert, GLViewConvertClass}; mod gl_window; pub use self::gl_window::{GLWindow, GLWindowClass, NONE_GL_WINDOW}; diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-gl/src/auto/versions.txt +++ b/gstreamer-gl/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-net/src/auto/mod.rs b/gstreamer-net/src/auto/mod.rs index 1e41ad207..55d27d11e 100644 --- a/gstreamer-net/src/auto/mod.rs +++ b/gstreamer-net/src/auto/mod.rs @@ -3,16 +3,16 @@ // DO NOT EDIT mod net_client_clock; -pub use self::net_client_clock::{NetClientClock, NetClientClockClass, NONE_NET_CLIENT_CLOCK}; +pub use self::net_client_clock::{NetClientClock, NetClientClockClass}; mod net_time_provider; -pub use self::net_time_provider::{NetTimeProvider, NetTimeProviderClass, NONE_NET_TIME_PROVIDER}; +pub use self::net_time_provider::{NetTimeProvider, NetTimeProviderClass}; mod ntp_clock; -pub use self::ntp_clock::{NtpClock, NtpClockClass, NONE_NTP_CLOCK}; +pub use self::ntp_clock::{NtpClock, NtpClockClass}; mod ptp_clock; -pub use self::ptp_clock::{PtpClock, PtpClockClass, NONE_PTP_CLOCK}; +pub use self::ptp_clock::{PtpClock, PtpClockClass}; #[doc(hidden)] pub mod traits { diff --git a/gstreamer-net/src/auto/net_client_clock.rs b/gstreamer-net/src/auto/net_client_clock.rs index 168ff78fd..bf0534185 100644 --- a/gstreamer-net/src/auto/net_client_clock.rs +++ b/gstreamer-net/src/auto/net_client_clock.rs @@ -188,8 +188,6 @@ impl NetClientClock { unsafe impl Send for NetClientClock {} unsafe impl Sync for NetClientClock {} -pub const NONE_NET_CLIENT_CLOCK: Option<&NetClientClock> = None; - unsafe extern "C" fn notify_address_trampoline(this: *mut ffi::GstNetClientClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { let f: &&(Fn(&NetClientClock) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer-net/src/auto/net_time_provider.rs b/gstreamer-net/src/auto/net_time_provider.rs index 2d63e8a1f..9b5fffddd 100644 --- a/gstreamer-net/src/auto/net_time_provider.rs +++ b/gstreamer-net/src/auto/net_time_provider.rs @@ -97,8 +97,6 @@ impl NetTimeProvider { unsafe impl Send for NetTimeProvider {} unsafe impl Sync for NetTimeProvider {} -pub const NONE_NET_TIME_PROVIDER: Option<&NetTimeProvider> = None; - unsafe extern "C" fn notify_active_trampoline(this: *mut ffi::GstNetTimeProvider, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { let f: &&(Fn(&NetTimeProvider) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer-net/src/auto/ntp_clock.rs b/gstreamer-net/src/auto/ntp_clock.rs index 6c2456cad..7c09d6776 100644 --- a/gstreamer-net/src/auto/ntp_clock.rs +++ b/gstreamer-net/src/auto/ntp_clock.rs @@ -19,5 +19,3 @@ impl NtpClock {} unsafe impl Send for NtpClock {} unsafe impl Sync for NtpClock {} - -pub const NONE_NTP_CLOCK: Option<&NtpClock> = None; diff --git a/gstreamer-net/src/auto/ptp_clock.rs b/gstreamer-net/src/auto/ptp_clock.rs index 61d518ed7..84ca6ab39 100644 --- a/gstreamer-net/src/auto/ptp_clock.rs +++ b/gstreamer-net/src/auto/ptp_clock.rs @@ -84,8 +84,6 @@ impl PtpClock { unsafe impl Send for PtpClock {} unsafe impl Sync for PtpClock {} -pub const NONE_PTP_CLOCK: Option<&PtpClock> = None; - unsafe extern "C" fn notify_grandmaster_clock_id_trampoline(this: *mut ffi::GstPtpClock, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { let f: &&(Fn(&PtpClock) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-net/src/auto/versions.txt +++ b/gstreamer-net/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-pbutils/src/auto/discoverer.rs b/gstreamer-pbutils/src/auto/discoverer.rs index 5c8359967..fcb5e02bc 100644 --- a/gstreamer-pbutils/src/auto/discoverer.rs +++ b/gstreamer-pbutils/src/auto/discoverer.rs @@ -97,8 +97,6 @@ impl Discoverer { unsafe impl Send for Discoverer {} unsafe impl Sync for Discoverer {} -pub const NONE_DISCOVERER: Option<&Discoverer> = None; - unsafe extern "C" fn discovered_trampoline(this: *mut ffi::GstDiscoverer, info: *mut ffi::GstDiscovererInfo, error: *mut glib_ffi::GError, f: glib_ffi::gpointer) { let f: &&(Fn(&Discoverer, &DiscovererInfo, &Option) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this), &from_glib_borrow(info), &from_glib_borrow(error)) diff --git a/gstreamer-pbutils/src/auto/discoverer_audio_info.rs b/gstreamer-pbutils/src/auto/discoverer_audio_info.rs index df708d543..97d56b8aa 100644 --- a/gstreamer-pbutils/src/auto/discoverer_audio_info.rs +++ b/gstreamer-pbutils/src/auto/discoverer_audio_info.rs @@ -62,5 +62,3 @@ impl DiscovererAudioInfo { unsafe impl Send for DiscovererAudioInfo {} unsafe impl Sync for DiscovererAudioInfo {} - -pub const NONE_DISCOVERER_AUDIO_INFO: Option<&DiscovererAudioInfo> = None; diff --git a/gstreamer-pbutils/src/auto/discoverer_container_info.rs b/gstreamer-pbutils/src/auto/discoverer_container_info.rs index 66f21aa29..0b998a7c1 100644 --- a/gstreamer-pbutils/src/auto/discoverer_container_info.rs +++ b/gstreamer-pbutils/src/auto/discoverer_container_info.rs @@ -24,5 +24,3 @@ impl DiscovererContainerInfo { unsafe impl Send for DiscovererContainerInfo {} unsafe impl Sync for DiscovererContainerInfo {} - -pub const NONE_DISCOVERER_CONTAINER_INFO: Option<&DiscovererContainerInfo> = None; diff --git a/gstreamer-pbutils/src/auto/discoverer_info.rs b/gstreamer-pbutils/src/auto/discoverer_info.rs index af937b82e..2f0aac81d 100644 --- a/gstreamer-pbutils/src/auto/discoverer_info.rs +++ b/gstreamer-pbutils/src/auto/discoverer_info.rs @@ -8,7 +8,6 @@ use DiscovererStreamInfo; use ffi; use glib; use glib::GString; -use glib::object::IsA; use glib::translate::*; use gst; @@ -21,6 +20,115 @@ glib_wrapper! { } impl DiscovererInfo { + pub fn copy(&self) -> DiscovererInfo { + unsafe { + from_glib_full(ffi::gst_discoverer_info_copy(self.to_glib_none().0)) + } + } + + pub fn get_audio_streams(&self) -> Vec { + unsafe { + FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_audio_streams(self.to_glib_none().0)) + } + } + + pub fn get_container_streams(&self) -> Vec { + unsafe { + FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_container_streams(self.to_glib_none().0)) + } + } + + pub fn get_duration(&self) -> gst::ClockTime { + unsafe { + from_glib(ffi::gst_discoverer_info_get_duration(self.to_glib_none().0)) + } + } + + #[cfg(any(feature = "v1_14", feature = "dox"))] + pub fn get_live(&self) -> bool { + unsafe { + from_glib(ffi::gst_discoverer_info_get_live(self.to_glib_none().0)) + } + } + + pub fn get_misc(&self) -> Option { + unsafe { + from_glib_none(ffi::gst_discoverer_info_get_misc(self.to_glib_none().0)) + } + } + + pub fn get_missing_elements_installer_details(&self) -> Vec { + unsafe { + FromGlibPtrContainer::from_glib_none(ffi::gst_discoverer_info_get_missing_elements_installer_details(self.to_glib_none().0)) + } + } + + pub fn get_result(&self) -> DiscovererResult { + unsafe { + from_glib(ffi::gst_discoverer_info_get_result(self.to_glib_none().0)) + } + } + + pub fn get_seekable(&self) -> bool { + unsafe { + from_glib(ffi::gst_discoverer_info_get_seekable(self.to_glib_none().0)) + } + } + + pub fn get_stream_info(&self) -> Option { + unsafe { + from_glib_full(ffi::gst_discoverer_info_get_stream_info(self.to_glib_none().0)) + } + } + + pub fn get_stream_list(&self) -> Vec { + unsafe { + FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_stream_list(self.to_glib_none().0)) + } + } + + pub fn get_streams(&self, streamtype: glib::types::Type) -> Vec { + unsafe { + FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_streams(self.to_glib_none().0, streamtype.to_glib())) + } + } + + pub fn get_subtitle_streams(&self) -> Vec { + unsafe { + FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_subtitle_streams(self.to_glib_none().0)) + } + } + + pub fn get_tags(&self) -> Option { + unsafe { + from_glib_none(ffi::gst_discoverer_info_get_tags(self.to_glib_none().0)) + } + } + + pub fn get_toc(&self) -> Option { + unsafe { + from_glib_none(ffi::gst_discoverer_info_get_toc(self.to_glib_none().0)) + } + } + + pub fn get_uri(&self) -> Option { + unsafe { + from_glib_none(ffi::gst_discoverer_info_get_uri(self.to_glib_none().0)) + } + } + + pub fn get_video_streams(&self) -> Vec { + unsafe { + FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_video_streams(self.to_glib_none().0)) + } + } + + pub fn to_variant(&self, flags: DiscovererSerializeFlags) -> Option { + unsafe { + from_glib_full(ffi::gst_discoverer_info_to_variant(self.to_glib_none().0, flags.to_glib())) + } + } + pub fn from_variant(variant: &glib::Variant) -> Option { assert_initialized_main_thread!(); unsafe { @@ -31,155 +139,3 @@ impl DiscovererInfo { unsafe impl Send for DiscovererInfo {} unsafe impl Sync for DiscovererInfo {} - -pub const NONE_DISCOVERER_INFO: Option<&DiscovererInfo> = None; - -pub trait DiscovererInfoExt: 'static { - fn copy(&self) -> DiscovererInfo; - - fn get_audio_streams(&self) -> Vec; - - fn get_container_streams(&self) -> Vec; - - fn get_duration(&self) -> gst::ClockTime; - - #[cfg(any(feature = "v1_14", feature = "dox"))] - fn get_live(&self) -> bool; - - fn get_misc(&self) -> Option; - - fn get_missing_elements_installer_details(&self) -> Vec; - - fn get_result(&self) -> DiscovererResult; - - fn get_seekable(&self) -> bool; - - fn get_stream_info(&self) -> Option; - - fn get_stream_list(&self) -> Vec; - - fn get_streams(&self, streamtype: glib::types::Type) -> Vec; - - fn get_subtitle_streams(&self) -> Vec; - - fn get_tags(&self) -> Option; - - fn get_toc(&self) -> Option; - - fn get_uri(&self) -> Option; - - fn get_video_streams(&self) -> Vec; - - fn to_variant(&self, flags: DiscovererSerializeFlags) -> Option; -} - -impl> DiscovererInfoExt for O { - fn copy(&self) -> DiscovererInfo { - unsafe { - from_glib_full(ffi::gst_discoverer_info_copy(self.as_ref().to_glib_none().0)) - } - } - - fn get_audio_streams(&self) -> Vec { - unsafe { - FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_audio_streams(self.as_ref().to_glib_none().0)) - } - } - - fn get_container_streams(&self) -> Vec { - unsafe { - FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_container_streams(self.as_ref().to_glib_none().0)) - } - } - - fn get_duration(&self) -> gst::ClockTime { - unsafe { - from_glib(ffi::gst_discoverer_info_get_duration(const_override(self.as_ref().to_glib_none().0))) - } - } - - #[cfg(any(feature = "v1_14", feature = "dox"))] - fn get_live(&self) -> bool { - unsafe { - from_glib(ffi::gst_discoverer_info_get_live(const_override(self.as_ref().to_glib_none().0))) - } - } - - fn get_misc(&self) -> Option { - unsafe { - from_glib_none(ffi::gst_discoverer_info_get_misc(const_override(self.as_ref().to_glib_none().0))) - } - } - - fn get_missing_elements_installer_details(&self) -> Vec { - unsafe { - FromGlibPtrContainer::from_glib_none(ffi::gst_discoverer_info_get_missing_elements_installer_details(const_override(self.as_ref().to_glib_none().0))) - } - } - - fn get_result(&self) -> DiscovererResult { - unsafe { - from_glib(ffi::gst_discoverer_info_get_result(const_override(self.as_ref().to_glib_none().0))) - } - } - - fn get_seekable(&self) -> bool { - unsafe { - from_glib(ffi::gst_discoverer_info_get_seekable(const_override(self.as_ref().to_glib_none().0))) - } - } - - fn get_stream_info(&self) -> Option { - unsafe { - from_glib_full(ffi::gst_discoverer_info_get_stream_info(self.as_ref().to_glib_none().0)) - } - } - - fn get_stream_list(&self) -> Vec { - unsafe { - FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_stream_list(self.as_ref().to_glib_none().0)) - } - } - - fn get_streams(&self, streamtype: glib::types::Type) -> Vec { - unsafe { - FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_streams(self.as_ref().to_glib_none().0, streamtype.to_glib())) - } - } - - fn get_subtitle_streams(&self) -> Vec { - unsafe { - FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_subtitle_streams(self.as_ref().to_glib_none().0)) - } - } - - fn get_tags(&self) -> Option { - unsafe { - from_glib_none(ffi::gst_discoverer_info_get_tags(const_override(self.as_ref().to_glib_none().0))) - } - } - - fn get_toc(&self) -> Option { - unsafe { - from_glib_none(ffi::gst_discoverer_info_get_toc(const_override(self.as_ref().to_glib_none().0))) - } - } - - fn get_uri(&self) -> Option { - unsafe { - from_glib_none(ffi::gst_discoverer_info_get_uri(const_override(self.as_ref().to_glib_none().0))) - } - } - - fn get_video_streams(&self) -> Vec { - unsafe { - FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_video_streams(self.as_ref().to_glib_none().0)) - } - } - - fn to_variant(&self, flags: DiscovererSerializeFlags) -> Option { - unsafe { - from_glib_full(ffi::gst_discoverer_info_to_variant(self.as_ref().to_glib_none().0, flags.to_glib())) - } - } -} diff --git a/gstreamer-pbutils/src/auto/discoverer_subtitle_info.rs b/gstreamer-pbutils/src/auto/discoverer_subtitle_info.rs index 8dd71c71a..154599b66 100644 --- a/gstreamer-pbutils/src/auto/discoverer_subtitle_info.rs +++ b/gstreamer-pbutils/src/auto/discoverer_subtitle_info.rs @@ -25,5 +25,3 @@ impl DiscovererSubtitleInfo { unsafe impl Send for DiscovererSubtitleInfo {} unsafe impl Sync for DiscovererSubtitleInfo {} - -pub const NONE_DISCOVERER_SUBTITLE_INFO: Option<&DiscovererSubtitleInfo> = None; diff --git a/gstreamer-pbutils/src/auto/discoverer_video_info.rs b/gstreamer-pbutils/src/auto/discoverer_video_info.rs index 6490ed820..07663149c 100644 --- a/gstreamer-pbutils/src/auto/discoverer_video_info.rs +++ b/gstreamer-pbutils/src/auto/discoverer_video_info.rs @@ -60,5 +60,3 @@ impl DiscovererVideoInfo { unsafe impl Send for DiscovererVideoInfo {} unsafe impl Sync for DiscovererVideoInfo {} - -pub const NONE_DISCOVERER_VIDEO_INFO: Option<&DiscovererVideoInfo> = None; diff --git a/gstreamer-pbutils/src/auto/encoding_audio_profile.rs b/gstreamer-pbutils/src/auto/encoding_audio_profile.rs index 248934c8c..7dd2118a6 100644 --- a/gstreamer-pbutils/src/auto/encoding_audio_profile.rs +++ b/gstreamer-pbutils/src/auto/encoding_audio_profile.rs @@ -18,5 +18,3 @@ impl EncodingAudioProfile {} unsafe impl Send for EncodingAudioProfile {} unsafe impl Sync for EncodingAudioProfile {} - -pub const NONE_ENCODING_AUDIO_PROFILE: Option<&EncodingAudioProfile> = None; diff --git a/gstreamer-pbutils/src/auto/encoding_profile.rs b/gstreamer-pbutils/src/auto/encoding_profile.rs index dd8ca7039..de5ed7005 100644 --- a/gstreamer-pbutils/src/auto/encoding_profile.rs +++ b/gstreamer-pbutils/src/auto/encoding_profile.rs @@ -27,10 +27,10 @@ impl EncodingProfile { } } - pub fn from_discoverer>(info: &P) -> Option { + pub fn from_discoverer(info: &DiscovererInfo) -> Option { skip_assert_initialized!(); unsafe { - from_glib_full(ffi::gst_encoding_profile_from_discoverer(info.as_ref().to_glib_none().0)) + from_glib_full(ffi::gst_encoding_profile_from_discoverer(info.to_glib_none().0)) } } } diff --git a/gstreamer-pbutils/src/auto/encoding_target.rs b/gstreamer-pbutils/src/auto/encoding_target.rs index 003ac26bf..bf5e8d505 100644 --- a/gstreamer-pbutils/src/auto/encoding_target.rs +++ b/gstreamer-pbutils/src/auto/encoding_target.rs @@ -6,7 +6,6 @@ use EncodingProfile; use Error; use ffi; use glib::GString; -use glib::object::IsA; use glib::translate::*; use std; use std::ptr; @@ -27,6 +26,52 @@ impl EncodingTarget { } } + pub fn get_category(&self) -> GString { + unsafe { + from_glib_none(ffi::gst_encoding_target_get_category(self.to_glib_none().0)) + } + } + + pub fn get_description(&self) -> GString { + unsafe { + from_glib_none(ffi::gst_encoding_target_get_description(self.to_glib_none().0)) + } + } + + pub fn get_name(&self) -> GString { + unsafe { + from_glib_none(ffi::gst_encoding_target_get_name(self.to_glib_none().0)) + } + } + + pub fn get_profile(&self, name: &str) -> Option { + unsafe { + from_glib_full(ffi::gst_encoding_target_get_profile(self.to_glib_none().0, name.to_glib_none().0)) + } + } + + pub fn get_profiles(&self) -> Vec { + unsafe { + FromGlibPtrContainer::from_glib_none(ffi::gst_encoding_target_get_profiles(self.to_glib_none().0)) + } + } + + pub fn save(&self) -> Result<(), Error> { + unsafe { + let mut error = ptr::null_mut(); + let _ = ffi::gst_encoding_target_save(self.to_glib_none().0, &mut error); + if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } + } + } + + pub fn save_to_file>(&self, filepath: P) -> Result<(), Error> { + unsafe { + let mut error = ptr::null_mut(); + let _ = ffi::gst_encoding_target_save_to_file(self.to_glib_none().0, filepath.as_ref().to_glib_none().0, &mut error); + if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } + } + } + pub fn load<'a, P: Into>>(name: &str, category: P) -> Result { assert_initialized_main_thread!(); let category = category.into(); @@ -49,69 +94,3 @@ impl EncodingTarget { unsafe impl Send for EncodingTarget {} unsafe impl Sync for EncodingTarget {} - -pub const NONE_ENCODING_TARGET: Option<&EncodingTarget> = None; - -pub trait EncodingTargetExt: 'static { - fn get_category(&self) -> GString; - - fn get_description(&self) -> GString; - - fn get_name(&self) -> GString; - - fn get_profile(&self, name: &str) -> Option; - - fn get_profiles(&self) -> Vec; - - fn save(&self) -> Result<(), Error>; - - fn save_to_file>(&self, filepath: P) -> Result<(), Error>; -} - -impl> EncodingTargetExt for O { - fn get_category(&self) -> GString { - unsafe { - from_glib_none(ffi::gst_encoding_target_get_category(self.as_ref().to_glib_none().0)) - } - } - - fn get_description(&self) -> GString { - unsafe { - from_glib_none(ffi::gst_encoding_target_get_description(self.as_ref().to_glib_none().0)) - } - } - - fn get_name(&self) -> GString { - unsafe { - from_glib_none(ffi::gst_encoding_target_get_name(self.as_ref().to_glib_none().0)) - } - } - - fn get_profile(&self, name: &str) -> Option { - unsafe { - from_glib_full(ffi::gst_encoding_target_get_profile(self.as_ref().to_glib_none().0, name.to_glib_none().0)) - } - } - - fn get_profiles(&self) -> Vec { - unsafe { - FromGlibPtrContainer::from_glib_none(ffi::gst_encoding_target_get_profiles(self.as_ref().to_glib_none().0)) - } - } - - fn save(&self) -> Result<(), Error> { - unsafe { - let mut error = ptr::null_mut(); - let _ = ffi::gst_encoding_target_save(self.as_ref().to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } - - fn save_to_file>(&self, filepath: P) -> Result<(), Error> { - unsafe { - let mut error = ptr::null_mut(); - let _ = ffi::gst_encoding_target_save_to_file(self.as_ref().to_glib_none().0, filepath.as_ref().to_glib_none().0, &mut error); - if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) } - } - } -} diff --git a/gstreamer-pbutils/src/auto/encoding_video_profile.rs b/gstreamer-pbutils/src/auto/encoding_video_profile.rs index 265358410..89565c3d9 100644 --- a/gstreamer-pbutils/src/auto/encoding_video_profile.rs +++ b/gstreamer-pbutils/src/auto/encoding_video_profile.rs @@ -30,5 +30,3 @@ impl EncodingVideoProfile { unsafe impl Send for EncodingVideoProfile {} unsafe impl Sync for EncodingVideoProfile {} - -pub const NONE_ENCODING_VIDEO_PROFILE: Option<&EncodingVideoProfile> = None; diff --git a/gstreamer-pbutils/src/auto/mod.rs b/gstreamer-pbutils/src/auto/mod.rs index 7c7c3bf7a..5207dd444 100644 --- a/gstreamer-pbutils/src/auto/mod.rs +++ b/gstreamer-pbutils/src/auto/mod.rs @@ -3,30 +3,29 @@ // DO NOT EDIT mod discoverer; -pub use self::discoverer::{Discoverer, DiscovererClass, NONE_DISCOVERER}; +pub use self::discoverer::{Discoverer, DiscovererClass}; mod discoverer_audio_info; -pub use self::discoverer_audio_info::{DiscovererAudioInfo, DiscovererAudioInfoClass, NONE_DISCOVERER_AUDIO_INFO}; +pub use self::discoverer_audio_info::{DiscovererAudioInfo, DiscovererAudioInfoClass}; mod discoverer_container_info; -pub use self::discoverer_container_info::{DiscovererContainerInfo, DiscovererContainerInfoClass, NONE_DISCOVERER_CONTAINER_INFO}; +pub use self::discoverer_container_info::{DiscovererContainerInfo, DiscovererContainerInfoClass}; mod discoverer_info; -pub use self::discoverer_info::{DiscovererInfo, DiscovererInfoClass, NONE_DISCOVERER_INFO}; -pub use self::discoverer_info::DiscovererInfoExt; +pub use self::discoverer_info::{DiscovererInfo, DiscovererInfoClass}; mod discoverer_stream_info; pub use self::discoverer_stream_info::{DiscovererStreamInfo, DiscovererStreamInfoClass, NONE_DISCOVERER_STREAM_INFO}; pub use self::discoverer_stream_info::DiscovererStreamInfoExt; mod discoverer_subtitle_info; -pub use self::discoverer_subtitle_info::{DiscovererSubtitleInfo, DiscovererSubtitleInfoClass, NONE_DISCOVERER_SUBTITLE_INFO}; +pub use self::discoverer_subtitle_info::{DiscovererSubtitleInfo, DiscovererSubtitleInfoClass}; mod discoverer_video_info; -pub use self::discoverer_video_info::{DiscovererVideoInfo, DiscovererVideoInfoClass, NONE_DISCOVERER_VIDEO_INFO}; +pub use self::discoverer_video_info::{DiscovererVideoInfo, DiscovererVideoInfoClass}; mod encoding_audio_profile; -pub use self::encoding_audio_profile::{EncodingAudioProfile, EncodingAudioProfileClass, NONE_ENCODING_AUDIO_PROFILE}; +pub use self::encoding_audio_profile::{EncodingAudioProfile, EncodingAudioProfileClass}; mod encoding_container_profile; pub use self::encoding_container_profile::{EncodingContainerProfile, EncodingContainerProfileClass, NONE_ENCODING_CONTAINER_PROFILE}; @@ -37,11 +36,10 @@ pub use self::encoding_profile::{EncodingProfile, EncodingProfileClass, NONE_ENC pub use self::encoding_profile::EncodingProfileExt; mod encoding_target; -pub use self::encoding_target::{EncodingTarget, EncodingTargetClass, NONE_ENCODING_TARGET}; -pub use self::encoding_target::EncodingTargetExt; +pub use self::encoding_target::{EncodingTarget, EncodingTargetClass}; mod encoding_video_profile; -pub use self::encoding_video_profile::{EncodingVideoProfile, EncodingVideoProfileClass, NONE_ENCODING_VIDEO_PROFILE}; +pub use self::encoding_video_profile::{EncodingVideoProfile, EncodingVideoProfileClass}; mod enums; pub use self::enums::DiscovererResult; @@ -53,9 +51,7 @@ pub mod functions; #[doc(hidden)] pub mod traits { - pub use super::DiscovererInfoExt; pub use super::DiscovererStreamInfoExt; pub use super::EncodingContainerProfileExt; pub use super::EncodingProfileExt; - pub use super::EncodingTargetExt; } diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-pbutils/src/auto/versions.txt +++ b/gstreamer-pbutils/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-player/src/auto/mod.rs b/gstreamer-player/src/auto/mod.rs index 02d0fdbc4..6ae19e41e 100644 --- a/gstreamer-player/src/auto/mod.rs +++ b/gstreamer-player/src/auto/mod.rs @@ -3,16 +3,16 @@ // DO NOT EDIT mod player; -pub use self::player::{Player, PlayerClass, NONE_PLAYER}; +pub use self::player::{Player, PlayerClass}; mod player_audio_info; -pub use self::player_audio_info::{PlayerAudioInfo, PlayerAudioInfoClass, NONE_PLAYER_AUDIO_INFO}; +pub use self::player_audio_info::{PlayerAudioInfo, PlayerAudioInfoClass}; mod player_gmain_context_signal_dispatcher; -pub use self::player_gmain_context_signal_dispatcher::{PlayerGMainContextSignalDispatcher, PlayerGMainContextSignalDispatcherClass, NONE_PLAYER_GMAIN_CONTEXT_SIGNAL_DISPATCHER}; +pub use self::player_gmain_context_signal_dispatcher::{PlayerGMainContextSignalDispatcher, PlayerGMainContextSignalDispatcherClass}; mod player_media_info; -pub use self::player_media_info::{PlayerMediaInfo, PlayerMediaInfoClass, NONE_PLAYER_MEDIA_INFO}; +pub use self::player_media_info::{PlayerMediaInfo, PlayerMediaInfoClass}; mod player_signal_dispatcher; pub use self::player_signal_dispatcher::{PlayerSignalDispatcher, NONE_PLAYER_SIGNAL_DISPATCHER}; @@ -23,13 +23,13 @@ pub use self::player_stream_info::{PlayerStreamInfo, PlayerStreamInfoClass, NONE pub use self::player_stream_info::PlayerStreamInfoExt; mod player_subtitle_info; -pub use self::player_subtitle_info::{PlayerSubtitleInfo, PlayerSubtitleInfoClass, NONE_PLAYER_SUBTITLE_INFO}; +pub use self::player_subtitle_info::{PlayerSubtitleInfo, PlayerSubtitleInfoClass}; mod player_video_info; -pub use self::player_video_info::{PlayerVideoInfo, PlayerVideoInfoClass, NONE_PLAYER_VIDEO_INFO}; +pub use self::player_video_info::{PlayerVideoInfo, PlayerVideoInfoClass}; mod player_video_overlay_video_renderer; -pub use self::player_video_overlay_video_renderer::{PlayerVideoOverlayVideoRenderer, PlayerVideoOverlayVideoRendererClass, NONE_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER}; +pub use self::player_video_overlay_video_renderer::{PlayerVideoOverlayVideoRenderer, PlayerVideoOverlayVideoRendererClass}; mod player_video_renderer; pub use self::player_video_renderer::{PlayerVideoRenderer, NONE_PLAYER_VIDEO_RENDERER}; diff --git a/gstreamer-player/src/auto/player.rs b/gstreamer-player/src/auto/player.rs index e1d74e9a6..2ab4d900b 100644 --- a/gstreamer-player/src/auto/player.rs +++ b/gstreamer-player/src/auto/player.rs @@ -16,7 +16,6 @@ use glib; use glib::GString; use glib::StaticType; use glib::Value; -use glib::object::IsA; use glib::object::ObjectType; use glib::signal::SignalHandlerId; use glib::signal::connect_raw; @@ -323,24 +322,24 @@ impl Player { } } - pub fn get_audio_streams>(info: &P) -> Vec { + pub fn get_audio_streams(info: &PlayerMediaInfo) -> Vec { skip_assert_initialized!(); unsafe { - FromGlibPtrContainer::from_glib_none(ffi::gst_player_get_audio_streams(info.as_ref().to_glib_none().0)) + FromGlibPtrContainer::from_glib_none(ffi::gst_player_get_audio_streams(info.to_glib_none().0)) } } - pub fn get_subtitle_streams>(info: &P) -> Vec { + pub fn get_subtitle_streams(info: &PlayerMediaInfo) -> Vec { skip_assert_initialized!(); unsafe { - FromGlibPtrContainer::from_glib_none(ffi::gst_player_get_subtitle_streams(info.as_ref().to_glib_none().0)) + FromGlibPtrContainer::from_glib_none(ffi::gst_player_get_subtitle_streams(info.to_glib_none().0)) } } - pub fn get_video_streams>(info: &P) -> Vec { + pub fn get_video_streams(info: &PlayerMediaInfo) -> Vec { skip_assert_initialized!(); unsafe { - FromGlibPtrContainer::from_glib_none(ffi::gst_player_get_video_streams(info.as_ref().to_glib_none().0)) + FromGlibPtrContainer::from_glib_none(ffi::gst_player_get_video_streams(info.to_glib_none().0)) } } @@ -555,8 +554,6 @@ impl Player { unsafe impl Send for Player {} unsafe impl Sync for Player {} -pub const NONE_PLAYER: Option<&Player> = None; - unsafe extern "C" fn buffering_trampoline(this: *mut ffi::GstPlayer, object: libc::c_int, f: glib_ffi::gpointer) { let f: &&(Fn(&Player, i32) + Send + 'static) = transmute(f); f(&from_glib_borrow(this), object) diff --git a/gstreamer-player/src/auto/player_audio_info.rs b/gstreamer-player/src/auto/player_audio_info.rs index c661ac26b..69c1ca241 100644 --- a/gstreamer-player/src/auto/player_audio_info.rs +++ b/gstreamer-player/src/auto/player_audio_info.rs @@ -49,5 +49,3 @@ impl PlayerAudioInfo { unsafe impl Send for PlayerAudioInfo {} unsafe impl Sync for PlayerAudioInfo {} - -pub const NONE_PLAYER_AUDIO_INFO: Option<&PlayerAudioInfo> = None; diff --git a/gstreamer-player/src/auto/player_gmain_context_signal_dispatcher.rs b/gstreamer-player/src/auto/player_gmain_context_signal_dispatcher.rs index 8aca3f89f..d514bd155 100644 --- a/gstreamer-player/src/auto/player_gmain_context_signal_dispatcher.rs +++ b/gstreamer-player/src/auto/player_gmain_context_signal_dispatcher.rs @@ -31,5 +31,3 @@ impl PlayerGMainContextSignalDispatcher { unsafe impl Send for PlayerGMainContextSignalDispatcher {} unsafe impl Sync for PlayerGMainContextSignalDispatcher {} - -pub const NONE_PLAYER_GMAIN_CONTEXT_SIGNAL_DISPATCHER: Option<&PlayerGMainContextSignalDispatcher> = None; diff --git a/gstreamer-player/src/auto/player_media_info.rs b/gstreamer-player/src/auto/player_media_info.rs index fba16652a..851dc2363 100644 --- a/gstreamer-player/src/auto/player_media_info.rs +++ b/gstreamer-player/src/auto/player_media_info.rs @@ -119,5 +119,3 @@ impl PlayerMediaInfo { unsafe impl Send for PlayerMediaInfo {} unsafe impl Sync for PlayerMediaInfo {} - -pub const NONE_PLAYER_MEDIA_INFO: Option<&PlayerMediaInfo> = None; diff --git a/gstreamer-player/src/auto/player_subtitle_info.rs b/gstreamer-player/src/auto/player_subtitle_info.rs index dabd9a261..ef3de8d08 100644 --- a/gstreamer-player/src/auto/player_subtitle_info.rs +++ b/gstreamer-player/src/auto/player_subtitle_info.rs @@ -25,5 +25,3 @@ impl PlayerSubtitleInfo { unsafe impl Send for PlayerSubtitleInfo {} unsafe impl Sync for PlayerSubtitleInfo {} - -pub const NONE_PLAYER_SUBTITLE_INFO: Option<&PlayerSubtitleInfo> = None; diff --git a/gstreamer-player/src/auto/player_video_info.rs b/gstreamer-player/src/auto/player_video_info.rs index 9146def5d..5f6eb6e83 100644 --- a/gstreamer-player/src/auto/player_video_info.rs +++ b/gstreamer-player/src/auto/player_video_info.rs @@ -42,5 +42,3 @@ impl PlayerVideoInfo { unsafe impl Send for PlayerVideoInfo {} unsafe impl Sync for PlayerVideoInfo {} - -pub const NONE_PLAYER_VIDEO_INFO: Option<&PlayerVideoInfo> = None; diff --git a/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs b/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs index 8e7d90603..4846f5e87 100644 --- a/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs +++ b/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs @@ -101,8 +101,6 @@ impl PlayerVideoOverlayVideoRenderer { unsafe impl Send for PlayerVideoOverlayVideoRenderer {} unsafe impl Sync for PlayerVideoOverlayVideoRenderer {} -pub const NONE_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER: Option<&PlayerVideoOverlayVideoRenderer> = None; - unsafe extern "C" fn notify_video_sink_trampoline(this: *mut ffi::GstPlayerVideoOverlayVideoRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { let f: &&(Fn(&PlayerVideoOverlayVideoRenderer) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-player/src/auto/versions.txt +++ b/gstreamer-player/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-rtsp-server/src/auto/versions.txt +++ b/gstreamer-rtsp-server/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-rtsp/src/auto/versions.txt +++ b/gstreamer-rtsp/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-sdp/src/auto/versions.txt +++ b/gstreamer-sdp/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-video/src/auto/versions.txt +++ b/gstreamer-video/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-webrtc/src/auto/mod.rs b/gstreamer-webrtc/src/auto/mod.rs index 40990d04e..beb0e21cc 100644 --- a/gstreamer-webrtc/src/auto/mod.rs +++ b/gstreamer-webrtc/src/auto/mod.rs @@ -3,19 +3,19 @@ // DO NOT EDIT mod web_rtcdtls_transport; -pub use self::web_rtcdtls_transport::{WebRTCDTLSTransport, WebRTCDTLSTransportClass, NONE_WEB_RTCDTLS_TRANSPORT}; +pub use self::web_rtcdtls_transport::{WebRTCDTLSTransport, WebRTCDTLSTransportClass}; mod web_rtcice_transport; -pub use self::web_rtcice_transport::{WebRTCICETransport, WebRTCICETransportClass, NONE_WEB_RTCICE_TRANSPORT}; +pub use self::web_rtcice_transport::{WebRTCICETransport, WebRTCICETransportClass}; mod web_rtcrtp_receiver; -pub use self::web_rtcrtp_receiver::{WebRTCRTPReceiver, WebRTCRTPReceiverClass, NONE_WEB_RTCRTP_RECEIVER}; +pub use self::web_rtcrtp_receiver::{WebRTCRTPReceiver, WebRTCRTPReceiverClass}; mod web_rtcrtp_sender; -pub use self::web_rtcrtp_sender::{WebRTCRTPSender, WebRTCRTPSenderClass, NONE_WEB_RTCRTP_SENDER}; +pub use self::web_rtcrtp_sender::{WebRTCRTPSender, WebRTCRTPSenderClass}; mod web_rtcrtp_transceiver; -pub use self::web_rtcrtp_transceiver::{WebRTCRTPTransceiver, WebRTCRTPTransceiverClass, NONE_WEB_RTCRTP_TRANSCEIVER}; +pub use self::web_rtcrtp_transceiver::{WebRTCRTPTransceiver, WebRTCRTPTransceiverClass}; mod web_rtc_session_description; pub use self::web_rtc_session_description::WebRTCSessionDescription; diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer-webrtc/src/auto/versions.txt +++ b/gstreamer-webrtc/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???) diff --git a/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs b/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs index 3ccd6adf1..d2e04e9ac 100644 --- a/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs +++ b/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs @@ -8,7 +8,6 @@ use ffi; use glib::GString; use glib::StaticType; use glib::Value; -use glib::object::IsA; use glib::object::ObjectType; use glib::signal::SignalHandlerId; use glib::signal::connect_raw; @@ -34,9 +33,9 @@ impl WebRTCDTLSTransport { } } - pub fn set_transport>(&self, ice: &P) { + pub fn set_transport(&self, ice: &WebRTCICETransport) { unsafe { - ffi::gst_webrtc_dtls_transport_set_transport(self.to_glib_none().0, ice.as_ref().to_glib_none().0); + ffi::gst_webrtc_dtls_transport_set_transport(self.to_glib_none().0, ice.to_glib_none().0); } } @@ -153,8 +152,6 @@ impl WebRTCDTLSTransport { unsafe impl Send for WebRTCDTLSTransport {} unsafe impl Sync for WebRTCDTLSTransport {} -pub const NONE_WEB_RTCDTLS_TRANSPORT: Option<&WebRTCDTLSTransport> = None; - unsafe extern "C" fn notify_certificate_trampoline(this: *mut ffi::GstWebRTCDTLSTransport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { let f: &&(Fn(&WebRTCDTLSTransport) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer-webrtc/src/auto/web_rtcice_transport.rs b/gstreamer-webrtc/src/auto/web_rtcice_transport.rs index 41f0470d3..79284c1f9 100644 --- a/gstreamer-webrtc/src/auto/web_rtcice_transport.rs +++ b/gstreamer-webrtc/src/auto/web_rtcice_transport.rs @@ -112,8 +112,6 @@ impl WebRTCICETransport { unsafe impl Send for WebRTCICETransport {} unsafe impl Sync for WebRTCICETransport {} -pub const NONE_WEB_RTCICE_TRANSPORT: Option<&WebRTCICETransport> = None; - unsafe extern "C" fn on_new_candidate_trampoline(this: *mut ffi::GstWebRTCICETransport, object: *mut libc::c_char, f: glib_ffi::gpointer) { let f: &&(Fn(&WebRTCICETransport, &str) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this), &GString::from_glib_borrow(object)) diff --git a/gstreamer-webrtc/src/auto/web_rtcrtp_receiver.rs b/gstreamer-webrtc/src/auto/web_rtcrtp_receiver.rs index 02b2304a9..a35387281 100644 --- a/gstreamer-webrtc/src/auto/web_rtcrtp_receiver.rs +++ b/gstreamer-webrtc/src/auto/web_rtcrtp_receiver.rs @@ -4,7 +4,6 @@ use WebRTCDTLSTransport; use ffi; -use glib::object::IsA; use glib::translate::*; glib_wrapper! { @@ -23,15 +22,15 @@ impl WebRTCRTPReceiver { } } - pub fn set_rtcp_transport>(&self, transport: &P) { + pub fn set_rtcp_transport(&self, transport: &WebRTCDTLSTransport) { unsafe { - ffi::gst_webrtc_rtp_receiver_set_rtcp_transport(self.to_glib_none().0, transport.as_ref().to_glib_none().0); + ffi::gst_webrtc_rtp_receiver_set_rtcp_transport(self.to_glib_none().0, transport.to_glib_none().0); } } - pub fn set_transport>(&self, transport: &P) { + pub fn set_transport(&self, transport: &WebRTCDTLSTransport) { unsafe { - ffi::gst_webrtc_rtp_receiver_set_transport(self.to_glib_none().0, transport.as_ref().to_glib_none().0); + ffi::gst_webrtc_rtp_receiver_set_transport(self.to_glib_none().0, transport.to_glib_none().0); } } } @@ -44,5 +43,3 @@ impl Default for WebRTCRTPReceiver { unsafe impl Send for WebRTCRTPReceiver {} unsafe impl Sync for WebRTCRTPReceiver {} - -pub const NONE_WEB_RTCRTP_RECEIVER: Option<&WebRTCRTPReceiver> = None; diff --git a/gstreamer-webrtc/src/auto/web_rtcrtp_sender.rs b/gstreamer-webrtc/src/auto/web_rtcrtp_sender.rs index a8e04136b..5437f695c 100644 --- a/gstreamer-webrtc/src/auto/web_rtcrtp_sender.rs +++ b/gstreamer-webrtc/src/auto/web_rtcrtp_sender.rs @@ -4,7 +4,6 @@ use WebRTCDTLSTransport; use ffi; -use glib::object::IsA; use glib::translate::*; glib_wrapper! { @@ -23,15 +22,15 @@ impl WebRTCRTPSender { } } - pub fn set_rtcp_transport>(&self, transport: &P) { + pub fn set_rtcp_transport(&self, transport: &WebRTCDTLSTransport) { unsafe { - ffi::gst_webrtc_rtp_sender_set_rtcp_transport(self.to_glib_none().0, transport.as_ref().to_glib_none().0); + ffi::gst_webrtc_rtp_sender_set_rtcp_transport(self.to_glib_none().0, transport.to_glib_none().0); } } - pub fn set_transport>(&self, transport: &P) { + pub fn set_transport(&self, transport: &WebRTCDTLSTransport) { unsafe { - ffi::gst_webrtc_rtp_sender_set_transport(self.to_glib_none().0, transport.as_ref().to_glib_none().0); + ffi::gst_webrtc_rtp_sender_set_transport(self.to_glib_none().0, transport.to_glib_none().0); } } } @@ -44,5 +43,3 @@ impl Default for WebRTCRTPSender { unsafe impl Send for WebRTCRTPSender {} unsafe impl Sync for WebRTCRTPSender {} - -pub const NONE_WEB_RTCRTP_SENDER: Option<&WebRTCRTPSender> = None; diff --git a/gstreamer-webrtc/src/auto/web_rtcrtp_transceiver.rs b/gstreamer-webrtc/src/auto/web_rtcrtp_transceiver.rs index 95d82afb3..ff7e0d53a 100644 --- a/gstreamer-webrtc/src/auto/web_rtcrtp_transceiver.rs +++ b/gstreamer-webrtc/src/auto/web_rtcrtp_transceiver.rs @@ -47,5 +47,3 @@ impl WebRTCRTPTransceiver { unsafe impl Send for WebRTCRTPTransceiver {} unsafe impl Sync for WebRTCRTPTransceiver {} - -pub const NONE_WEB_RTCRTP_TRANSCEIVER: Option<&WebRTCRTPTransceiver> = None; diff --git a/gstreamer/src/auto/bus.rs b/gstreamer/src/auto/bus.rs index f8ce37118..31dffe293 100644 --- a/gstreamer/src/auto/bus.rs +++ b/gstreamer/src/auto/bus.rs @@ -148,8 +148,6 @@ impl Default for Bus { unsafe impl Send for Bus {} unsafe impl Sync for Bus {} -pub const NONE_BUS: Option<&Bus> = None; - unsafe extern "C" fn message_trampoline(this: *mut ffi::GstBus, message: *mut ffi::GstMessage, f: glib_ffi::gpointer) { let f: &&(Fn(&Bus, &Message) + Send + 'static) = transmute(f); f(&from_glib_borrow(this), &from_glib_borrow(message)) diff --git a/gstreamer/src/auto/device_provider.rs b/gstreamer/src/auto/device_provider.rs index b098b62b6..5006e8cf1 100644 --- a/gstreamer/src/auto/device_provider.rs +++ b/gstreamer/src/auto/device_provider.rs @@ -29,11 +29,11 @@ glib_wrapper! { } impl DeviceProvider { - pub fn register<'a, P: IsA + 'a, Q: Into>>(plugin: Q, name: &str, rank: u32, type_: glib::types::Type) -> Result<(), glib::error::BoolError> { + pub fn register<'a, P: Into>>(plugin: P, name: &str, rank: u32, type_: glib::types::Type) -> Result<(), glib::error::BoolError> { assert_initialized_main_thread!(); let plugin = plugin.into(); unsafe { - glib_result_from_gboolean!(ffi::gst_device_provider_register(plugin.map(|p| p.as_ref()).to_glib_none().0, name.to_glib_none().0, rank, type_.to_glib()), "Failed to register device provider factory") + glib_result_from_gboolean!(ffi::gst_device_provider_register(plugin.to_glib_none().0, name.to_glib_none().0, rank, type_.to_glib()), "Failed to register device provider factory") } } } diff --git a/gstreamer/src/auto/device_provider_factory.rs b/gstreamer/src/auto/device_provider_factory.rs index 10cad7026..33ebcb097 100644 --- a/gstreamer/src/auto/device_provider_factory.rs +++ b/gstreamer/src/auto/device_provider_factory.rs @@ -81,5 +81,3 @@ impl DeviceProviderFactory { unsafe impl Send for DeviceProviderFactory {} unsafe impl Sync for DeviceProviderFactory {} - -pub const NONE_DEVICE_PROVIDER_FACTORY: Option<&DeviceProviderFactory> = None; diff --git a/gstreamer/src/auto/element.rs b/gstreamer/src/auto/element.rs index 127e4063d..098821e98 100644 --- a/gstreamer/src/auto/element.rs +++ b/gstreamer/src/auto/element.rs @@ -47,11 +47,11 @@ impl Element { } } - pub fn register<'a, P: IsA + 'a, Q: Into>>(plugin: Q, name: &str, rank: u32, type_: glib::types::Type) -> Result<(), glib::error::BoolError> { + pub fn register<'a, P: Into>>(plugin: P, name: &str, rank: u32, type_: glib::types::Type) -> Result<(), glib::error::BoolError> { assert_initialized_main_thread!(); let plugin = plugin.into(); unsafe { - glib_result_from_gboolean!(ffi::gst_element_register(plugin.map(|p| p.as_ref()).to_glib_none().0, name.to_glib_none().0, rank, type_.to_glib()), "Failed to register element factory") + glib_result_from_gboolean!(ffi::gst_element_register(plugin.to_glib_none().0, name.to_glib_none().0, rank, type_.to_glib()), "Failed to register element factory") } } } @@ -88,7 +88,7 @@ pub trait ElementExt: 'static { fn get_compatible_pad<'a, P: IsA, Q: Into>>(&self, pad: &P, caps: Q) -> Option; - fn get_compatible_pad_template>(&self, compattempl: &P) -> Option; + fn get_compatible_pad_template(&self, compattempl: &PadTemplate) -> Option; fn get_context(&self, context_type: &str) -> Option; @@ -139,11 +139,11 @@ pub trait ElementExt: 'static { fn remove_pad>(&self, pad: &P) -> Result<(), glib::error::BoolError>; - fn request_pad<'a, 'b, P: IsA, Q: Into>, R: Into>>(&self, templ: &P, name: Q, caps: R) -> Option; + fn request_pad<'a, 'b, P: Into>, Q: Into>>(&self, templ: &PadTemplate, name: P, caps: Q) -> Option; fn set_base_time(&self, time: ClockTime); - fn set_bus<'a, P: IsA + 'a, Q: Into>>(&self, bus: Q); + fn set_bus<'a, P: Into>>(&self, bus: P); fn set_clock<'a, P: IsA + 'a, Q: Into>>(&self, clock: Q) -> Result<(), glib::error::BoolError>; @@ -232,9 +232,9 @@ impl> ElementExt for O { } } - fn get_compatible_pad_template>(&self, compattempl: &P) -> Option { + fn get_compatible_pad_template(&self, compattempl: &PadTemplate) -> Option { unsafe { - from_glib_none(ffi::gst_element_get_compatible_pad_template(self.as_ref().to_glib_none().0, compattempl.as_ref().to_glib_none().0)) + from_glib_none(ffi::gst_element_get_compatible_pad_template(self.as_ref().to_glib_none().0, compattempl.to_glib_none().0)) } } @@ -379,11 +379,11 @@ impl> ElementExt for O { } } - fn request_pad<'a, 'b, P: IsA, Q: Into>, R: Into>>(&self, templ: &P, name: Q, caps: R) -> Option { + fn request_pad<'a, 'b, P: Into>, Q: Into>>(&self, templ: &PadTemplate, name: P, caps: Q) -> Option { let name = name.into(); let caps = caps.into(); unsafe { - from_glib_full(ffi::gst_element_request_pad(self.as_ref().to_glib_none().0, templ.as_ref().to_glib_none().0, name.to_glib_none().0, caps.to_glib_none().0)) + from_glib_full(ffi::gst_element_request_pad(self.as_ref().to_glib_none().0, templ.to_glib_none().0, name.to_glib_none().0, caps.to_glib_none().0)) } } @@ -393,10 +393,10 @@ impl> ElementExt for O { } } - fn set_bus<'a, P: IsA + 'a, Q: Into>>(&self, bus: Q) { + fn set_bus<'a, P: Into>>(&self, bus: P) { let bus = bus.into(); unsafe { - ffi::gst_element_set_bus(self.as_ref().to_glib_none().0, bus.map(|p| p.as_ref()).to_glib_none().0); + ffi::gst_element_set_bus(self.as_ref().to_glib_none().0, bus.to_glib_none().0); } } diff --git a/gstreamer/src/auto/element_factory.rs b/gstreamer/src/auto/element_factory.rs index a5d5ceefa..d3c3693e2 100644 --- a/gstreamer/src/auto/element_factory.rs +++ b/gstreamer/src/auto/element_factory.rs @@ -142,5 +142,3 @@ impl ElementFactory { unsafe impl Send for ElementFactory {} unsafe impl Sync for ElementFactory {} - -pub const NONE_ELEMENT_FACTORY: Option<&ElementFactory> = None; diff --git a/gstreamer/src/auto/ghost_pad.rs b/gstreamer/src/auto/ghost_pad.rs index b9b871a87..13612b84a 100644 --- a/gstreamer/src/auto/ghost_pad.rs +++ b/gstreamer/src/auto/ghost_pad.rs @@ -30,11 +30,11 @@ impl GhostPad { } } - pub fn new_no_target_from_template<'a, P: Into>, Q: IsA>(name: P, templ: &Q) -> GhostPad { + pub fn new_no_target_from_template<'a, P: Into>>(name: P, templ: &PadTemplate) -> GhostPad { skip_assert_initialized!(); let name = name.into(); unsafe { - Pad::from_glib_none(ffi::gst_ghost_pad_new_no_target_from_template(name.to_glib_none().0, templ.as_ref().to_glib_none().0)).unsafe_cast() + Pad::from_glib_none(ffi::gst_ghost_pad_new_no_target_from_template(name.to_glib_none().0, templ.to_glib_none().0)).unsafe_cast() } } } diff --git a/gstreamer/src/auto/mod.rs b/gstreamer/src/auto/mod.rs index db8c7fabe..4f1e2db08 100644 --- a/gstreamer/src/auto/mod.rs +++ b/gstreamer/src/auto/mod.rs @@ -11,7 +11,7 @@ pub use self::buffer_pool::{BufferPool, BufferPoolClass, NONE_BUFFER_POOL}; pub use self::buffer_pool::BufferPoolExt; mod bus; -pub use self::bus::{Bus, BusClass, NONE_BUS}; +pub use self::bus::{Bus, BusClass}; mod child_proxy; pub use self::child_proxy::{ChildProxy, NONE_CHILD_PROXY}; @@ -34,14 +34,14 @@ pub use self::device_provider::{DeviceProvider, DeviceProviderClass, NONE_DEVICE pub use self::device_provider::DeviceProviderExt; mod device_provider_factory; -pub use self::device_provider_factory::{DeviceProviderFactory, DeviceProviderFactoryClass, NONE_DEVICE_PROVIDER_FACTORY}; +pub use self::device_provider_factory::{DeviceProviderFactory, DeviceProviderFactoryClass}; mod element; pub use self::element::{Element, ElementClass, NONE_ELEMENT}; pub use self::element::ElementExt; mod element_factory; -pub use self::element_factory::{ElementFactory, ElementFactoryClass, NONE_ELEMENT_FACTORY}; +pub use self::element_factory::{ElementFactory, ElementFactoryClass}; mod ghost_pad; pub use self::ghost_pad::{GhostPad, GhostPadClass, NONE_GHOST_PAD}; @@ -56,14 +56,14 @@ pub use self::pad::{Pad, PadClass, NONE_PAD}; pub use self::pad::PadExt; mod pad_template; -pub use self::pad_template::{PadTemplate, PadTemplateClass, NONE_PAD_TEMPLATE}; +pub use self::pad_template::{PadTemplate, PadTemplateClass}; mod pipeline; pub use self::pipeline::{Pipeline, PipelineClass, NONE_PIPELINE}; pub use self::pipeline::PipelineExt; mod plugin; -pub use self::plugin::{Plugin, PluginClass, NONE_PLUGIN}; +pub use self::plugin::{Plugin, PluginClass}; mod plugin_feature; pub use self::plugin_feature::{PluginFeature, PluginFeatureClass, NONE_PLUGIN_FEATURE}; @@ -78,17 +78,17 @@ pub use self::proxy_pad::{ProxyPad, ProxyPadClass, NONE_PROXY_PAD}; pub use self::proxy_pad::ProxyPadExt; mod registry; -pub use self::registry::{Registry, RegistryClass, NONE_REGISTRY}; +pub use self::registry::{Registry, RegistryClass}; #[cfg(any(feature = "v1_10", feature = "dox"))] mod stream; #[cfg(any(feature = "v1_10", feature = "dox"))] -pub use self::stream::{Stream, StreamClass, NONE_STREAM}; +pub use self::stream::{Stream, StreamClass}; #[cfg(any(feature = "v1_10", feature = "dox"))] mod stream_collection; #[cfg(any(feature = "v1_10", feature = "dox"))] -pub use self::stream_collection::{StreamCollection, StreamCollectionClass, NONE_STREAM_COLLECTION}; +pub use self::stream_collection::{StreamCollection, StreamCollectionClass}; mod system_clock; pub use self::system_clock::{SystemClock, SystemClockClass, NONE_SYSTEM_CLOCK}; @@ -103,7 +103,7 @@ pub use self::toc_setter::{TocSetter, NONE_TOC_SETTER}; pub use self::toc_setter::TocSetterExt; mod type_find_factory; -pub use self::type_find_factory::{TypeFindFactory, TypeFindFactoryClass, NONE_TYPE_FIND_FACTORY}; +pub use self::type_find_factory::{TypeFindFactory, TypeFindFactoryClass}; mod uri_handler; pub use self::uri_handler::{URIHandler, NONE_URI_HANDLER}; diff --git a/gstreamer/src/auto/pad.rs b/gstreamer/src/auto/pad.rs index 004699ecd..e65065793 100644 --- a/gstreamer/src/auto/pad.rs +++ b/gstreamer/src/auto/pad.rs @@ -48,11 +48,11 @@ impl Pad { } } - pub fn new_from_template<'a, P: IsA, Q: Into>>(templ: &P, name: Q) -> Pad { + pub fn new_from_template<'a, P: Into>>(templ: &PadTemplate, name: P) -> Pad { skip_assert_initialized!(); let name = name.into(); unsafe { - from_glib_none(ffi::gst_pad_new_from_template(templ.as_ref().to_glib_none().0, name.to_glib_none().0)) + from_glib_none(ffi::gst_pad_new_from_template(templ.to_glib_none().0, name.to_glib_none().0)) } } } @@ -183,7 +183,7 @@ pub trait PadExt: 'static { fn get_property_template(&self) -> Option; - fn set_property_template + glib::value::SetValueOptional>(&self, template: Option<&P>); + fn set_property_template(&self, template: Option<&PadTemplate>); fn connect_linked(&self, f: F) -> SignalHandlerId; @@ -514,7 +514,7 @@ impl> PadExt for O { } } - fn set_property_template + glib::value::SetValueOptional>(&self, template: Option<&P>) { + fn set_property_template(&self, template: Option<&PadTemplate>) { unsafe { gobject_ffi::g_object_set_property(self.to_glib_none().0 as *mut gobject_ffi::GObject, b"template\0".as_ptr() as *const _, Value::from(template).to_glib_none().0); } diff --git a/gstreamer/src/auto/pad_template.rs b/gstreamer/src/auto/pad_template.rs index 1b05a8fd9..3c2617639 100644 --- a/gstreamer/src/auto/pad_template.rs +++ b/gstreamer/src/auto/pad_template.rs @@ -104,8 +104,6 @@ impl PadTemplate { unsafe impl Send for PadTemplate {} unsafe impl Sync for PadTemplate {} -pub const NONE_PAD_TEMPLATE: Option<&PadTemplate> = None; - unsafe extern "C" fn pad_created_trampoline(this: *mut ffi::GstPadTemplate, pad: *mut ffi::GstPad, f: glib_ffi::gpointer) { let f: &&(Fn(&PadTemplate, &Pad) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this), &from_glib_borrow(pad)) diff --git a/gstreamer/src/auto/plugin.rs b/gstreamer/src/auto/plugin.rs index 71c10cadc..571a616a7 100644 --- a/gstreamer/src/auto/plugin.rs +++ b/gstreamer/src/auto/plugin.rs @@ -122,5 +122,3 @@ impl Plugin { unsafe impl Send for Plugin {} unsafe impl Sync for Plugin {} - -pub const NONE_PLUGIN: Option<&Plugin> = None; diff --git a/gstreamer/src/auto/registry.rs b/gstreamer/src/auto/registry.rs index 5bdde1c91..7bbd58c48 100644 --- a/gstreamer/src/auto/registry.rs +++ b/gstreamer/src/auto/registry.rs @@ -32,9 +32,9 @@ impl Registry { } } - pub fn add_plugin>(&self, plugin: &P) -> Result<(), glib::error::BoolError> { + pub fn add_plugin(&self, plugin: &Plugin) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!(ffi::gst_registry_add_plugin(self.to_glib_none().0, plugin.as_ref().to_glib_none().0), "Failed to add plugin") + glib_result_from_gboolean!(ffi::gst_registry_add_plugin(self.to_glib_none().0, plugin.to_glib_none().0), "Failed to add plugin") } } @@ -106,9 +106,9 @@ impl Registry { } } - pub fn remove_plugin>(&self, plugin: &P) { + pub fn remove_plugin(&self, plugin: &Plugin) { unsafe { - ffi::gst_registry_remove_plugin(self.to_glib_none().0, plugin.as_ref().to_glib_none().0); + ffi::gst_registry_remove_plugin(self.to_glib_none().0, plugin.to_glib_none().0); } } @@ -145,8 +145,6 @@ impl Registry { unsafe impl Send for Registry {} unsafe impl Sync for Registry {} -pub const NONE_REGISTRY: Option<&Registry> = None; - unsafe extern "C" fn feature_added_trampoline(this: *mut ffi::GstRegistry, feature: *mut ffi::GstPluginFeature, f: glib_ffi::gpointer) { let f: &&(Fn(&Registry, &PluginFeature) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this), &from_glib_borrow(feature)) diff --git a/gstreamer/src/auto/stream.rs b/gstreamer/src/auto/stream.rs index df23da477..f8039fd41 100644 --- a/gstreamer/src/auto/stream.rs +++ b/gstreamer/src/auto/stream.rs @@ -194,8 +194,6 @@ impl Stream { unsafe impl Send for Stream {} unsafe impl Sync for Stream {} -pub const NONE_STREAM: Option<&Stream> = None; - unsafe extern "C" fn notify_caps_trampoline(this: *mut ffi::GstStream, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { let f: &&(Fn(&Stream) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer/src/auto/stream_collection.rs b/gstreamer/src/auto/stream_collection.rs index 451c566a8..e660469d1 100644 --- a/gstreamer/src/auto/stream_collection.rs +++ b/gstreamer/src/auto/stream_collection.rs @@ -79,8 +79,6 @@ impl StreamCollection { unsafe impl Send for StreamCollection {} unsafe impl Sync for StreamCollection {} -pub const NONE_STREAM_COLLECTION: Option<&StreamCollection> = None; - unsafe extern "C" fn notify_upstream_id_trampoline(this: *mut ffi::GstStreamCollection, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer) { let f: &&(Fn(&StreamCollection) + Send + Sync + 'static) = transmute(f); f(&from_glib_borrow(this)) diff --git a/gstreamer/src/auto/type_find_factory.rs b/gstreamer/src/auto/type_find_factory.rs index 4feea8285..e43276b21 100644 --- a/gstreamer/src/auto/type_find_factory.rs +++ b/gstreamer/src/auto/type_find_factory.rs @@ -50,5 +50,3 @@ impl TypeFindFactory { unsafe impl Send for TypeFindFactory {} unsafe impl Sync for TypeFindFactory {} - -pub const NONE_TYPE_FIND_FACTORY: Option<&TypeFindFactory> = None; diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt index c2ed9e767..502cec64b 100644 --- a/gstreamer/src/auto/versions.txt +++ b/gstreamer/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ dd6fb0a) +Generated by gir (https://github.com/gtk-rs/gir @ 4620f19) from gir-files (https://github.com/gtk-rs/gir-files @ ???)