From 33fb38efd9063fcd26aeed18f5cee2079b1a74b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 17 Aug 2017 14:50:25 +0300 Subject: [PATCH] Remove traits for things that are not subclassed --- Gir_Gst.toml | 14 ++- Gir_GstPlayer.toml | 37 ++++-- gstreamer-player/src/auto/enums.rs | 2 +- gstreamer-player/src/auto/flags.rs | 2 +- gstreamer-player/src/auto/mod.rs | 14 +-- gstreamer-player/src/auto/player.rs | 2 +- .../src/auto/player_audio_info.rs | 33 ++---- ...player_g_main_context_signal_dispatcher.rs | 25 ++-- .../src/auto/player_media_info.rs | 77 ++++-------- .../src/auto/player_signal_dispatcher.rs | 2 +- .../src/auto/player_stream_info.rs | 2 +- .../src/auto/player_subtitle_info.rs | 17 +-- .../src/auto/player_video_info.rs | 37 ++---- .../player_video_overlay_video_renderer.rs | 110 ++++++++---------- .../src/auto/player_video_renderer.rs | 2 +- .../src/auto/player_visualization.rs | 2 +- gstreamer/src/auto/alias.rs | 2 +- gstreamer/src/auto/bin.rs | 2 +- gstreamer/src/auto/bus.rs | 2 +- gstreamer/src/auto/child_proxy.rs | 2 +- gstreamer/src/auto/clock.rs | 2 +- gstreamer/src/auto/date_time.rs | 2 +- gstreamer/src/auto/device.rs | 2 +- gstreamer/src/auto/device_monitor.rs | 2 +- gstreamer/src/auto/device_provider.rs | 2 +- gstreamer/src/auto/device_provider_factory.rs | 95 +++++++-------- gstreamer/src/auto/element.rs | 2 +- gstreamer/src/auto/element_factory.rs | 2 +- gstreamer/src/auto/enums.rs | 2 +- gstreamer/src/auto/flags.rs | 2 +- gstreamer/src/auto/functions.rs | 2 +- gstreamer/src/auto/ghost_pad.rs | 2 +- gstreamer/src/auto/mod.rs | 14 +-- gstreamer/src/auto/object.rs | 2 +- gstreamer/src/auto/pad.rs | 2 +- gstreamer/src/auto/pad_template.rs | 49 +++----- gstreamer/src/auto/pipeline.rs | 2 +- gstreamer/src/auto/plugin.rs | 2 +- gstreamer/src/auto/preset.rs | 2 +- gstreamer/src/auto/proxy_pad.rs | 2 +- gstreamer/src/auto/stream.rs | 58 +++------ gstreamer/src/auto/stream_collection.rs | 37 ++---- gstreamer/src/auto/system_clock.rs | 2 +- gstreamer/src/auto/tag_setter.rs | 2 +- gstreamer/src/auto/toc_setter.rs | 2 +- gstreamer/src/auto/u_r_i_handler.rs | 2 +- 46 files changed, 255 insertions(+), 426 deletions(-) diff --git a/Gir_Gst.toml b/Gir_Gst.toml index 7eb7e44ec..2c68808c8 100644 --- a/Gir_Gst.toml +++ b/Gir_Gst.toml @@ -24,7 +24,6 @@ generate = [ "Gst.SeekType", "Gst.FlowReturn", "Gst.PadDirection", - "Gst.PadTemplate", "Gst.PadPresence", "Gst.URIHandler", "Gst.URIType", @@ -41,7 +40,6 @@ generate = [ "Gst.StructureChangeType", "Gst.StreamStatusType", "Gst.DeviceProvider", - "Gst.DeviceProviderFactory", "Gst.StreamType", "Gst.StreamFlags", "Gst.PadLinkReturn", @@ -280,6 +278,11 @@ name = "Gst.ElementFactory" status = "generate" trait = false +[[object]] +name = "Gst.DeviceProviderFactory" +status = "generate" +trait = false + [[object]] name = "Gst.Device" status = "generate" @@ -450,6 +453,11 @@ status = "generate" # Pass by value ignore = true +[[object]] +name = "Gst.PadTemplate" +status = "generate" +trait = false + [[object]] name = "Gst.GhostPad" status = "generate" @@ -487,6 +495,7 @@ status = "generate" [[object]] name = "Gst.Stream" status = "generate" +trait = false [[object.property]] name = "caps" @@ -516,6 +525,7 @@ status = "generate" [[object]] name = "Gst.StreamCollection" status = "generate" +trait = false [[object.property]] name = "upstream-id" diff --git a/Gir_GstPlayer.toml b/Gir_GstPlayer.toml index d10c6e216..501977b57 100644 --- a/Gir_GstPlayer.toml +++ b/Gir_GstPlayer.toml @@ -14,18 +14,12 @@ external_libraries = [ ] generate = [ - "GstPlayer.PlayerAudioInfo", "GstPlayer.PlayerColorBalanceType", "GstPlayer.PlayerError", - "GstPlayer.PlayerGMainContextSignalDispatcher", - "GstPlayer.PlayerMediaInfo", "GstPlayer.PlayerSignalDispatcher", "GstPlayer.PlayerSnapshotFormat", "GstPlayer.PlayerState", "GstPlayer.PlayerStreamInfo", - "GstPlayer.PlayerSubtitleInfo", - "GstPlayer.PlayerVideoInfo", - "GstPlayer.PlayerVideoOverlayVideoRenderer", "GstPlayer.PlayerVideoRenderer", "GstPlayer.PlayerVisualization", ] @@ -59,7 +53,6 @@ name = "Gst.Structure" status = "manual" ref_mode = "ref-mut" - [[object]] name = "GstPlayer.Player" status = "generate" @@ -130,3 +123,33 @@ trait = false [[object.signal]] name = "warning" concurrency = "send" + +[[object]] +name = "GstPlayer.PlayerAudioInfo" +status = "generate" +trait = false + +[[object]] +name = "GstPlayer.PlayerVideoInfo" +status = "generate" +trait = false + +[[object]] +name = "GstPlayer.PlayerSubtitleInfo" +status = "generate" +trait = false + +[[object]] +name = "GstPlayer.PlayerMediaInfo" +status = "generate" +trait = false + +[[object]] +name = "GstPlayer.PlayerVideoOverlayVideoRenderer" +status = "generate" +trait = false + +[[object]] +name = "GstPlayer.PlayerGMainContextSignalDispatcher" +status = "generate" +trait = false diff --git a/gstreamer-player/src/auto/enums.rs b/gstreamer-player/src/auto/enums.rs index 3cc70186f..887866565 100644 --- a/gstreamer-player/src/auto/enums.rs +++ b/gstreamer-player/src/auto/enums.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-player/src/auto/flags.rs b/gstreamer-player/src/auto/flags.rs index 17773d34a..740fd776a 100644 --- a/gstreamer-player/src/auto/flags.rs +++ b/gstreamer-player/src/auto/flags.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-player/src/auto/mod.rs b/gstreamer-player/src/auto/mod.rs index f81b778a2..a51ff1ea3 100644 --- a/gstreamer-player/src/auto/mod.rs +++ b/gstreamer-player/src/auto/mod.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT mod player; @@ -6,15 +6,12 @@ pub use self::player::Player; mod player_audio_info; pub use self::player_audio_info::PlayerAudioInfo; -pub use self::player_audio_info::PlayerAudioInfoExt; mod player_g_main_context_signal_dispatcher; pub use self::player_g_main_context_signal_dispatcher::PlayerGMainContextSignalDispatcher; -pub use self::player_g_main_context_signal_dispatcher::PlayerGMainContextSignalDispatcherExt; mod player_media_info; pub use self::player_media_info::PlayerMediaInfo; -pub use self::player_media_info::PlayerMediaInfoExt; mod player_signal_dispatcher; pub use self::player_signal_dispatcher::PlayerSignalDispatcher; @@ -26,15 +23,12 @@ pub use self::player_stream_info::PlayerStreamInfoExt; mod player_subtitle_info; pub use self::player_subtitle_info::PlayerSubtitleInfo; -pub use self::player_subtitle_info::PlayerSubtitleInfoExt; mod player_video_info; pub use self::player_video_info::PlayerVideoInfo; -pub use self::player_video_info::PlayerVideoInfoExt; mod player_video_overlay_video_renderer; pub use self::player_video_overlay_video_renderer::PlayerVideoOverlayVideoRenderer; -pub use self::player_video_overlay_video_renderer::PlayerVideoOverlayVideoRendererExt; mod player_video_renderer; pub use self::player_video_renderer::PlayerVideoRenderer; @@ -51,13 +45,7 @@ pub use self::enums::PlayerState; #[doc(hidden)] pub mod traits { - pub use super::PlayerAudioInfoExt; - pub use super::PlayerGMainContextSignalDispatcherExt; - pub use super::PlayerMediaInfoExt; pub use super::PlayerSignalDispatcherExt; pub use super::PlayerStreamInfoExt; - pub use super::PlayerSubtitleInfoExt; - pub use super::PlayerVideoInfoExt; - pub use super::PlayerVideoOverlayVideoRendererExt; pub use super::PlayerVideoRendererExt; } diff --git a/gstreamer-player/src/auto/player.rs b/gstreamer-player/src/auto/player.rs index d32d16347..dd3e59c03 100644 --- a/gstreamer-player/src/auto/player.rs +++ b/gstreamer-player/src/auto/player.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Error; diff --git a/gstreamer-player/src/auto/player_audio_info.rs b/gstreamer-player/src/auto/player_audio_info.rs index bff45b4ab..ef2e11348 100644 --- a/gstreamer-player/src/auto/player_audio_info.rs +++ b/gstreamer-player/src/auto/player_audio_info.rs @@ -1,9 +1,8 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use PlayerStreamInfo; use ffi; -use glib::object::IsA; use glib::translate::*; use glib_ffi; use gobject_ffi; @@ -18,49 +17,37 @@ glib_wrapper! { } } -unsafe impl Send for PlayerAudioInfo {} -unsafe impl Sync for PlayerAudioInfo {} - -pub trait PlayerAudioInfoExt { - fn get_bitrate(&self) -> i32; - - fn get_channels(&self) -> i32; - - fn get_language(&self) -> Option; - - fn get_max_bitrate(&self) -> i32; - - fn get_sample_rate(&self) -> i32; -} - -impl> PlayerAudioInfoExt for O { - fn get_bitrate(&self) -> i32 { +impl PlayerAudioInfo { + pub fn get_bitrate(&self) -> i32 { unsafe { ffi::gst_player_audio_info_get_bitrate(self.to_glib_none().0) } } - fn get_channels(&self) -> i32 { + pub fn get_channels(&self) -> i32 { unsafe { ffi::gst_player_audio_info_get_channels(self.to_glib_none().0) } } - fn get_language(&self) -> Option { + pub fn get_language(&self) -> Option { unsafe { from_glib_none(ffi::gst_player_audio_info_get_language(self.to_glib_none().0)) } } - fn get_max_bitrate(&self) -> i32 { + pub fn get_max_bitrate(&self) -> i32 { unsafe { ffi::gst_player_audio_info_get_max_bitrate(self.to_glib_none().0) } } - fn get_sample_rate(&self) -> i32 { + pub fn get_sample_rate(&self) -> i32 { unsafe { ffi::gst_player_audio_info_get_sample_rate(self.to_glib_none().0) } } } + +unsafe impl Send for PlayerAudioInfo {} +unsafe impl Sync for PlayerAudioInfo {} diff --git a/gstreamer-player/src/auto/player_g_main_context_signal_dispatcher.rs b/gstreamer-player/src/auto/player_g_main_context_signal_dispatcher.rs index ac361ed86..7afc58a4e 100644 --- a/gstreamer-player/src/auto/player_g_main_context_signal_dispatcher.rs +++ b/gstreamer-player/src/auto/player_g_main_context_signal_dispatcher.rs @@ -1,11 +1,10 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use PlayerSignalDispatcher; use ffi; use glib; use glib::Value; -use glib::object::IsA; use glib::translate::*; use glib_ffi; use gobject_ffi; @@ -21,6 +20,14 @@ glib_wrapper! { } impl PlayerGMainContextSignalDispatcher { + pub fn get_property_application_context(&self) -> Option { + let mut value = Value::from(None::<&glib::MainContext>); + unsafe { + gobject_ffi::g_object_get_property(self.to_glib_none().0, "application-context".to_glib_none().0, value.to_glib_none_mut().0); + } + value.get() + } + pub fn new<'a, P: Into>>(application_context: P) -> Option { assert_initialized_main_thread!(); let application_context = application_context.into(); @@ -33,17 +40,3 @@ impl PlayerGMainContextSignalDispatcher { unsafe impl Send for PlayerGMainContextSignalDispatcher {} unsafe impl Sync for PlayerGMainContextSignalDispatcher {} - -pub trait PlayerGMainContextSignalDispatcherExt { - fn get_property_application_context(&self) -> Option; -} - -impl + IsA> PlayerGMainContextSignalDispatcherExt for O { - fn get_property_application_context(&self) -> Option { - let mut value = Value::from(None::<&glib::MainContext>); - unsafe { - gobject_ffi::g_object_get_property(self.to_glib_none().0, "application-context".to_glib_none().0, value.to_glib_none_mut().0); - } - value.get() - } -} diff --git a/gstreamer-player/src/auto/player_media_info.rs b/gstreamer-player/src/auto/player_media_info.rs index 21e342eee..4a67ffc81 100644 --- a/gstreamer-player/src/auto/player_media_info.rs +++ b/gstreamer-player/src/auto/player_media_info.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use PlayerAudioInfo; @@ -6,7 +6,6 @@ use PlayerStreamInfo; use PlayerSubtitleInfo; use PlayerVideoInfo; use ffi; -use glib::object::IsA; use glib::translate::*; use glib_ffi; use gobject_ffi; @@ -22,137 +21,103 @@ glib_wrapper! { } } -unsafe impl Send for PlayerMediaInfo {} -unsafe impl Sync for PlayerMediaInfo {} - -pub trait PlayerMediaInfoExt { - fn get_audio_streams(&self) -> Vec; - - fn get_container_format(&self) -> Option; - - fn get_duration(&self) -> gst::ClockTime; - - fn get_image_sample(&self) -> Option; - - fn get_number_of_audio_streams(&self) -> u32; - - fn get_number_of_streams(&self) -> u32; - - fn get_number_of_subtitle_streams(&self) -> u32; - - fn get_number_of_video_streams(&self) -> u32; - - fn get_stream_list(&self) -> Vec; - - fn get_subtitle_streams(&self) -> Vec; - - fn get_tags(&self) -> Option; - - fn get_title(&self) -> Option; - - fn get_uri(&self) -> Option; - - fn get_video_streams(&self) -> Vec; - - fn is_live(&self) -> bool; - - fn is_seekable(&self) -> bool; -} - -impl> PlayerMediaInfoExt for O { - fn get_audio_streams(&self) -> Vec { +impl PlayerMediaInfo { + pub fn get_audio_streams(&self) -> Vec { unsafe { FromGlibPtrContainer::from_glib_none(ffi::gst_player_media_info_get_audio_streams(self.to_glib_none().0)) } } - fn get_container_format(&self) -> Option { + pub fn get_container_format(&self) -> Option { unsafe { from_glib_none(ffi::gst_player_media_info_get_container_format(self.to_glib_none().0)) } } - fn get_duration(&self) -> gst::ClockTime { + pub fn get_duration(&self) -> gst::ClockTime { unsafe { ffi::gst_player_media_info_get_duration(self.to_glib_none().0) } } - fn get_image_sample(&self) -> Option { + pub fn get_image_sample(&self) -> Option { unsafe { from_glib_none(ffi::gst_player_media_info_get_image_sample(self.to_glib_none().0)) } } - fn get_number_of_audio_streams(&self) -> u32 { + pub fn get_number_of_audio_streams(&self) -> u32 { unsafe { ffi::gst_player_media_info_get_number_of_audio_streams(self.to_glib_none().0) } } - fn get_number_of_streams(&self) -> u32 { + pub fn get_number_of_streams(&self) -> u32 { unsafe { ffi::gst_player_media_info_get_number_of_streams(self.to_glib_none().0) } } - fn get_number_of_subtitle_streams(&self) -> u32 { + pub fn get_number_of_subtitle_streams(&self) -> u32 { unsafe { ffi::gst_player_media_info_get_number_of_subtitle_streams(self.to_glib_none().0) } } - fn get_number_of_video_streams(&self) -> u32 { + pub fn get_number_of_video_streams(&self) -> u32 { unsafe { ffi::gst_player_media_info_get_number_of_video_streams(self.to_glib_none().0) } } - fn get_stream_list(&self) -> Vec { + pub fn get_stream_list(&self) -> Vec { unsafe { FromGlibPtrContainer::from_glib_none(ffi::gst_player_media_info_get_stream_list(self.to_glib_none().0)) } } - fn get_subtitle_streams(&self) -> Vec { + pub fn get_subtitle_streams(&self) -> Vec { unsafe { FromGlibPtrContainer::from_glib_none(ffi::gst_player_media_info_get_subtitle_streams(self.to_glib_none().0)) } } - fn get_tags(&self) -> Option { + pub fn get_tags(&self) -> Option { unsafe { from_glib_none(ffi::gst_player_media_info_get_tags(self.to_glib_none().0)) } } - fn get_title(&self) -> Option { + pub fn get_title(&self) -> Option { unsafe { from_glib_none(ffi::gst_player_media_info_get_title(self.to_glib_none().0)) } } - fn get_uri(&self) -> Option { + pub fn get_uri(&self) -> Option { unsafe { from_glib_none(ffi::gst_player_media_info_get_uri(self.to_glib_none().0)) } } - fn get_video_streams(&self) -> Vec { + pub fn get_video_streams(&self) -> Vec { unsafe { FromGlibPtrContainer::from_glib_none(ffi::gst_player_media_info_get_video_streams(self.to_glib_none().0)) } } - fn is_live(&self) -> bool { + pub fn is_live(&self) -> bool { unsafe { from_glib(ffi::gst_player_media_info_is_live(self.to_glib_none().0)) } } - fn is_seekable(&self) -> bool { + pub fn is_seekable(&self) -> bool { unsafe { from_glib(ffi::gst_player_media_info_is_seekable(self.to_glib_none().0)) } } } + +unsafe impl Send for PlayerMediaInfo {} +unsafe impl Sync for PlayerMediaInfo {} diff --git a/gstreamer-player/src/auto/player_signal_dispatcher.rs b/gstreamer-player/src/auto/player_signal_dispatcher.rs index da678c4a5..06a87a594 100644 --- a/gstreamer-player/src/auto/player_signal_dispatcher.rs +++ b/gstreamer-player/src/auto/player_signal_dispatcher.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-player/src/auto/player_stream_info.rs b/gstreamer-player/src/auto/player_stream_info.rs index 5fb5f243b..75c7208da 100644 --- a/gstreamer-player/src/auto/player_stream_info.rs +++ b/gstreamer-player/src/auto/player_stream_info.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-player/src/auto/player_subtitle_info.rs b/gstreamer-player/src/auto/player_subtitle_info.rs index 3606b6086..3de7f370a 100644 --- a/gstreamer-player/src/auto/player_subtitle_info.rs +++ b/gstreamer-player/src/auto/player_subtitle_info.rs @@ -1,9 +1,8 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use PlayerStreamInfo; use ffi; -use glib::object::IsA; use glib::translate::*; use glib_ffi; use gobject_ffi; @@ -18,17 +17,13 @@ glib_wrapper! { } } -unsafe impl Send for PlayerSubtitleInfo {} -unsafe impl Sync for PlayerSubtitleInfo {} - -pub trait PlayerSubtitleInfoExt { - fn get_language(&self) -> Option; -} - -impl> PlayerSubtitleInfoExt for O { - fn get_language(&self) -> Option { +impl PlayerSubtitleInfo { + pub fn get_language(&self) -> Option { unsafe { from_glib_none(ffi::gst_player_subtitle_info_get_language(self.to_glib_none().0)) } } } + +unsafe impl Send for PlayerSubtitleInfo {} +unsafe impl Sync for PlayerSubtitleInfo {} diff --git a/gstreamer-player/src/auto/player_video_info.rs b/gstreamer-player/src/auto/player_video_info.rs index 8be9d5bd3..a6763b53d 100644 --- a/gstreamer-player/src/auto/player_video_info.rs +++ b/gstreamer-player/src/auto/player_video_info.rs @@ -1,9 +1,8 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use PlayerStreamInfo; use ffi; -use glib::object::IsA; use glib::translate::*; use glib_ffi; use gobject_ffi; @@ -18,31 +17,14 @@ glib_wrapper! { } } -unsafe impl Send for PlayerVideoInfo {} -unsafe impl Sync for PlayerVideoInfo {} - -pub trait PlayerVideoInfoExt { - fn get_bitrate(&self) -> i32; - - fn get_framerate(&self) -> (i32, i32); - - fn get_height(&self) -> i32; - - fn get_max_bitrate(&self) -> i32; - - fn get_pixel_aspect_ratio(&self) -> (u32, u32); - - fn get_width(&self) -> i32; -} - -impl> PlayerVideoInfoExt for O { - fn get_bitrate(&self) -> i32 { +impl PlayerVideoInfo { + pub fn get_bitrate(&self) -> i32 { unsafe { ffi::gst_player_video_info_get_bitrate(self.to_glib_none().0) } } - fn get_framerate(&self) -> (i32, i32) { + pub fn get_framerate(&self) -> (i32, i32) { unsafe { let mut fps_n = mem::uninitialized(); let mut fps_d = mem::uninitialized(); @@ -51,19 +33,19 @@ impl> PlayerVideoInfoExt for O { } } - fn get_height(&self) -> i32 { + pub fn get_height(&self) -> i32 { unsafe { ffi::gst_player_video_info_get_height(self.to_glib_none().0) } } - fn get_max_bitrate(&self) -> i32 { + pub fn get_max_bitrate(&self) -> i32 { unsafe { ffi::gst_player_video_info_get_max_bitrate(self.to_glib_none().0) } } - fn get_pixel_aspect_ratio(&self) -> (u32, u32) { + pub fn get_pixel_aspect_ratio(&self) -> (u32, u32) { unsafe { let mut par_n = mem::uninitialized(); let mut par_d = mem::uninitialized(); @@ -72,9 +54,12 @@ impl> PlayerVideoInfoExt for O { } } - fn get_width(&self) -> i32 { + pub fn get_width(&self) -> i32 { unsafe { ffi::gst_player_video_info_get_width(self.to_glib_none().0) } } } + +unsafe impl Send for PlayerVideoInfo {} +unsafe impl Sync for PlayerVideoInfo {} 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 35ca0605b..0b00bc434 100644 --- a/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs +++ b/gstreamer-player/src/auto/player_video_overlay_video_renderer.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use PlayerVideoRenderer; @@ -22,6 +22,51 @@ glib_wrapper! { } impl PlayerVideoOverlayVideoRenderer { + pub fn expose(&self) { + unsafe { + ffi::gst_player_video_overlay_video_renderer_expose(self.to_glib_none().0); + } + } + + pub fn get_render_rectangle(&self) -> (i32, i32, i32, i32) { + unsafe { + let mut x = mem::uninitialized(); + let mut y = mem::uninitialized(); + let mut width = mem::uninitialized(); + let mut height = mem::uninitialized(); + ffi::gst_player_video_overlay_video_renderer_get_render_rectangle(self.to_glib_none().0, &mut x, &mut y, &mut width, &mut height); + (x, y, width, height) + } + } + + //pub fn get_window_handle(&self) -> /*Unimplemented*/Option { + // unsafe { TODO: call ffi::gst_player_video_overlay_video_renderer_get_window_handle() } + //} + + pub fn set_render_rectangle(&self, x: i32, y: i32, width: i32, height: i32) { + unsafe { + ffi::gst_player_video_overlay_video_renderer_set_render_rectangle(self.to_glib_none().0, x, y, width, height); + } + } + + //pub fn set_window_handle>>(&self, window_handle: P) { + // unsafe { TODO: call ffi::gst_player_video_overlay_video_renderer_set_window_handle() } + //} + + pub fn get_property_video_sink(&self) -> Option { + let mut value = Value::from(None::<&gst::Element>); + unsafe { + gobject_ffi::g_object_get_property(self.to_glib_none().0, "video-sink".to_glib_none().0, value.to_glib_none_mut().0); + } + value.get() + } + + pub fn set_property_video_sink + IsA + glib::value::SetValueOptional>(&self, video_sink: Option<&P>) { + unsafe { + gobject_ffi::g_object_set_property(self.to_glib_none().0, "video-sink".to_glib_none().0, Value::from(video_sink).to_glib_none().0); + } + } + //pub fn new>>(window_handle: P) -> Option { // unsafe { TODO: call ffi::gst_player_video_overlay_video_renderer_new() } //} @@ -33,66 +78,3 @@ impl PlayerVideoOverlayVideoRenderer { unsafe impl Send for PlayerVideoOverlayVideoRenderer {} unsafe impl Sync for PlayerVideoOverlayVideoRenderer {} - -pub trait PlayerVideoOverlayVideoRendererExt { - fn expose(&self); - - fn get_render_rectangle(&self) -> (i32, i32, i32, i32); - - //fn get_window_handle(&self) -> /*Unimplemented*/Option; - - fn set_render_rectangle(&self, x: i32, y: i32, width: i32, height: i32); - - //fn set_window_handle>>(&self, window_handle: P); - - fn get_property_video_sink(&self) -> Option; - - fn set_property_video_sink + IsA + glib::value::SetValueOptional>(&self, video_sink: Option<&P>); -} - -impl + IsA> PlayerVideoOverlayVideoRendererExt for O { - fn expose(&self) { - unsafe { - ffi::gst_player_video_overlay_video_renderer_expose(self.to_glib_none().0); - } - } - - fn get_render_rectangle(&self) -> (i32, i32, i32, i32) { - unsafe { - let mut x = mem::uninitialized(); - let mut y = mem::uninitialized(); - let mut width = mem::uninitialized(); - let mut height = mem::uninitialized(); - ffi::gst_player_video_overlay_video_renderer_get_render_rectangle(self.to_glib_none().0, &mut x, &mut y, &mut width, &mut height); - (x, y, width, height) - } - } - - //fn get_window_handle(&self) -> /*Unimplemented*/Option { - // unsafe { TODO: call ffi::gst_player_video_overlay_video_renderer_get_window_handle() } - //} - - fn set_render_rectangle(&self, x: i32, y: i32, width: i32, height: i32) { - unsafe { - ffi::gst_player_video_overlay_video_renderer_set_render_rectangle(self.to_glib_none().0, x, y, width, height); - } - } - - //fn set_window_handle>>(&self, window_handle: P) { - // unsafe { TODO: call ffi::gst_player_video_overlay_video_renderer_set_window_handle() } - //} - - fn get_property_video_sink(&self) -> Option { - let mut value = Value::from(None::<&gst::Element>); - unsafe { - gobject_ffi::g_object_get_property(self.to_glib_none().0, "video-sink".to_glib_none().0, value.to_glib_none_mut().0); - } - value.get() - } - - fn set_property_video_sink + IsA + glib::value::SetValueOptional>(&self, video_sink: Option<&P>) { - unsafe { - gobject_ffi::g_object_set_property(self.to_glib_none().0, "video-sink".to_glib_none().0, Value::from(video_sink).to_glib_none().0); - } - } -} diff --git a/gstreamer-player/src/auto/player_video_renderer.rs b/gstreamer-player/src/auto/player_video_renderer.rs index 15d0d2eb7..ebe4266ac 100644 --- a/gstreamer-player/src/auto/player_video_renderer.rs +++ b/gstreamer-player/src/auto/player_video_renderer.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer-player/src/auto/player_visualization.rs b/gstreamer-player/src/auto/player_visualization.rs index d2bf7d404..76268d172 100644 --- a/gstreamer-player/src/auto/player_visualization.rs +++ b/gstreamer-player/src/auto/player_visualization.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (3294959) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/alias.rs b/gstreamer/src/auto/alias.rs index d9b1509de..782055d97 100644 --- a/gstreamer/src/auto/alias.rs +++ b/gstreamer/src/auto/alias.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT #[allow(unused_imports)] diff --git a/gstreamer/src/auto/bin.rs b/gstreamer/src/auto/bin.rs index 5de138752..30b548b75 100644 --- a/gstreamer/src/auto/bin.rs +++ b/gstreamer/src/auto/bin.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ChildProxy; diff --git a/gstreamer/src/auto/bus.rs b/gstreamer/src/auto/bus.rs index ca6bf9ea8..44a1e5b2c 100644 --- a/gstreamer/src/auto/bus.rs +++ b/gstreamer/src/auto/bus.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ClockTime; diff --git a/gstreamer/src/auto/child_proxy.rs b/gstreamer/src/auto/child_proxy.rs index 282a5bfbf..fc1a711c5 100644 --- a/gstreamer/src/auto/child_proxy.rs +++ b/gstreamer/src/auto/child_proxy.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/clock.rs b/gstreamer/src/auto/clock.rs index b9e84ef2d..2697f4915 100644 --- a/gstreamer/src/auto/clock.rs +++ b/gstreamer/src/auto/clock.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ClockTime; diff --git a/gstreamer/src/auto/date_time.rs b/gstreamer/src/auto/date_time.rs index bf94d57a9..ea4da8973 100644 --- a/gstreamer/src/auto/date_time.rs +++ b/gstreamer/src/auto/date_time.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/device.rs b/gstreamer/src/auto/device.rs index 13732bca3..dc341fd7e 100644 --- a/gstreamer/src/auto/device.rs +++ b/gstreamer/src/auto/device.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Caps; diff --git a/gstreamer/src/auto/device_monitor.rs b/gstreamer/src/auto/device_monitor.rs index 8534dca51..4dcd35289 100644 --- a/gstreamer/src/auto/device_monitor.rs +++ b/gstreamer/src/auto/device_monitor.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Bus; diff --git a/gstreamer/src/auto/device_provider.rs b/gstreamer/src/auto/device_provider.rs index 6c2184657..213cdc5e8 100644 --- a/gstreamer/src/auto/device_provider.rs +++ b/gstreamer/src/auto/device_provider.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Bus; diff --git a/gstreamer/src/auto/device_provider_factory.rs b/gstreamer/src/auto/device_provider_factory.rs index b367eb15a..f964b0e84 100644 --- a/gstreamer/src/auto/device_provider_factory.rs +++ b/gstreamer/src/auto/device_provider_factory.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use DeviceProvider; @@ -6,7 +6,6 @@ use Object; use Rank; use ffi; use glib; -use glib::object::IsA; use glib::translate::*; use glib_ffi; use gobject_ffi; @@ -22,6 +21,44 @@ glib_wrapper! { } impl DeviceProviderFactory { + pub fn get(&self) -> Option { + unsafe { + from_glib_full(ffi::gst_device_provider_factory_get(self.to_glib_none().0)) + } + } + + pub fn get_device_provider_type(&self) -> glib::types::Type { + unsafe { + from_glib(ffi::gst_device_provider_factory_get_device_provider_type(self.to_glib_none().0)) + } + } + + pub fn get_metadata(&self, key: &str) -> Option { + unsafe { + from_glib_none(ffi::gst_device_provider_factory_get_metadata(self.to_glib_none().0, key.to_glib_none().0)) + } + } + + pub fn get_metadata_keys(&self) -> Vec { + unsafe { + FromGlibPtrContainer::from_glib_full(ffi::gst_device_provider_factory_get_metadata_keys(self.to_glib_none().0)) + } + } + + pub fn has_classes<'a, P: Into>>(&self, classes: P) -> bool { + let classes = classes.into(); + let classes = classes.to_glib_none(); + unsafe { + from_glib(ffi::gst_device_provider_factory_has_classes(self.to_glib_none().0, classes.0)) + } + } + + pub fn has_classesv(&self, classes: &[&str]) -> bool { + unsafe { + from_glib(ffi::gst_device_provider_factory_has_classesv(self.to_glib_none().0, classes.to_glib_none().0)) + } + } + pub fn find(name: &str) -> Option { assert_initialized_main_thread!(); unsafe { @@ -46,57 +83,3 @@ impl DeviceProviderFactory { unsafe impl Send for DeviceProviderFactory {} unsafe impl Sync for DeviceProviderFactory {} - -pub trait DeviceProviderFactoryExt { - fn get(&self) -> Option; - - fn get_device_provider_type(&self) -> glib::types::Type; - - fn get_metadata(&self, key: &str) -> Option; - - fn get_metadata_keys(&self) -> Vec; - - fn has_classes<'a, P: Into>>(&self, classes: P) -> bool; - - fn has_classesv(&self, classes: &[&str]) -> bool; -} - -impl> DeviceProviderFactoryExt for O { - fn get(&self) -> Option { - unsafe { - from_glib_full(ffi::gst_device_provider_factory_get(self.to_glib_none().0)) - } - } - - fn get_device_provider_type(&self) -> glib::types::Type { - unsafe { - from_glib(ffi::gst_device_provider_factory_get_device_provider_type(self.to_glib_none().0)) - } - } - - fn get_metadata(&self, key: &str) -> Option { - unsafe { - from_glib_none(ffi::gst_device_provider_factory_get_metadata(self.to_glib_none().0, key.to_glib_none().0)) - } - } - - fn get_metadata_keys(&self) -> Vec { - unsafe { - FromGlibPtrContainer::from_glib_full(ffi::gst_device_provider_factory_get_metadata_keys(self.to_glib_none().0)) - } - } - - fn has_classes<'a, P: Into>>(&self, classes: P) -> bool { - let classes = classes.into(); - let classes = classes.to_glib_none(); - unsafe { - from_glib(ffi::gst_device_provider_factory_has_classes(self.to_glib_none().0, classes.0)) - } - } - - fn has_classesv(&self, classes: &[&str]) -> bool { - unsafe { - from_glib(ffi::gst_device_provider_factory_has_classesv(self.to_glib_none().0, classes.to_glib_none().0)) - } - } -} diff --git a/gstreamer/src/auto/element.rs b/gstreamer/src/auto/element.rs index faf22114d..68f70e47e 100644 --- a/gstreamer/src/auto/element.rs +++ b/gstreamer/src/auto/element.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Bus; diff --git a/gstreamer/src/auto/element_factory.rs b/gstreamer/src/auto/element_factory.rs index 0807015f8..160ae5df0 100644 --- a/gstreamer/src/auto/element_factory.rs +++ b/gstreamer/src/auto/element_factory.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Caps; diff --git a/gstreamer/src/auto/enums.rs b/gstreamer/src/auto/enums.rs index 1f9b116c7..022bf0295 100644 --- a/gstreamer/src/auto/enums.rs +++ b/gstreamer/src/auto/enums.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/flags.rs b/gstreamer/src/auto/flags.rs index 774b1e40e..08065deb2 100644 --- a/gstreamer/src/auto/flags.rs +++ b/gstreamer/src/auto/flags.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/functions.rs b/gstreamer/src/auto/functions.rs index 3c5614640..01a11022d 100644 --- a/gstreamer/src/auto/functions.rs +++ b/gstreamer/src/auto/functions.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Bin; diff --git a/gstreamer/src/auto/ghost_pad.rs b/gstreamer/src/auto/ghost_pad.rs index 8597f00ff..96dd32ad0 100644 --- a/gstreamer/src/auto/ghost_pad.rs +++ b/gstreamer/src/auto/ghost_pad.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Object; diff --git a/gstreamer/src/auto/mod.rs b/gstreamer/src/auto/mod.rs index c6e3b785c..4f8db6506 100644 --- a/gstreamer/src/auto/mod.rs +++ b/gstreamer/src/auto/mod.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT mod bin; @@ -30,7 +30,6 @@ pub use self::device_provider::DeviceProviderExt; mod device_provider_factory; pub use self::device_provider_factory::DeviceProviderFactory; -pub use self::device_provider_factory::DeviceProviderFactoryExt; mod element; pub use self::element::Element; @@ -53,7 +52,6 @@ pub use self::pad::PadExt; mod pad_template; pub use self::pad_template::PadTemplate; -pub use self::pad_template::PadTemplateExt; mod pipeline; pub use self::pipeline::Pipeline; @@ -74,15 +72,11 @@ pub use self::proxy_pad::ProxyPadExt; mod stream; #[cfg(feature = "v1_10")] pub use self::stream::Stream; -#[cfg(feature = "v1_10")] -pub use self::stream::StreamExt; #[cfg(feature = "v1_10")] mod stream_collection; #[cfg(feature = "v1_10")] pub use self::stream_collection::StreamCollection; -#[cfg(feature = "v1_10")] -pub use self::stream_collection::StreamCollectionExt; mod system_clock; pub use self::system_clock::SystemClock; @@ -245,19 +239,13 @@ pub mod traits { pub use super::DeviceExt; pub use super::DeviceMonitorExt; pub use super::DeviceProviderExt; - pub use super::DeviceProviderFactoryExt; pub use super::ElementExt; pub use super::GhostPadExt; pub use super::GstObjectExt; pub use super::PadExt; - pub use super::PadTemplateExt; pub use super::PipelineExt; pub use super::PresetExt; pub use super::ProxyPadExt; - #[cfg(feature = "v1_10")] - pub use super::StreamExt; - #[cfg(feature = "v1_10")] - pub use super::StreamCollectionExt; pub use super::SystemClockExt; pub use super::TagSetterExt; pub use super::TocSetterExt; diff --git a/gstreamer/src/auto/object.rs b/gstreamer/src/auto/object.rs index 58b74ac82..9891ee35e 100644 --- a/gstreamer/src/auto/object.rs +++ b/gstreamer/src/auto/object.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ClockTime; diff --git a/gstreamer/src/auto/pad.rs b/gstreamer/src/auto/pad.rs index 36ad135b7..a85e0f503 100644 --- a/gstreamer/src/auto/pad.rs +++ b/gstreamer/src/auto/pad.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Caps; diff --git a/gstreamer/src/auto/pad_template.rs b/gstreamer/src/auto/pad_template.rs index c5d5bc11d..08f51349f 100644 --- a/gstreamer/src/auto/pad_template.rs +++ b/gstreamer/src/auto/pad_template.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Caps; @@ -7,9 +7,7 @@ use Pad; use PadDirection; use PadPresence; use ffi; -use glib; use glib::Value; -use glib::object::Downcast; use glib::object::IsA; use glib::signal::connect; use glib::translate::*; @@ -35,39 +33,20 @@ impl PadTemplate { from_glib_none(ffi::gst_pad_template_new(name_template.to_glib_none().0, direction.to_glib(), presence.to_glib(), caps.to_glib_none().0)) } } -} -unsafe impl Send for PadTemplate {} -unsafe impl Sync for PadTemplate {} - -pub trait PadTemplateExt { - fn get_caps(&self) -> Option; - - fn pad_created>(&self, pad: &P); - - fn get_property_direction(&self) -> PadDirection; - - fn get_property_name_template(&self) -> Option; - - fn get_property_presence(&self) -> PadPresence; - - fn connect_pad_created(&self, f: F) -> u64; -} - -impl + IsA> PadTemplateExt for O { - fn get_caps(&self) -> Option { + pub fn get_caps(&self) -> Option { unsafe { from_glib_full(ffi::gst_pad_template_get_caps(self.to_glib_none().0)) } } - fn pad_created>(&self, pad: &P) { + pub fn pad_created>(&self, pad: &P) { unsafe { ffi::gst_pad_template_pad_created(self.to_glib_none().0, pad.to_glib_none().0); } } - fn get_property_direction(&self) -> PadDirection { + pub fn get_property_direction(&self) -> PadDirection { let mut value = Value::from(&0); unsafe { gobject_ffi::g_object_get_property(self.to_glib_none().0, "direction".to_glib_none().0, value.to_glib_none_mut().0); @@ -75,7 +54,7 @@ impl + IsA> PadTemplateExt for O { } } - fn get_property_name_template(&self) -> Option { + pub fn get_property_name_template(&self) -> Option { let mut value = Value::from(None::<&str>); unsafe { gobject_ffi::g_object_get_property(self.to_glib_none().0, "name-template".to_glib_none().0, value.to_glib_none_mut().0); @@ -83,7 +62,7 @@ impl + IsA> PadTemplateExt for O { value.get() } - fn get_property_presence(&self) -> PadPresence { + pub fn get_property_presence(&self) -> PadPresence { let mut value = Value::from(&0); unsafe { gobject_ffi::g_object_get_property(self.to_glib_none().0, "presence".to_glib_none().0, value.to_glib_none_mut().0); @@ -91,18 +70,20 @@ impl + IsA> PadTemplateExt for O { } } - fn connect_pad_created(&self, f: F) -> u64 { + pub fn connect_pad_created(&self, f: F) -> u64 { unsafe { - let f: Box_> = Box_::new(Box_::new(f)); + let f: Box_> = Box_::new(Box_::new(f)); connect(self.to_glib_none().0, "pad-created", - transmute(pad_created_trampoline:: as usize), Box_::into_raw(f) as *mut _) + transmute(pad_created_trampoline as usize), Box_::into_raw(f) as *mut _) } } } -unsafe extern "C" fn pad_created_trampoline

(this: *mut ffi::GstPadTemplate, pad: *mut ffi::GstPad, f: glib_ffi::gpointer) -where P: IsA { +unsafe impl Send for PadTemplate {} +unsafe impl Sync for PadTemplate {} + +unsafe extern "C" fn pad_created_trampoline(this: *mut ffi::GstPadTemplate, pad: *mut ffi::GstPad, f: glib_ffi::gpointer) { callback_guard!(); - let f: &&(Fn(&P, &Pad) + Send + Sync + 'static) = transmute(f); - f(&PadTemplate::from_glib_none(this).downcast_unchecked(), &from_glib_none(pad)) + let f: &&(Fn(&PadTemplate, &Pad) + Send + Sync + 'static) = transmute(f); + f(&from_glib_none(this), &from_glib_none(pad)) } diff --git a/gstreamer/src/auto/pipeline.rs b/gstreamer/src/auto/pipeline.rs index ab6ec37a1..8b1985971 100644 --- a/gstreamer/src/auto/pipeline.rs +++ b/gstreamer/src/auto/pipeline.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Bin; diff --git a/gstreamer/src/auto/plugin.rs b/gstreamer/src/auto/plugin.rs index ce012b9d3..ad6176b44 100644 --- a/gstreamer/src/auto/plugin.rs +++ b/gstreamer/src/auto/plugin.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Error; diff --git a/gstreamer/src/auto/preset.rs b/gstreamer/src/auto/preset.rs index 5f24095a0..bb792c9ed 100644 --- a/gstreamer/src/auto/preset.rs +++ b/gstreamer/src/auto/preset.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/proxy_pad.rs b/gstreamer/src/auto/proxy_pad.rs index 3e0700ed0..b66ec6f5e 100644 --- a/gstreamer/src/auto/proxy_pad.rs +++ b/gstreamer/src/auto/proxy_pad.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Iterator; diff --git a/gstreamer/src/auto/stream.rs b/gstreamer/src/auto/stream.rs index 9d9b04e6b..f25f80979 100644 --- a/gstreamer/src/auto/stream.rs +++ b/gstreamer/src/auto/stream.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT #[cfg(feature = "v1_10")] @@ -11,7 +11,6 @@ use StreamType; #[cfg(feature = "v1_10")] use TagList; use ffi; -use glib::object::IsA; use glib::translate::*; use glib_ffi; use gobject_ffi; @@ -38,78 +37,44 @@ impl Stream { from_glib_full(ffi::gst_stream_new(stream_id.0, caps.0, type_.to_glib(), flags.to_glib())) } } -} - -unsafe impl Send for Stream {} -unsafe impl Sync for Stream {} - -pub trait StreamExt { - #[cfg(feature = "v1_10")] - fn get_caps(&self) -> Option; #[cfg(feature = "v1_10")] - fn get_stream_flags(&self) -> StreamFlags; - - #[cfg(feature = "v1_10")] - fn get_stream_id(&self) -> Option; - - #[cfg(feature = "v1_10")] - fn get_stream_type(&self) -> StreamType; - - #[cfg(feature = "v1_10")] - fn get_tags(&self) -> Option; - - #[cfg(feature = "v1_10")] - fn set_caps<'a, P: Into>>(&self, caps: P); - - #[cfg(feature = "v1_10")] - fn set_stream_flags(&self, flags: StreamFlags); - - #[cfg(feature = "v1_10")] - fn set_stream_type(&self, stream_type: StreamType); - - #[cfg(feature = "v1_10")] - fn set_tags<'a, P: Into>>(&self, tags: P); -} - -impl> StreamExt for O { - #[cfg(feature = "v1_10")] - fn get_caps(&self) -> Option { + pub fn get_caps(&self) -> Option { unsafe { from_glib_full(ffi::gst_stream_get_caps(self.to_glib_none().0)) } } #[cfg(feature = "v1_10")] - fn get_stream_flags(&self) -> StreamFlags { + pub fn get_stream_flags(&self) -> StreamFlags { unsafe { from_glib(ffi::gst_stream_get_stream_flags(self.to_glib_none().0)) } } #[cfg(feature = "v1_10")] - fn get_stream_id(&self) -> Option { + pub fn get_stream_id(&self) -> Option { unsafe { from_glib_none(ffi::gst_stream_get_stream_id(self.to_glib_none().0)) } } #[cfg(feature = "v1_10")] - fn get_stream_type(&self) -> StreamType { + pub fn get_stream_type(&self) -> StreamType { unsafe { from_glib(ffi::gst_stream_get_stream_type(self.to_glib_none().0)) } } #[cfg(feature = "v1_10")] - fn get_tags(&self) -> Option { + pub fn get_tags(&self) -> Option { unsafe { from_glib_full(ffi::gst_stream_get_tags(self.to_glib_none().0)) } } #[cfg(feature = "v1_10")] - fn set_caps<'a, P: Into>>(&self, caps: P) { + pub fn set_caps<'a, P: Into>>(&self, caps: P) { let caps = caps.into(); let caps = caps.to_glib_none(); unsafe { @@ -118,21 +83,21 @@ impl> StreamExt for O { } #[cfg(feature = "v1_10")] - fn set_stream_flags(&self, flags: StreamFlags) { + pub fn set_stream_flags(&self, flags: StreamFlags) { unsafe { ffi::gst_stream_set_stream_flags(self.to_glib_none().0, flags.to_glib()); } } #[cfg(feature = "v1_10")] - fn set_stream_type(&self, stream_type: StreamType) { + pub fn set_stream_type(&self, stream_type: StreamType) { unsafe { ffi::gst_stream_set_stream_type(self.to_glib_none().0, stream_type.to_glib()); } } #[cfg(feature = "v1_10")] - fn set_tags<'a, P: Into>>(&self, tags: P) { + pub fn set_tags<'a, P: Into>>(&self, tags: P) { let tags = tags.into(); let tags = tags.to_glib_none(); unsafe { @@ -140,3 +105,6 @@ impl> StreamExt for O { } } } + +unsafe impl Send for Stream {} +unsafe impl Sync for Stream {} diff --git a/gstreamer/src/auto/stream_collection.rs b/gstreamer/src/auto/stream_collection.rs index 735c25f9f..8efa44241 100644 --- a/gstreamer/src/auto/stream_collection.rs +++ b/gstreamer/src/auto/stream_collection.rs @@ -1,11 +1,10 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Object; #[cfg(feature = "v1_10")] use Stream; use ffi; -use glib::object::IsA; use glib::translate::*; use glib_ffi; use gobject_ffi; @@ -30,57 +29,39 @@ impl StreamCollection { from_glib_full(ffi::gst_stream_collection_new(upstream_id.0)) } } -} - -unsafe impl Send for StreamCollection {} -unsafe impl Sync for StreamCollection {} - -pub trait StreamCollectionExt { - #[cfg(feature = "v1_10")] - fn add_stream(&self, stream: &Stream) -> bool; #[cfg(feature = "v1_10")] - fn get_size(&self) -> u32; - - #[cfg(feature = "v1_10")] - fn get_stream(&self, index: u32) -> Option; - - #[cfg(feature = "v1_10")] - fn get_upstream_id(&self) -> Option; - - //fn connect_stream_notify(&self, f: F) -> u64; -} - -impl> StreamCollectionExt for O { - #[cfg(feature = "v1_10")] - fn add_stream(&self, stream: &Stream) -> bool { + pub fn add_stream(&self, stream: &Stream) -> bool { unsafe { from_glib(ffi::gst_stream_collection_add_stream(self.to_glib_none().0, stream.to_glib_full())) } } #[cfg(feature = "v1_10")] - fn get_size(&self) -> u32 { + pub fn get_size(&self) -> u32 { unsafe { ffi::gst_stream_collection_get_size(self.to_glib_none().0) } } #[cfg(feature = "v1_10")] - fn get_stream(&self, index: u32) -> Option { + pub fn get_stream(&self, index: u32) -> Option { unsafe { from_glib_none(ffi::gst_stream_collection_get_stream(self.to_glib_none().0, index)) } } #[cfg(feature = "v1_10")] - fn get_upstream_id(&self) -> Option { + pub fn get_upstream_id(&self) -> Option { unsafe { from_glib_none(ffi::gst_stream_collection_get_upstream_id(self.to_glib_none().0)) } } - //fn connect_stream_notify(&self, f: F) -> u64 { + //pub fn connect_stream_notify(&self, f: F) -> u64 { // Ignored p0: GObject.ParamSpec //} } + +unsafe impl Send for StreamCollection {} +unsafe impl Sync for StreamCollection {} diff --git a/gstreamer/src/auto/system_clock.rs b/gstreamer/src/auto/system_clock.rs index cd0169d3b..fd9e217c4 100644 --- a/gstreamer/src/auto/system_clock.rs +++ b/gstreamer/src/auto/system_clock.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Clock; diff --git a/gstreamer/src/auto/tag_setter.rs b/gstreamer/src/auto/tag_setter.rs index 0c3c3ff4c..59111d98b 100644 --- a/gstreamer/src/auto/tag_setter.rs +++ b/gstreamer/src/auto/tag_setter.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Element; diff --git a/gstreamer/src/auto/toc_setter.rs b/gstreamer/src/auto/toc_setter.rs index c999d2c00..c18393ded 100644 --- a/gstreamer/src/auto/toc_setter.rs +++ b/gstreamer/src/auto/toc_setter.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Element; diff --git a/gstreamer/src/auto/u_r_i_handler.rs b/gstreamer/src/auto/u_r_i_handler.rs index 4fa6239f3..85fccc26c 100644 --- a/gstreamer/src/auto/u_r_i_handler.rs +++ b/gstreamer/src/auto/u_r_i_handler.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (cf27827) from gir-files (???) +// This file was generated by gir (651da6e) from gir-files (???) // DO NOT EDIT use Error;