From b933931d6ca35597735c3b4e1cdddac8eb411d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 21 Nov 2020 15:46:33 +0200 Subject: [PATCH] gstreamer: Regenerate --- gstreamer/src/auto/alias.rs | 2 +- gstreamer/src/auto/allocator.rs | 22 +- gstreamer/src/auto/bin.rs | 132 +- gstreamer/src/auto/buffer_pool.rs | 33 +- gstreamer/src/auto/bus.rs | 61 +- gstreamer/src/auto/child_proxy.rs | 48 +- gstreamer/src/auto/clock.rs | 126 +- gstreamer/src/auto/control_binding.rs | 27 +- gstreamer/src/auto/control_source.rs | 13 +- gstreamer/src/auto/date_time.rs | 95 +- gstreamer/src/auto/device.rs | 50 +- gstreamer/src/auto/device_monitor.rs | 51 +- gstreamer/src/auto/device_provider.rs | 61 +- gstreamer/src/auto/device_provider_factory.rs | 55 +- gstreamer/src/auto/element.rs | 192 ++- gstreamer/src/auto/element_factory.rs | 81 +- gstreamer/src/auto/enums.rs | 1118 ++++++++--------- gstreamer/src/auto/flags.rs | 343 +++-- gstreamer/src/auto/functions.rs | 100 +- gstreamer/src/auto/ghost_pad.rs | 20 +- gstreamer/src/auto/object.rs | 91 +- gstreamer/src/auto/pad.rs | 207 ++- gstreamer/src/auto/pad_template.rs | 66 +- gstreamer/src/auto/pipeline.rs | 62 +- gstreamer/src/auto/plugin.rs | 60 +- gstreamer/src/auto/plugin_feature.rs | 27 +- gstreamer/src/auto/preset.rs | 66 +- gstreamer/src/auto/proxy_pad.rs | 15 +- gstreamer/src/auto/registry.rs | 78 +- gstreamer/src/auto/stream.rs | 83 +- gstreamer/src/auto/stream_collection.rs | 26 +- gstreamer/src/auto/system_clock.rs | 33 +- gstreamer/src/auto/tag_setter.rs | 36 +- gstreamer/src/auto/toc_setter.rs | 23 +- gstreamer/src/auto/type_find_factory.rs | 30 +- gstreamer/src/auto/uri_handler.rs | 31 +- gstreamer/src/auto/versions.txt | 4 +- 37 files changed, 1677 insertions(+), 1891 deletions(-) diff --git a/gstreamer/src/auto/alias.rs b/gstreamer/src/auto/alias.rs index b377c8eec..b95a1209c 100644 --- a/gstreamer/src/auto/alias.rs +++ b/gstreamer/src/auto/alias.rs @@ -3,7 +3,7 @@ // DO NOT EDIT #[allow(unused_imports)] -use auto::*; +use crate::auto::*; pub type ClockTimeDiff = i64; pub type ElementFactoryListType = u64; diff --git a/gstreamer/src/auto/allocator.rs b/gstreamer/src/auto/allocator.rs index c490e8c72..9997592f1 100644 --- a/gstreamer/src/auto/allocator.rs +++ b/gstreamer/src/auto/allocator.rs @@ -2,32 +2,28 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use crate::Object; use glib::object::IsA; use glib::translate::*; -use gst_sys; -use Object; -glib_wrapper! { - pub struct Allocator(Object) @extends Object; +glib::glib_wrapper! { + pub struct Allocator(Object) @extends Object; match fn { - get_type => || gst_sys::gst_allocator_get_type(), + get_type => || ffi::gst_allocator_get_type(), } } impl Allocator { pub fn find(name: Option<&str>) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_full(gst_sys::gst_allocator_find(name.to_glib_none().0)) } + unsafe { from_glib_full(ffi::gst_allocator_find(name.to_glib_none().0)) } } pub fn register>(name: &str, allocator: &P) { skip_assert_initialized!(); unsafe { - gst_sys::gst_allocator_register( - name.to_glib_none().0, - allocator.as_ref().to_glib_full(), - ); + ffi::gst_allocator_register(name.to_glib_none().0, allocator.as_ref().to_glib_full()); } } } @@ -47,16 +43,16 @@ pub trait AllocatorExt: 'static { impl> AllocatorExt for O { //fn alloc(&self, size: usize, params: /*Ignored*/Option<&mut AllocationParams>) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_allocator_alloc() } + // unsafe { TODO: call ffi:gst_allocator_alloc() } //} //fn free(&self, memory: /*Ignored*/&Memory) { - // unsafe { TODO: call gst_sys:gst_allocator_free() } + // unsafe { TODO: call ffi:gst_allocator_free() } //} fn set_default(&self) { unsafe { - gst_sys::gst_allocator_set_default(self.as_ref().to_glib_full()); + ffi::gst_allocator_set_default(self.as_ref().to_glib_full()); } } } diff --git a/gstreamer/src/auto/bin.rs b/gstreamer/src/auto/bin.rs index af440b028..d8ab8b0d3 100644 --- a/gstreamer/src/auto/bin.rs +++ b/gstreamer/src/auto/bin.rs @@ -2,7 +2,14 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::ChildProxy; +use crate::Element; +#[cfg(any(feature = "v1_10", feature = "dox"))] +#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] +use crate::ElementFlags; +use crate::Object; +use crate::Pad; +use crate::PadDirection; use glib::object::Cast; use glib::object::IsA; use glib::signal::connect_raw; @@ -10,34 +17,21 @@ use glib::signal::SignalHandlerId; use glib::translate::*; use glib::StaticType; use glib::Value; -use glib_sys; -use gobject_sys; -use gst_sys; use std::boxed::Box as Box_; use std::mem::transmute; -use ChildProxy; -use Element; -#[cfg(any(feature = "v1_10", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] -use ElementFlags; -use Object; -use Pad; -use PadDirection; -glib_wrapper! { - pub struct Bin(Object) @extends Element, Object, @implements ChildProxy; +glib::glib_wrapper! { + pub struct Bin(Object) @extends Element, Object, @implements ChildProxy; match fn { - get_type => || gst_sys::gst_bin_get_type(), + get_type => || ffi::gst_bin_get_type(), } } impl Bin { pub fn new(name: Option<&str>) -> Bin { assert_initialized_main_thread!(); - unsafe { - Element::from_glib_none(gst_sys::gst_bin_new(name.to_glib_none().0)).unsafe_cast() - } + unsafe { Element::from_glib_none(ffi::gst_bin_new(name.to_glib_none().0)).unsafe_cast() } } } @@ -137,8 +131,8 @@ pub trait GstBinExt: 'static { impl> GstBinExt for O { fn add>(&self, element: &P) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_bin_add( + glib::glib_result_from_gboolean!( + ffi::gst_bin_add( self.as_ref().to_glib_none().0, element.as_ref().to_glib_none().0 ), @@ -148,12 +142,12 @@ impl> GstBinExt for O { } //fn add_many>(&self, element_1: &P, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) { - // unsafe { TODO: call gst_sys:gst_bin_add_many() } + // unsafe { TODO: call ffi:gst_bin_add_many() } //} fn find_unlinked_pad(&self, direction: PadDirection) -> Option { unsafe { - from_glib_full(gst_sys::gst_bin_find_unlinked_pad( + from_glib_full(ffi::gst_bin_find_unlinked_pad( self.as_ref().to_glib_none().0, direction.to_glib(), )) @@ -162,7 +156,7 @@ impl> GstBinExt for O { fn get_by_interface(&self, iface: glib::types::Type) -> Option { unsafe { - from_glib_full(gst_sys::gst_bin_get_by_interface( + from_glib_full(ffi::gst_bin_get_by_interface( self.as_ref().to_glib_none().0, iface.to_glib(), )) @@ -171,7 +165,7 @@ impl> GstBinExt for O { fn get_by_name(&self, name: &str) -> Option { unsafe { - from_glib_full(gst_sys::gst_bin_get_by_name( + from_glib_full(ffi::gst_bin_get_by_name( self.as_ref().to_glib_none().0, name.to_glib_none().0, )) @@ -180,7 +174,7 @@ impl> GstBinExt for O { fn get_by_name_recurse_up(&self, name: &str) -> Option { unsafe { - from_glib_full(gst_sys::gst_bin_get_by_name_recurse_up( + from_glib_full(ffi::gst_bin_get_by_name_recurse_up( self.as_ref().to_glib_none().0, name.to_glib_none().0, )) @@ -191,7 +185,7 @@ impl> GstBinExt for O { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] fn get_suppressed_flags(&self) -> ElementFlags { unsafe { - from_glib(gst_sys::gst_bin_get_suppressed_flags( + from_glib(ffi::gst_bin_get_suppressed_flags( self.as_ref().to_glib_none().0, )) } @@ -200,37 +194,37 @@ impl> GstBinExt for O { //#[cfg(any(feature = "v1_18", feature = "dox"))] //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] //fn iterate_all_by_element_factory_name(&self, factory_name: &str) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_bin_iterate_all_by_element_factory_name() } + // unsafe { TODO: call ffi:gst_bin_iterate_all_by_element_factory_name() } //} //fn iterate_all_by_interface(&self, iface: glib::types::Type) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_bin_iterate_all_by_interface() } + // unsafe { TODO: call ffi:gst_bin_iterate_all_by_interface() } //} //fn iterate_elements(&self) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_bin_iterate_elements() } + // unsafe { TODO: call ffi:gst_bin_iterate_elements() } //} //fn iterate_recurse(&self) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_bin_iterate_recurse() } + // unsafe { TODO: call ffi:gst_bin_iterate_recurse() } //} //fn iterate_sinks(&self) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_bin_iterate_sinks() } + // unsafe { TODO: call ffi:gst_bin_iterate_sinks() } //} //fn iterate_sorted(&self) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_bin_iterate_sorted() } + // unsafe { TODO: call ffi:gst_bin_iterate_sorted() } //} //fn iterate_sources(&self) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_bin_iterate_sources() } + // unsafe { TODO: call ffi:gst_bin_iterate_sources() } //} fn recalculate_latency(&self) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_bin_recalculate_latency(self.as_ref().to_glib_none().0), + glib::glib_result_from_gboolean!( + ffi::gst_bin_recalculate_latency(self.as_ref().to_glib_none().0), "Failed to recalculate latency" ) } @@ -238,8 +232,8 @@ impl> GstBinExt for O { fn remove>(&self, element: &P) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_bin_remove( + glib::glib_result_from_gboolean!( + ffi::gst_bin_remove( self.as_ref().to_glib_none().0, element.as_ref().to_glib_none().0 ), @@ -249,21 +243,21 @@ impl> GstBinExt for O { } //fn remove_many>(&self, element_1: &P, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) { - // unsafe { TODO: call gst_sys:gst_bin_remove_many() } + // unsafe { TODO: call ffi:gst_bin_remove_many() } //} #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] fn set_suppressed_flags(&self, flags: ElementFlags) { unsafe { - gst_sys::gst_bin_set_suppressed_flags(self.as_ref().to_glib_none().0, flags.to_glib()); + ffi::gst_bin_set_suppressed_flags(self.as_ref().to_glib_none().0, flags.to_glib()); } } fn sync_children_states(&self) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_bin_sync_children_states(self.as_ref().to_glib_none().0), + glib::glib_result_from_gboolean!( + ffi::gst_bin_sync_children_states(self.as_ref().to_glib_none().0), "Failed to sync children states" ) } @@ -272,8 +266,8 @@ impl> GstBinExt for O { fn get_property_async_handling(&self) -> bool { unsafe { let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_get_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"async-handling\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); @@ -286,8 +280,8 @@ impl> GstBinExt for O { fn set_property_async_handling(&self, async_handling: bool) { unsafe { - gobject_sys::g_object_set_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_set_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"async-handling\0".as_ptr() as *const _, Value::from(&async_handling).to_glib_none().0, ); @@ -297,8 +291,8 @@ impl> GstBinExt for O { fn get_property_message_forward(&self) -> bool { unsafe { let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_get_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"message-forward\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); @@ -311,8 +305,8 @@ impl> GstBinExt for O { fn set_property_message_forward(&self, message_forward: bool) { unsafe { - gobject_sys::g_object_set_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_set_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"message-forward\0".as_ptr() as *const _, Value::from(&message_forward).to_glib_none().0, ); @@ -329,10 +323,10 @@ impl> GstBinExt for O { P, F: Fn(&P, &Bin, &Element) + Send + Sync + 'static, >( - this: *mut gst_sys::GstBin, - sub_bin: *mut gst_sys::GstBin, - element: *mut gst_sys::GstElement, - f: glib_sys::gpointer, + this: *mut ffi::GstBin, + sub_bin: *mut ffi::GstBin, + element: *mut ffi::GstElement, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -366,10 +360,10 @@ impl> GstBinExt for O { P, F: Fn(&P, &Bin, &Element) + Send + Sync + 'static, >( - this: *mut gst_sys::GstBin, - sub_bin: *mut gst_sys::GstBin, - element: *mut gst_sys::GstElement, - f: glib_sys::gpointer, + this: *mut ffi::GstBin, + sub_bin: *mut ffi::GstBin, + element: *mut ffi::GstElement, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -401,9 +395,9 @@ impl> GstBinExt for O { P, F: Fn(&P, &Element) + Send + Sync + 'static, >( - this: *mut gst_sys::GstBin, - element: *mut gst_sys::GstElement, - f: glib_sys::gpointer, + this: *mut ffi::GstBin, + element: *mut ffi::GstElement, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -434,9 +428,9 @@ impl> GstBinExt for O { P, F: Fn(&P, &Element) + Send + Sync + 'static, >( - this: *mut gst_sys::GstBin, - element: *mut gst_sys::GstElement, - f: glib_sys::gpointer, + this: *mut ffi::GstBin, + element: *mut ffi::GstElement, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -467,9 +461,9 @@ impl> GstBinExt for O { P, F: Fn(&P) + Send + Sync + 'static, >( - this: *mut gst_sys::GstBin, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstBin, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -497,9 +491,9 @@ impl> GstBinExt for O { P, F: Fn(&P) + Send + Sync + 'static, >( - this: *mut gst_sys::GstBin, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstBin, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { diff --git a/gstreamer/src/auto/buffer_pool.rs b/gstreamer/src/auto/buffer_pool.rs index de57ac856..d1063ae16 100644 --- a/gstreamer/src/auto/buffer_pool.rs +++ b/gstreamer/src/auto/buffer_pool.rs @@ -2,18 +2,15 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Object; use glib::object::IsA; use glib::translate::*; -use glib::GString; -use gst_sys; -use Object; -glib_wrapper! { - pub struct BufferPool(Object) @extends Object; +glib::glib_wrapper! { + pub struct BufferPool(Object) @extends Object; match fn { - get_type => || gst_sys::gst_buffer_pool_get_type(), + get_type => || ffi::gst_buffer_pool_get_type(), } } @@ -23,7 +20,7 @@ unsafe impl Sync for BufferPool {} pub const NONE_BUFFER_POOL: Option<&BufferPool> = None; pub trait BufferPoolExt: 'static { - fn get_options(&self) -> Vec; + fn get_options(&self) -> Vec; fn has_option(&self, option: &str) -> bool; @@ -35,9 +32,9 @@ pub trait BufferPoolExt: 'static { } impl> BufferPoolExt for O { - fn get_options(&self) -> Vec { + fn get_options(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_none(gst_sys::gst_buffer_pool_get_options( + FromGlibPtrContainer::from_glib_none(ffi::gst_buffer_pool_get_options( self.as_ref().to_glib_none().0, )) } @@ -45,7 +42,7 @@ impl> BufferPoolExt for O { fn has_option(&self, option: &str) -> bool { unsafe { - from_glib(gst_sys::gst_buffer_pool_has_option( + from_glib(ffi::gst_buffer_pool_has_option( self.as_ref().to_glib_none().0, option.to_glib_none().0, )) @@ -54,7 +51,7 @@ impl> BufferPoolExt for O { fn is_active(&self) -> bool { unsafe { - from_glib(gst_sys::gst_buffer_pool_is_active( + from_glib(ffi::gst_buffer_pool_is_active( self.as_ref().to_glib_none().0, )) } @@ -62,11 +59,8 @@ impl> BufferPoolExt for O { fn set_active(&self, active: bool) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_buffer_pool_set_active( - self.as_ref().to_glib_none().0, - active.to_glib() - ), + glib::glib_result_from_gboolean!( + ffi::gst_buffer_pool_set_active(self.as_ref().to_glib_none().0, active.to_glib()), "Failed to activate buffer pool" ) } @@ -74,10 +68,7 @@ impl> BufferPoolExt for O { fn set_flushing(&self, flushing: bool) { unsafe { - gst_sys::gst_buffer_pool_set_flushing( - self.as_ref().to_glib_none().0, - flushing.to_glib(), - ); + ffi::gst_buffer_pool_set_flushing(self.as_ref().to_glib_none().0, flushing.to_glib()); } } } diff --git a/gstreamer/src/auto/bus.rs b/gstreamer/src/auto/bus.rs index 1f0490d4d..255604ec0 100644 --- a/gstreamer/src/auto/bus.rs +++ b/gstreamer/src/auto/bus.rs @@ -2,77 +2,74 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::ClockTime; +use crate::Message; +use crate::Object; use glib::object::ObjectType as ObjectType_; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; -use glib_sys; -use gst_sys; use std::boxed::Box as Box_; use std::mem::transmute; -use ClockTime; -use Message; -use Object; -glib_wrapper! { - pub struct Bus(Object) @extends Object; +glib::glib_wrapper! { + pub struct Bus(Object) @extends Object; match fn { - get_type => || gst_sys::gst_bus_get_type(), + get_type => || ffi::gst_bus_get_type(), } } impl Bus { pub fn new() -> Bus { assert_initialized_main_thread!(); - unsafe { from_glib_full(gst_sys::gst_bus_new()) } + unsafe { from_glib_full(ffi::gst_bus_new()) } } pub fn add_signal_watch(&self) { unsafe { - gst_sys::gst_bus_add_signal_watch(self.to_glib_none().0); + ffi::gst_bus_add_signal_watch(self.to_glib_none().0); } } //pub fn async_signal_func(&self, message: &Message, data: /*Unimplemented*/Option) -> bool { - // unsafe { TODO: call gst_sys:gst_bus_async_signal_func() } + // unsafe { TODO: call ffi:gst_bus_async_signal_func() } //} pub fn disable_sync_message_emission(&self) { unsafe { - gst_sys::gst_bus_disable_sync_message_emission(self.to_glib_none().0); + ffi::gst_bus_disable_sync_message_emission(self.to_glib_none().0); } } pub fn enable_sync_message_emission(&self) { unsafe { - gst_sys::gst_bus_enable_sync_message_emission(self.to_glib_none().0); + ffi::gst_bus_enable_sync_message_emission(self.to_glib_none().0); } } //#[cfg(any(feature = "v1_14", feature = "dox"))] //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] //pub fn get_pollfd(&self, fd: /*Ignored*/glib::PollFD) { - // unsafe { TODO: call gst_sys:gst_bus_get_pollfd() } + // unsafe { TODO: call ffi:gst_bus_get_pollfd() } //} pub fn have_pending(&self) -> bool { - unsafe { from_glib(gst_sys::gst_bus_have_pending(self.to_glib_none().0)) } + unsafe { from_glib(ffi::gst_bus_have_pending(self.to_glib_none().0)) } } pub fn peek(&self) -> Option { - unsafe { from_glib_full(gst_sys::gst_bus_peek(self.to_glib_none().0)) } + unsafe { from_glib_full(ffi::gst_bus_peek(self.to_glib_none().0)) } } pub fn pop(&self) -> Option { - unsafe { from_glib_full(gst_sys::gst_bus_pop(self.to_glib_none().0)) } + unsafe { from_glib_full(ffi::gst_bus_pop(self.to_glib_none().0)) } } pub fn post(&self, message: &Message) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_bus_post(self.to_glib_none().0, message.to_glib_full()), + glib::glib_result_from_gboolean!( + ffi::gst_bus_post(self.to_glib_none().0, message.to_glib_full()), "Failed to post message" ) } @@ -80,14 +77,14 @@ impl Bus { pub fn remove_signal_watch(&self) { unsafe { - gst_sys::gst_bus_remove_signal_watch(self.to_glib_none().0); + ffi::gst_bus_remove_signal_watch(self.to_glib_none().0); } } pub fn remove_watch(&self) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_bus_remove_watch(self.to_glib_none().0), + glib::glib_result_from_gboolean!( + ffi::gst_bus_remove_watch(self.to_glib_none().0), "Bus has no event source" ) } @@ -95,17 +92,17 @@ impl Bus { pub fn set_flushing(&self, flushing: bool) { unsafe { - gst_sys::gst_bus_set_flushing(self.to_glib_none().0, flushing.to_glib()); + ffi::gst_bus_set_flushing(self.to_glib_none().0, flushing.to_glib()); } } //pub fn sync_signal_handler(&self, message: &Message, data: /*Unimplemented*/Option) -> BusSyncReply { - // unsafe { TODO: call gst_sys:gst_bus_sync_signal_handler() } + // unsafe { TODO: call ffi:gst_bus_sync_signal_handler() } //} pub fn timed_pop(&self, timeout: ClockTime) -> Option { unsafe { - from_glib_full(gst_sys::gst_bus_timed_pop( + from_glib_full(ffi::gst_bus_timed_pop( self.to_glib_none().0, timeout.to_glib(), )) @@ -114,9 +111,9 @@ impl Bus { pub fn connect_message(&self, f: F) -> SignalHandlerId { unsafe extern "C" fn message_trampoline( - this: *mut gst_sys::GstBus, - message: *mut gst_sys::GstMessage, - f: glib_sys::gpointer, + this: *mut ffi::GstBus, + message: *mut ffi::GstMessage, + f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f(&from_glib_borrow(this), &from_glib_borrow(message)) @@ -141,9 +138,9 @@ impl Bus { unsafe extern "C" fn sync_message_trampoline< F: Fn(&Bus, &Message) + Send + Sync + 'static, >( - this: *mut gst_sys::GstBus, - message: *mut gst_sys::GstMessage, - f: glib_sys::gpointer, + this: *mut ffi::GstBus, + message: *mut ffi::GstMessage, + f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f(&from_glib_borrow(this), &from_glib_borrow(message)) diff --git a/gstreamer/src/auto/child_proxy.rs b/gstreamer/src/auto/child_proxy.rs index a4f0f52c6..b4b7d3e55 100644 --- a/gstreamer/src/auto/child_proxy.rs +++ b/gstreamer/src/auto/child_proxy.rs @@ -2,25 +2,19 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; use glib::object::Cast; use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; -use glib::GString; -use glib_sys; -use gobject_sys; -use gst_sys; -use libc; use std::boxed::Box as Box_; use std::mem::transmute; -glib_wrapper! { - pub struct ChildProxy(Interface); +glib::glib_wrapper! { + pub struct ChildProxy(Interface); match fn { - get_type => || gst_sys::gst_child_proxy_get_type(), + get_type => || ffi::gst_child_proxy_get_type(), } } @@ -64,7 +58,7 @@ pub trait ChildProxyExt: 'static { impl> ChildProxyExt for O { fn child_added>(&self, child: &P, name: &str) { unsafe { - gst_sys::gst_child_proxy_child_added( + ffi::gst_child_proxy_child_added( self.as_ref().to_glib_none().0, child.as_ref().to_glib_none().0, name.to_glib_none().0, @@ -74,7 +68,7 @@ impl> ChildProxyExt for O { fn child_removed>(&self, child: &P, name: &str) { unsafe { - gst_sys::gst_child_proxy_child_removed( + ffi::gst_child_proxy_child_removed( self.as_ref().to_glib_none().0, child.as_ref().to_glib_none().0, name.to_glib_none().0, @@ -83,12 +77,12 @@ impl> ChildProxyExt for O { } //fn get(&self, first_property_name: &str, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) { - // unsafe { TODO: call gst_sys:gst_child_proxy_get() } + // unsafe { TODO: call ffi:gst_child_proxy_get() } //} fn get_child_by_index(&self, index: u32) -> Option { unsafe { - from_glib_full(gst_sys::gst_child_proxy_get_child_by_index( + from_glib_full(ffi::gst_child_proxy_get_child_by_index( self.as_ref().to_glib_none().0, index, )) @@ -97,7 +91,7 @@ impl> ChildProxyExt for O { fn get_child_by_name(&self, name: &str) -> Option { unsafe { - from_glib_full(gst_sys::gst_child_proxy_get_child_by_name( + from_glib_full(ffi::gst_child_proxy_get_child_by_name( self.as_ref().to_glib_none().0, name.to_glib_none().0, )) @@ -105,23 +99,23 @@ impl> ChildProxyExt for O { } fn get_children_count(&self) -> u32 { - unsafe { gst_sys::gst_child_proxy_get_children_count(self.as_ref().to_glib_none().0) } + unsafe { ffi::gst_child_proxy_get_children_count(self.as_ref().to_glib_none().0) } } //fn get_valist(&self, first_property_name: &str, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported) { - // unsafe { TODO: call gst_sys:gst_child_proxy_get_valist() } + // unsafe { TODO: call ffi:gst_child_proxy_get_valist() } //} //fn lookup(&self, name: &str, pspec: /*Ignored*/glib::ParamSpec) -> Option { - // unsafe { TODO: call gst_sys:gst_child_proxy_lookup() } + // unsafe { TODO: call ffi:gst_child_proxy_lookup() } //} //fn set(&self, first_property_name: &str, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) { - // unsafe { TODO: call gst_sys:gst_child_proxy_set() } + // unsafe { TODO: call ffi:gst_child_proxy_set() } //} //fn set_valist(&self, first_property_name: &str, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported) { - // unsafe { TODO: call gst_sys:gst_child_proxy_set_valist() } + // unsafe { TODO: call ffi:gst_child_proxy_set_valist() } //} fn connect_child_added( @@ -132,10 +126,10 @@ impl> ChildProxyExt for O { P, F: Fn(&P, &glib::Object, &str) + Send + Sync + 'static, >( - this: *mut gst_sys::GstChildProxy, - object: *mut gobject_sys::GObject, + this: *mut ffi::GstChildProxy, + object: *mut glib::gobject_ffi::GObject, name: *mut libc::c_char, - f: glib_sys::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -143,7 +137,7 @@ impl> ChildProxyExt for O { f( &ChildProxy::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), - &GString::from_glib_borrow(name), + &glib::GString::from_glib_borrow(name), ) } unsafe { @@ -167,10 +161,10 @@ impl> ChildProxyExt for O { P, F: Fn(&P, &glib::Object, &str) + Send + Sync + 'static, >( - this: *mut gst_sys::GstChildProxy, - object: *mut gobject_sys::GObject, + this: *mut ffi::GstChildProxy, + object: *mut glib::gobject_ffi::GObject, name: *mut libc::c_char, - f: glib_sys::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -178,7 +172,7 @@ impl> ChildProxyExt for O { f( &ChildProxy::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(object), - &GString::from_glib_borrow(name), + &glib::GString::from_glib_borrow(name), ) } unsafe { diff --git a/gstreamer/src/auto/clock.rs b/gstreamer/src/auto/clock.rs index 88e134834..e9409a8eb 100644 --- a/gstreamer/src/auto/clock.rs +++ b/gstreamer/src/auto/clock.rs @@ -2,7 +2,8 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::ClockTime; +use crate::Object; use glib::object::Cast; use glib::object::IsA; use glib::signal::connect_raw; @@ -10,62 +11,57 @@ use glib::signal::SignalHandlerId; use glib::translate::*; use glib::StaticType; use glib::Value; -use glib_sys; -use gobject_sys; -use gst_sys; use std::boxed::Box as Box_; use std::mem; use std::mem::transmute; -use ClockTime; -use Object; -glib_wrapper! { - pub struct Clock(Object) @extends Object; +glib::glib_wrapper! { + pub struct Clock(Object) @extends Object; match fn { - get_type => || gst_sys::gst_clock_get_type(), + get_type => || ffi::gst_clock_get_type(), } } impl Clock { //pub fn id_compare_func(id1: /*Unimplemented*/Option, id2: /*Unimplemented*/Option) -> i32 { - // unsafe { TODO: call gst_sys:gst_clock_id_compare_func() } + // unsafe { TODO: call ffi:gst_clock_id_compare_func() } //} //#[cfg(any(feature = "v1_16", feature = "dox"))] //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] //pub fn id_get_clock(id: /*Unimplemented*/ClockID) -> Option { - // unsafe { TODO: call gst_sys:gst_clock_id_get_clock() } + // unsafe { TODO: call ffi:gst_clock_id_get_clock() } //} //pub fn id_get_time(id: /*Unimplemented*/ClockID) -> ClockTime { - // unsafe { TODO: call gst_sys:gst_clock_id_get_time() } + // unsafe { TODO: call ffi:gst_clock_id_get_time() } //} //pub fn id_ref(id: /*Unimplemented*/ClockID) -> /*Unimplemented*/Option { - // unsafe { TODO: call gst_sys:gst_clock_id_ref() } + // unsafe { TODO: call ffi:gst_clock_id_ref() } //} //pub fn id_unref(id: /*Unimplemented*/ClockID) { - // unsafe { TODO: call gst_sys:gst_clock_id_unref() } + // unsafe { TODO: call ffi:gst_clock_id_unref() } //} //pub fn id_unschedule(id: /*Unimplemented*/ClockID) { - // unsafe { TODO: call gst_sys:gst_clock_id_unschedule() } + // unsafe { TODO: call ffi:gst_clock_id_unschedule() } //} //#[cfg(any(feature = "v1_16", feature = "dox"))] //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] //pub fn id_uses_clock>(id: /*Unimplemented*/ClockID, clock: &P) -> bool { - // unsafe { TODO: call gst_sys:gst_clock_id_uses_clock() } + // unsafe { TODO: call ffi:gst_clock_id_uses_clock() } //} //pub fn id_wait(id: /*Unimplemented*/ClockID) -> (ClockReturn, ClockTimeDiff) { - // unsafe { TODO: call gst_sys:gst_clock_id_wait() } + // unsafe { TODO: call ffi:gst_clock_id_wait() } //} //pub fn id_wait_async(id: /*Unimplemented*/ClockID, func: /*Unimplemented*/Fn(&Clock, ClockTime, /*Unimplemented*/ClockID) -> bool, user_data: /*Unimplemented*/Option) -> ClockReturn { - // unsafe { TODO: call gst_sys:gst_clock_id_wait_async() } + // unsafe { TODO: call ffi:gst_clock_id_wait_async() } //} } @@ -157,7 +153,7 @@ impl> ClockExt for O { fn add_observation(&self, slave: ClockTime, master: ClockTime) -> Option { unsafe { let mut r_squared = mem::MaybeUninit::uninit(); - let ret = from_glib(gst_sys::gst_clock_add_observation( + let ret = from_glib(ffi::gst_clock_add_observation( self.as_ref().to_glib_none().0, slave.to_glib(), master.to_glib(), @@ -183,7 +179,7 @@ impl> ClockExt for O { let mut external = mem::MaybeUninit::uninit(); let mut rate_num = mem::MaybeUninit::uninit(); let mut rate_denom = mem::MaybeUninit::uninit(); - let ret = from_glib(gst_sys::gst_clock_add_observation_unapplied( + let ret = from_glib(ffi::gst_clock_add_observation_unapplied( self.as_ref().to_glib_none().0, slave.to_glib(), master.to_glib(), @@ -214,7 +210,7 @@ impl> ClockExt for O { fn adjust_unlocked(&self, internal: ClockTime) -> ClockTime { unsafe { - from_glib(gst_sys::gst_clock_adjust_unlocked( + from_glib(ffi::gst_clock_adjust_unlocked( self.as_ref().to_glib_none().0, internal.to_glib(), )) @@ -227,7 +223,7 @@ impl> ClockExt for O { let mut external = mem::MaybeUninit::uninit(); let mut rate_num = mem::MaybeUninit::uninit(); let mut rate_denom = mem::MaybeUninit::uninit(); - gst_sys::gst_clock_get_calibration( + ffi::gst_clock_get_calibration( self.as_ref().to_glib_none().0, internal.as_mut_ptr(), external.as_mut_ptr(), @@ -249,54 +245,46 @@ impl> ClockExt for O { fn get_internal_time(&self) -> ClockTime { unsafe { - from_glib(gst_sys::gst_clock_get_internal_time( + from_glib(ffi::gst_clock_get_internal_time( self.as_ref().to_glib_none().0, )) } } fn get_master(&self) -> Option { - unsafe { - from_glib_full(gst_sys::gst_clock_get_master( - self.as_ref().to_glib_none().0, - )) - } + unsafe { from_glib_full(ffi::gst_clock_get_master(self.as_ref().to_glib_none().0)) } } fn get_resolution(&self) -> ClockTime { unsafe { - from_glib(gst_sys::gst_clock_get_resolution( + from_glib(ffi::gst_clock_get_resolution( self.as_ref().to_glib_none().0, )) } } fn get_time(&self) -> ClockTime { - unsafe { from_glib(gst_sys::gst_clock_get_time(self.as_ref().to_glib_none().0)) } + unsafe { from_glib(ffi::gst_clock_get_time(self.as_ref().to_glib_none().0)) } } fn get_timeout(&self) -> ClockTime { - unsafe { - from_glib(gst_sys::gst_clock_get_timeout( - self.as_ref().to_glib_none().0, - )) - } + unsafe { from_glib(ffi::gst_clock_get_timeout(self.as_ref().to_glib_none().0)) } } fn is_synced(&self) -> bool { - unsafe { from_glib(gst_sys::gst_clock_is_synced(self.as_ref().to_glib_none().0)) } + unsafe { from_glib(ffi::gst_clock_is_synced(self.as_ref().to_glib_none().0)) } } //fn new_periodic_id(&self, start_time: ClockTime, interval: ClockTime) -> /*Unimplemented*/Option { - // unsafe { TODO: call gst_sys:gst_clock_new_periodic_id() } + // unsafe { TODO: call ffi:gst_clock_new_periodic_id() } //} //fn new_single_shot_id(&self, time: ClockTime) -> /*Unimplemented*/Option { - // unsafe { TODO: call gst_sys:gst_clock_new_single_shot_id() } + // unsafe { TODO: call ffi:gst_clock_new_single_shot_id() } //} //fn periodic_id_reinit(&self, id: /*Unimplemented*/ClockID, start_time: ClockTime, interval: ClockTime) -> bool { - // unsafe { TODO: call gst_sys:gst_clock_periodic_id_reinit() } + // unsafe { TODO: call ffi:gst_clock_periodic_id_reinit() } //} fn set_calibration( @@ -307,7 +295,7 @@ impl> ClockExt for O { rate_denom: ClockTime, ) { unsafe { - gst_sys::gst_clock_set_calibration( + ffi::gst_clock_set_calibration( self.as_ref().to_glib_none().0, internal.to_glib(), external.to_glib(), @@ -319,8 +307,8 @@ impl> ClockExt for O { fn set_master>(&self, master: Option<&P>) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_clock_set_master( + glib::glib_result_from_gboolean!( + ffi::gst_clock_set_master( self.as_ref().to_glib_none().0, master.map(|p| p.as_ref()).to_glib_none().0 ), @@ -331,7 +319,7 @@ impl> ClockExt for O { fn set_resolution(&self, resolution: ClockTime) -> ClockTime { unsafe { - from_glib(gst_sys::gst_clock_set_resolution( + from_glib(ffi::gst_clock_set_resolution( self.as_ref().to_glib_none().0, resolution.to_glib(), )) @@ -340,23 +328,23 @@ impl> ClockExt for O { fn set_synced(&self, synced: bool) { unsafe { - gst_sys::gst_clock_set_synced(self.as_ref().to_glib_none().0, synced.to_glib()); + ffi::gst_clock_set_synced(self.as_ref().to_glib_none().0, synced.to_glib()); } } fn set_timeout(&self, timeout: ClockTime) { unsafe { - gst_sys::gst_clock_set_timeout(self.as_ref().to_glib_none().0, timeout.to_glib()); + ffi::gst_clock_set_timeout(self.as_ref().to_glib_none().0, timeout.to_glib()); } } //fn single_shot_id_reinit(&self, id: /*Unimplemented*/ClockID, time: ClockTime) -> bool { - // unsafe { TODO: call gst_sys:gst_clock_single_shot_id_reinit() } + // unsafe { TODO: call ffi:gst_clock_single_shot_id_reinit() } //} fn unadjust_unlocked(&self, external: ClockTime) -> ClockTime { unsafe { - from_glib(gst_sys::gst_clock_unadjust_unlocked( + from_glib(ffi::gst_clock_unadjust_unlocked( self.as_ref().to_glib_none().0, external.to_glib(), )) @@ -365,8 +353,8 @@ impl> ClockExt for O { fn wait_for_sync(&self, timeout: ClockTime) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_clock_wait_for_sync(self.as_ref().to_glib_none().0, timeout.to_glib()), + glib::glib_result_from_gboolean!( + ffi::gst_clock_wait_for_sync(self.as_ref().to_glib_none().0, timeout.to_glib()), "Timed out waiting for sync" ) } @@ -375,8 +363,8 @@ impl> ClockExt for O { fn get_property_window_size(&self) -> i32 { unsafe { let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_get_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"window-size\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); @@ -389,8 +377,8 @@ impl> ClockExt for O { fn set_property_window_size(&self, window_size: i32) { unsafe { - gobject_sys::g_object_set_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_set_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"window-size\0".as_ptr() as *const _, Value::from(&window_size).to_glib_none().0, ); @@ -400,8 +388,8 @@ impl> ClockExt for O { fn get_property_window_threshold(&self) -> i32 { unsafe { let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_get_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"window-threshold\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); @@ -414,8 +402,8 @@ impl> ClockExt for O { fn set_property_window_threshold(&self, window_threshold: i32) { unsafe { - gobject_sys::g_object_set_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_set_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"window-threshold\0".as_ptr() as *const _, Value::from(&window_threshold).to_glib_none().0, ); @@ -424,9 +412,9 @@ impl> ClockExt for O { fn connect_synced(&self, f: F) -> SignalHandlerId { unsafe extern "C" fn synced_trampoline( - this: *mut gst_sys::GstClock, - synced: glib_sys::gboolean, - f: glib_sys::gpointer, + this: *mut ffi::GstClock, + synced: glib::ffi::gboolean, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -454,9 +442,9 @@ impl> ClockExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn notify_timeout_trampoline( - this: *mut gst_sys::GstClock, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstClock, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -481,9 +469,9 @@ impl> ClockExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn notify_window_size_trampoline( - this: *mut gst_sys::GstClock, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstClock, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -511,9 +499,9 @@ impl> ClockExt for O { P, F: Fn(&P) + Send + Sync + 'static, >( - this: *mut gst_sys::GstClock, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstClock, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { diff --git a/gstreamer/src/auto/control_binding.rs b/gstreamer/src/auto/control_binding.rs index 8312004cc..1936700da 100644 --- a/gstreamer/src/auto/control_binding.rs +++ b/gstreamer/src/auto/control_binding.rs @@ -2,21 +2,18 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::ClockTime; +use crate::Object; use glib::object::IsA; use glib::translate::*; use glib::StaticType; use glib::Value; -use gobject_sys; -use gst_sys; -use ClockTime; -use Object; -glib_wrapper! { - pub struct ControlBinding(Object) @extends Object; +glib::glib_wrapper! { + pub struct ControlBinding(Object) @extends Object; match fn { - get_type => || gst_sys::gst_control_binding_get_type(), + get_type => || ffi::gst_control_binding_get_type(), } } @@ -47,7 +44,7 @@ pub trait ControlBindingExt: 'static { impl> ControlBindingExt for O { fn get_value(&self, timestamp: ClockTime) -> Option { unsafe { - from_glib_full(gst_sys::gst_control_binding_get_value( + from_glib_full(ffi::gst_control_binding_get_value( self.as_ref().to_glib_none().0, timestamp.to_glib(), )) @@ -55,12 +52,12 @@ impl> ControlBindingExt for O { } //fn get_value_array(&self, timestamp: ClockTime, interval: ClockTime, values: /*Unimplemented*/&[&Fundamental: Pointer]) -> bool { - // unsafe { TODO: call gst_sys:gst_control_binding_get_value_array() } + // unsafe { TODO: call ffi:gst_control_binding_get_value_array() } //} fn is_disabled(&self) -> bool { unsafe { - from_glib(gst_sys::gst_control_binding_is_disabled( + from_glib(ffi::gst_control_binding_is_disabled( self.as_ref().to_glib_none().0, )) } @@ -68,7 +65,7 @@ impl> ControlBindingExt for O { fn set_disabled(&self, disabled: bool) { unsafe { - gst_sys::gst_control_binding_set_disabled( + ffi::gst_control_binding_set_disabled( self.as_ref().to_glib_none().0, disabled.to_glib(), ); @@ -82,7 +79,7 @@ impl> ControlBindingExt for O { last_sync: ClockTime, ) -> bool { unsafe { - from_glib(gst_sys::gst_control_binding_sync_values( + from_glib(ffi::gst_control_binding_sync_values( self.as_ref().to_glib_none().0, object.as_ref().to_glib_none().0, timestamp.to_glib(), @@ -94,8 +91,8 @@ impl> ControlBindingExt for O { fn get_property_object(&self) -> Option { unsafe { let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_get_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"object\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); diff --git a/gstreamer/src/auto/control_source.rs b/gstreamer/src/auto/control_source.rs index 787f26bf6..de3672256 100644 --- a/gstreamer/src/auto/control_source.rs +++ b/gstreamer/src/auto/control_source.rs @@ -2,18 +2,17 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use crate::ClockTime; +use crate::Object; use glib::object::IsA; use glib::translate::*; -use gst_sys; use std::mem; -use ClockTime; -use Object; -glib_wrapper! { - pub struct ControlSource(Object) @extends Object; +glib::glib_wrapper! { + pub struct ControlSource(Object) @extends Object; match fn { - get_type => || gst_sys::gst_control_source_get_type(), + get_type => || ffi::gst_control_source_get_type(), } } @@ -30,7 +29,7 @@ impl> ControlSourceExt for O { fn get_value(&self, timestamp: ClockTime) -> Option { unsafe { let mut value = mem::MaybeUninit::uninit(); - let ret = from_glib(gst_sys::gst_control_source_get_value( + let ret = from_glib(ffi::gst_control_source_get_value( self.as_ref().to_glib_none().0, timestamp.to_glib(), value.as_mut_ptr(), diff --git a/gstreamer/src/auto/date_time.rs b/gstreamer/src/auto/date_time.rs index e7c720552..4875b7d30 100644 --- a/gstreamer/src/auto/date_time.rs +++ b/gstreamer/src/auto/date_time.rs @@ -2,19 +2,16 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; use glib::translate::*; -use glib::GString; -use gst_sys; -glib_wrapper! { +glib::glib_wrapper! { #[derive()] - pub struct DateTime(Shared); + pub struct DateTime(Shared); match fn { - ref => |ptr| gst_sys::gst_date_time_ref(ptr), - unref => |ptr| gst_sys::gst_date_time_unref(ptr), - get_type => || gst_sys::gst_date_time_get_type(), + ref => |ptr| ffi::gst_date_time_ref(ptr), + unref => |ptr| ffi::gst_date_time_unref(ptr), + get_type => || ffi::gst_date_time_get_type(), } } @@ -30,36 +27,34 @@ impl DateTime { ) -> Result { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_full(gst_sys::gst_date_time_new( + Option::<_>::from_glib_full(ffi::gst_date_time_new( tzoffset, year, month, day, hour, minute, seconds, )) - .ok_or_else(|| glib_bool_error!("Can't create DateTime")) + .ok_or_else(|| glib::glib_bool_error!("Can't create DateTime")) } } pub fn from_g_date_time(dt: &glib::DateTime) -> Result { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_full(gst_sys::gst_date_time_new_from_g_date_time( - dt.to_glib_full(), - )) - .ok_or_else(|| glib_bool_error!("Can't create DateTime from glib::DateTime")) + Option::<_>::from_glib_full(ffi::gst_date_time_new_from_g_date_time(dt.to_glib_full())) + .ok_or_else(|| glib::glib_bool_error!("Can't create DateTime from glib::DateTime")) } } pub fn from_iso8601_string(string: &str) -> Result { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_full(gst_sys::gst_date_time_new_from_iso8601_string( + Option::<_>::from_glib_full(ffi::gst_date_time_new_from_iso8601_string( string.to_glib_none().0, )) - .ok_or_else(|| glib_bool_error!("Failed to create DateTime from ISO-8601 string")) + .ok_or_else(|| glib::glib_bool_error!("Failed to create DateTime from ISO-8601 string")) } } pub fn from_unix_epoch_local_time(secs: i64) -> DateTime { assert_initialized_main_thread!(); - unsafe { from_glib_full(gst_sys::gst_date_time_new_from_unix_epoch_local_time(secs)) } + unsafe { from_glib_full(ffi::gst_date_time_new_from_unix_epoch_local_time(secs)) } } #[cfg(any(feature = "v1_18", feature = "dox"))] @@ -67,7 +62,7 @@ impl DateTime { pub fn from_unix_epoch_local_time_usecs(usecs: i64) -> DateTime { assert_initialized_main_thread!(); unsafe { - from_glib_full(gst_sys::gst_date_time_new_from_unix_epoch_local_time_usecs( + from_glib_full(ffi::gst_date_time_new_from_unix_epoch_local_time_usecs( usecs, )) } @@ -75,14 +70,14 @@ impl DateTime { pub fn from_unix_epoch_utc(secs: i64) -> DateTime { assert_initialized_main_thread!(); - unsafe { from_glib_full(gst_sys::gst_date_time_new_from_unix_epoch_utc(secs)) } + unsafe { from_glib_full(ffi::gst_date_time_new_from_unix_epoch_utc(secs)) } } #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] pub fn from_unix_epoch_utc_usecs(usecs: i64) -> DateTime { assert_initialized_main_thread!(); - unsafe { from_glib_full(gst_sys::gst_date_time_new_from_unix_epoch_utc_usecs(usecs)) } + unsafe { from_glib_full(ffi::gst_date_time_new_from_unix_epoch_utc_usecs(usecs)) } } pub fn new_local_time( @@ -95,7 +90,7 @@ impl DateTime { ) -> DateTime { assert_initialized_main_thread!(); unsafe { - from_glib_full(gst_sys::gst_date_time_new_local_time( + from_glib_full(ffi::gst_date_time_new_local_time( year, month, day, hour, minute, seconds, )) } @@ -103,105 +98,103 @@ impl DateTime { pub fn new_now_local_time() -> DateTime { assert_initialized_main_thread!(); - unsafe { from_glib_full(gst_sys::gst_date_time_new_now_local_time()) } + unsafe { from_glib_full(ffi::gst_date_time_new_now_local_time()) } } pub fn new_now_utc() -> DateTime { assert_initialized_main_thread!(); - unsafe { from_glib_full(gst_sys::gst_date_time_new_now_utc()) } + unsafe { from_glib_full(ffi::gst_date_time_new_now_utc()) } } pub fn new_y(year: i32) -> Result { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_full(gst_sys::gst_date_time_new_y(year)) - .ok_or_else(|| glib_bool_error!("Can't create DateTime")) + Option::<_>::from_glib_full(ffi::gst_date_time_new_y(year)) + .ok_or_else(|| glib::glib_bool_error!("Can't create DateTime")) } } pub fn new_ym(year: i32, month: i32) -> Result { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_full(gst_sys::gst_date_time_new_ym(year, month)) - .ok_or_else(|| glib_bool_error!("Can't create DateTime")) + Option::<_>::from_glib_full(ffi::gst_date_time_new_ym(year, month)) + .ok_or_else(|| glib::glib_bool_error!("Can't create DateTime")) } } pub fn new_ymd(year: i32, month: i32, day: i32) -> Result { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_full(gst_sys::gst_date_time_new_ymd(year, month, day)) - .ok_or_else(|| glib_bool_error!("Can't create DateTime")) + Option::<_>::from_glib_full(ffi::gst_date_time_new_ymd(year, month, day)) + .ok_or_else(|| glib::glib_bool_error!("Can't create DateTime")) } } pub fn get_day(&self) -> i32 { - unsafe { gst_sys::gst_date_time_get_day(self.to_glib_none().0) } + unsafe { ffi::gst_date_time_get_day(self.to_glib_none().0) } } pub fn get_hour(&self) -> i32 { - unsafe { gst_sys::gst_date_time_get_hour(self.to_glib_none().0) } + unsafe { ffi::gst_date_time_get_hour(self.to_glib_none().0) } } pub fn get_microsecond(&self) -> i32 { - unsafe { gst_sys::gst_date_time_get_microsecond(self.to_glib_none().0) } + unsafe { ffi::gst_date_time_get_microsecond(self.to_glib_none().0) } } pub fn get_minute(&self) -> i32 { - unsafe { gst_sys::gst_date_time_get_minute(self.to_glib_none().0) } + unsafe { ffi::gst_date_time_get_minute(self.to_glib_none().0) } } pub fn get_month(&self) -> i32 { - unsafe { gst_sys::gst_date_time_get_month(self.to_glib_none().0) } + unsafe { ffi::gst_date_time_get_month(self.to_glib_none().0) } } pub fn get_second(&self) -> i32 { - unsafe { gst_sys::gst_date_time_get_second(self.to_glib_none().0) } + unsafe { ffi::gst_date_time_get_second(self.to_glib_none().0) } } pub fn get_time_zone_offset(&self) -> f32 { - unsafe { gst_sys::gst_date_time_get_time_zone_offset(self.to_glib_none().0) } + unsafe { ffi::gst_date_time_get_time_zone_offset(self.to_glib_none().0) } } pub fn get_year(&self) -> i32 { - unsafe { gst_sys::gst_date_time_get_year(self.to_glib_none().0) } + unsafe { ffi::gst_date_time_get_year(self.to_glib_none().0) } } pub fn has_day(&self) -> bool { - unsafe { from_glib(gst_sys::gst_date_time_has_day(self.to_glib_none().0)) } + unsafe { from_glib(ffi::gst_date_time_has_day(self.to_glib_none().0)) } } pub fn has_month(&self) -> bool { - unsafe { from_glib(gst_sys::gst_date_time_has_month(self.to_glib_none().0)) } + unsafe { from_glib(ffi::gst_date_time_has_month(self.to_glib_none().0)) } } pub fn has_second(&self) -> bool { - unsafe { from_glib(gst_sys::gst_date_time_has_second(self.to_glib_none().0)) } + unsafe { from_glib(ffi::gst_date_time_has_second(self.to_glib_none().0)) } } pub fn has_time(&self) -> bool { - unsafe { from_glib(gst_sys::gst_date_time_has_time(self.to_glib_none().0)) } + unsafe { from_glib(ffi::gst_date_time_has_time(self.to_glib_none().0)) } } pub fn has_year(&self) -> bool { - unsafe { from_glib(gst_sys::gst_date_time_has_year(self.to_glib_none().0)) } + unsafe { from_glib(ffi::gst_date_time_has_year(self.to_glib_none().0)) } } pub fn to_g_date_time(&self) -> Result { unsafe { - Option::<_>::from_glib_full(gst_sys::gst_date_time_to_g_date_time( - self.to_glib_none().0, - )) - .ok_or_else(|| glib_bool_error!("Can't create glib::DateTime from DateTime")) + Option::<_>::from_glib_full(ffi::gst_date_time_to_g_date_time(self.to_glib_none().0)) + .ok_or_else(|| glib::glib_bool_error!("Can't create glib::DateTime from DateTime")) } } - pub fn to_iso8601_string(&self) -> Result { + pub fn to_iso8601_string(&self) -> Result { unsafe { - Option::<_>::from_glib_full(gst_sys::gst_date_time_to_iso8601_string( - self.to_glib_none().0, - )) - .ok_or_else(|| glib_bool_error!("Failed to create ISO-8601 string from DateTime")) + Option::<_>::from_glib_full(ffi::gst_date_time_to_iso8601_string(self.to_glib_none().0)) + .ok_or_else(|| { + glib::glib_bool_error!("Failed to create ISO-8601 string from DateTime") + }) } } } diff --git a/gstreamer/src/auto/device.rs b/gstreamer/src/auto/device.rs index 3207ef82c..a370de2ba 100644 --- a/gstreamer/src/auto/device.rs +++ b/gstreamer/src/auto/device.rs @@ -2,27 +2,23 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Caps; +use crate::Element; +use crate::Object; +use crate::Structure; use glib::object::Cast; use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; -use glib::GString; -use glib_sys; -use gst_sys; use std::boxed::Box as Box_; use std::mem::transmute; -use Caps; -use Element; -use Object; -use Structure; -glib_wrapper! { - pub struct Device(Object) @extends Object; +glib::glib_wrapper! { + pub struct Device(Object) @extends Object; match fn { - get_type => || gst_sys::gst_device_get_type(), + get_type => || ffi::gst_device_get_type(), } } @@ -36,9 +32,9 @@ pub trait DeviceExt: 'static { fn get_caps(&self) -> Option; - fn get_device_class(&self) -> GString; + fn get_device_class(&self) -> glib::GString; - fn get_display_name(&self) -> GString; + fn get_display_name(&self) -> glib::GString; fn get_properties(&self) -> Option; @@ -57,29 +53,29 @@ pub trait DeviceExt: 'static { impl> DeviceExt for O { fn create_element(&self, name: Option<&str>) -> Result { unsafe { - Option::<_>::from_glib_none(gst_sys::gst_device_create_element( + Option::<_>::from_glib_none(ffi::gst_device_create_element( self.as_ref().to_glib_none().0, name.to_glib_none().0, )) - .ok_or_else(|| glib_bool_error!("Failed to create element for device")) + .ok_or_else(|| glib::glib_bool_error!("Failed to create element for device")) } } fn get_caps(&self) -> Option { - unsafe { from_glib_full(gst_sys::gst_device_get_caps(self.as_ref().to_glib_none().0)) } + unsafe { from_glib_full(ffi::gst_device_get_caps(self.as_ref().to_glib_none().0)) } } - fn get_device_class(&self) -> GString { + fn get_device_class(&self) -> glib::GString { unsafe { - from_glib_full(gst_sys::gst_device_get_device_class( + from_glib_full(ffi::gst_device_get_device_class( self.as_ref().to_glib_none().0, )) } } - fn get_display_name(&self) -> GString { + fn get_display_name(&self) -> glib::GString { unsafe { - from_glib_full(gst_sys::gst_device_get_display_name( + from_glib_full(ffi::gst_device_get_display_name( self.as_ref().to_glib_none().0, )) } @@ -87,7 +83,7 @@ impl> DeviceExt for O { fn get_properties(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_device_get_properties( + from_glib_full(ffi::gst_device_get_properties( self.as_ref().to_glib_none().0, )) } @@ -95,7 +91,7 @@ impl> DeviceExt for O { fn has_classes(&self, classes: &str) -> bool { unsafe { - from_glib(gst_sys::gst_device_has_classes( + from_glib(ffi::gst_device_has_classes( self.as_ref().to_glib_none().0, classes.to_glib_none().0, )) @@ -104,7 +100,7 @@ impl> DeviceExt for O { fn has_classesv(&self, classes: &[&str]) -> bool { unsafe { - from_glib(gst_sys::gst_device_has_classesv( + from_glib(ffi::gst_device_has_classesv( self.as_ref().to_glib_none().0, classes.to_glib_none().0, )) @@ -116,8 +112,8 @@ impl> DeviceExt for O { element: &P, ) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_device_reconfigure_element( + glib::glib_result_from_gboolean!( + ffi::gst_device_reconfigure_element( self.as_ref().to_glib_none().0, element.as_ref().to_glib_none().0 ), @@ -128,8 +124,8 @@ impl> DeviceExt for O { fn connect_removed(&self, f: F) -> SignalHandlerId { unsafe extern "C" fn removed_trampoline( - this: *mut gst_sys::GstDevice, - f: glib_sys::gpointer, + this: *mut ffi::GstDevice, + f: glib::ffi::gpointer, ) where P: IsA, { diff --git a/gstreamer/src/auto/device_monitor.rs b/gstreamer/src/auto/device_monitor.rs index 123f1f122..1b4c94123 100644 --- a/gstreamer/src/auto/device_monitor.rs +++ b/gstreamer/src/auto/device_monitor.rs @@ -2,29 +2,24 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Bus; +use crate::Device; +use crate::Object; use glib::object::Cast; use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; -use glib::GString; use glib::StaticType; use glib::Value; -use glib_sys; -use gobject_sys; -use gst_sys; use std::boxed::Box as Box_; use std::mem::transmute; -use Bus; -use Device; -use Object; -glib_wrapper! { - pub struct DeviceMonitor(Object) @extends Object; +glib::glib_wrapper! { + pub struct DeviceMonitor(Object) @extends Object; match fn { - get_type => || gst_sys::gst_device_monitor_get_type(), + get_type => || ffi::gst_device_monitor_get_type(), } } @@ -38,7 +33,7 @@ pub trait DeviceMonitorExt: 'static { fn get_devices(&self) -> Vec; - fn get_providers(&self) -> Vec; + fn get_providers(&self) -> Vec; fn get_show_all_devices(&self) -> bool; @@ -61,7 +56,7 @@ pub trait DeviceMonitorExt: 'static { impl> DeviceMonitorExt for O { fn get_bus(&self) -> Bus { unsafe { - from_glib_full(gst_sys::gst_device_monitor_get_bus( + from_glib_full(ffi::gst_device_monitor_get_bus( self.as_ref().to_glib_none().0, )) } @@ -69,15 +64,15 @@ impl> DeviceMonitorExt for O { fn get_devices(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_device_monitor_get_devices( + FromGlibPtrContainer::from_glib_full(ffi::gst_device_monitor_get_devices( self.as_ref().to_glib_none().0, )) } } - fn get_providers(&self) -> Vec { + fn get_providers(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_device_monitor_get_providers( + FromGlibPtrContainer::from_glib_full(ffi::gst_device_monitor_get_providers( self.as_ref().to_glib_none().0, )) } @@ -85,7 +80,7 @@ impl> DeviceMonitorExt for O { fn get_show_all_devices(&self) -> bool { unsafe { - from_glib(gst_sys::gst_device_monitor_get_show_all_devices( + from_glib(ffi::gst_device_monitor_get_show_all_devices( self.as_ref().to_glib_none().0, )) } @@ -93,7 +88,7 @@ impl> DeviceMonitorExt for O { fn set_show_all_devices(&self, show_all: bool) { unsafe { - gst_sys::gst_device_monitor_set_show_all_devices( + ffi::gst_device_monitor_set_show_all_devices( self.as_ref().to_glib_none().0, show_all.to_glib(), ); @@ -102,8 +97,8 @@ impl> DeviceMonitorExt for O { fn start(&self) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_device_monitor_start(self.as_ref().to_glib_none().0), + glib::glib_result_from_gboolean!( + ffi::gst_device_monitor_start(self.as_ref().to_glib_none().0), "Failed to start" ) } @@ -111,15 +106,15 @@ impl> DeviceMonitorExt for O { fn stop(&self) { unsafe { - gst_sys::gst_device_monitor_stop(self.as_ref().to_glib_none().0); + ffi::gst_device_monitor_stop(self.as_ref().to_glib_none().0); } } fn get_property_show_all(&self) -> bool { unsafe { let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_get_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"show-all\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); @@ -132,8 +127,8 @@ impl> DeviceMonitorExt for O { fn set_property_show_all(&self, show_all: bool) { unsafe { - gobject_sys::g_object_set_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_set_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"show-all\0".as_ptr() as *const _, Value::from(&show_all).to_glib_none().0, ); @@ -145,9 +140,9 @@ impl> DeviceMonitorExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn notify_show_all_trampoline( - this: *mut gst_sys::GstDeviceMonitor, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstDeviceMonitor, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { diff --git a/gstreamer/src/auto/device_provider.rs b/gstreamer/src/auto/device_provider.rs index 372acc06d..426638538 100644 --- a/gstreamer/src/auto/device_provider.rs +++ b/gstreamer/src/auto/device_provider.rs @@ -2,28 +2,23 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Bus; +use crate::Device; +use crate::DeviceProviderFactory; +use crate::Object; use glib::object::Cast; use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; -use glib::GString; -use glib_sys; -use gst_sys; -use libc; use std::boxed::Box as Box_; use std::mem::transmute; -use Bus; -use Device; -use DeviceProviderFactory; -use Object; -glib_wrapper! { - pub struct DeviceProvider(Object) @extends Object; +glib::glib_wrapper! { + pub struct DeviceProvider(Object) @extends Object; match fn { - get_type => || gst_sys::gst_device_provider_get_type(), + get_type => || ffi::gst_device_provider_get_type(), } } @@ -49,7 +44,7 @@ pub trait DeviceProviderExt: 'static { fn get_factory(&self) -> Option; - fn get_hidden_providers(&self) -> Vec; + fn get_hidden_providers(&self) -> Vec; fn hide_provider(&self, name: &str); @@ -73,7 +68,7 @@ pub trait DeviceProviderExt: 'static { impl> DeviceProviderExt for O { fn can_monitor(&self) -> bool { unsafe { - from_glib(gst_sys::gst_device_provider_can_monitor( + from_glib(ffi::gst_device_provider_can_monitor( self.as_ref().to_glib_none().0, )) } @@ -81,7 +76,7 @@ impl> DeviceProviderExt for O { fn device_add>(&self, device: &P) { unsafe { - gst_sys::gst_device_provider_device_add( + ffi::gst_device_provider_device_add( self.as_ref().to_glib_none().0, device.as_ref().to_glib_none().0, ); @@ -92,7 +87,7 @@ impl> DeviceProviderExt for O { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] fn device_changed, Q: IsA>(&self, device: &P, changed_device: &Q) { unsafe { - gst_sys::gst_device_provider_device_changed( + ffi::gst_device_provider_device_changed( self.as_ref().to_glib_none().0, device.as_ref().to_glib_none().0, changed_device.as_ref().to_glib_none().0, @@ -102,7 +97,7 @@ impl> DeviceProviderExt for O { fn device_remove>(&self, device: &P) { unsafe { - gst_sys::gst_device_provider_device_remove( + ffi::gst_device_provider_device_remove( self.as_ref().to_glib_none().0, device.as_ref().to_glib_none().0, ); @@ -111,7 +106,7 @@ impl> DeviceProviderExt for O { fn get_bus(&self) -> Bus { unsafe { - from_glib_full(gst_sys::gst_device_provider_get_bus( + from_glib_full(ffi::gst_device_provider_get_bus( self.as_ref().to_glib_none().0, )) } @@ -119,7 +114,7 @@ impl> DeviceProviderExt for O { fn get_devices(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_device_provider_get_devices( + FromGlibPtrContainer::from_glib_full(ffi::gst_device_provider_get_devices( self.as_ref().to_glib_none().0, )) } @@ -127,15 +122,15 @@ impl> DeviceProviderExt for O { fn get_factory(&self) -> Option { unsafe { - from_glib_none(gst_sys::gst_device_provider_get_factory( + from_glib_none(ffi::gst_device_provider_get_factory( self.as_ref().to_glib_none().0, )) } } - fn get_hidden_providers(&self) -> Vec { + fn get_hidden_providers(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_device_provider_get_hidden_providers( + FromGlibPtrContainer::from_glib_full(ffi::gst_device_provider_get_hidden_providers( self.as_ref().to_glib_none().0, )) } @@ -143,7 +138,7 @@ impl> DeviceProviderExt for O { fn hide_provider(&self, name: &str) { unsafe { - gst_sys::gst_device_provider_hide_provider( + ffi::gst_device_provider_hide_provider( self.as_ref().to_glib_none().0, name.to_glib_none().0, ); @@ -152,8 +147,8 @@ impl> DeviceProviderExt for O { fn start(&self) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_device_provider_start(self.as_ref().to_glib_none().0), + glib::glib_result_from_gboolean!( + ffi::gst_device_provider_start(self.as_ref().to_glib_none().0), "Failed to start" ) } @@ -161,13 +156,13 @@ impl> DeviceProviderExt for O { fn stop(&self) { unsafe { - gst_sys::gst_device_provider_stop(self.as_ref().to_glib_none().0); + ffi::gst_device_provider_stop(self.as_ref().to_glib_none().0); } } fn unhide_provider(&self, name: &str) { unsafe { - gst_sys::gst_device_provider_unhide_provider( + ffi::gst_device_provider_unhide_provider( self.as_ref().to_glib_none().0, name.to_glib_none().0, ); @@ -182,16 +177,16 @@ impl> DeviceProviderExt for O { P, F: Fn(&P, &str) + Send + Sync + 'static, >( - this: *mut gst_sys::GstDeviceProvider, + this: *mut ffi::GstDeviceProvider, object: *mut libc::c_char, - f: glib_sys::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { let f: &F = &*(f as *const F); f( &DeviceProvider::from_glib_borrow(this).unsafe_cast_ref(), - &GString::from_glib_borrow(object), + &glib::GString::from_glib_borrow(object), ) } unsafe { @@ -215,16 +210,16 @@ impl> DeviceProviderExt for O { P, F: Fn(&P, &str) + Send + Sync + 'static, >( - this: *mut gst_sys::GstDeviceProvider, + this: *mut ffi::GstDeviceProvider, object: *mut libc::c_char, - f: glib_sys::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { let f: &F = &*(f as *const F); f( &DeviceProvider::from_glib_borrow(this).unsafe_cast_ref(), - &GString::from_glib_borrow(object), + &glib::GString::from_glib_borrow(object), ) } unsafe { diff --git a/gstreamer/src/auto/device_provider_factory.rs b/gstreamer/src/auto/device_provider_factory.rs index 629ba9138..ef8dfb54b 100644 --- a/gstreamer/src/auto/device_provider_factory.rs +++ b/gstreamer/src/auto/device_provider_factory.rs @@ -2,62 +2,53 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::DeviceProvider; +use crate::Object; +use crate::PluginFeature; +use crate::Rank; use glib::translate::*; -use glib::GString; -use gst_sys; -use DeviceProvider; -use Object; -use PluginFeature; -use Rank; -glib_wrapper! { - pub struct DeviceProviderFactory(Object) @extends PluginFeature, Object; +glib::glib_wrapper! { + pub struct DeviceProviderFactory(Object) @extends PluginFeature, Object; match fn { - get_type => || gst_sys::gst_device_provider_factory_get_type(), + get_type => || ffi::gst_device_provider_factory_get_type(), } } 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_full(gst_sys::gst_device_provider_factory_get( + from_glib(ffi::gst_device_provider_factory_get_device_provider_type( self.to_glib_none().0, )) } } - pub fn get_device_provider_type(&self) -> glib::types::Type { + pub fn get_metadata(&self, key: &str) -> Option { unsafe { - from_glib( - gst_sys::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(gst_sys::gst_device_provider_factory_get_metadata( + 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 { + pub fn get_metadata_keys(&self) -> Vec { unsafe { FromGlibPtrContainer::from_glib_full( - gst_sys::gst_device_provider_factory_get_metadata_keys(self.to_glib_none().0), + ffi::gst_device_provider_factory_get_metadata_keys(self.to_glib_none().0), ) } } pub fn has_classes(&self, classes: Option<&str>) -> bool { unsafe { - from_glib(gst_sys::gst_device_provider_factory_has_classes( + from_glib(ffi::gst_device_provider_factory_has_classes( self.to_glib_none().0, classes.to_glib_none().0, )) @@ -66,7 +57,7 @@ impl DeviceProviderFactory { pub fn has_classesv(&self, classes: &[&str]) -> bool { unsafe { - from_glib(gst_sys::gst_device_provider_factory_has_classesv( + from_glib(ffi::gst_device_provider_factory_has_classesv( self.to_glib_none().0, classes.to_glib_none().0, )) @@ -75,17 +66,13 @@ impl DeviceProviderFactory { pub fn find(name: &str) -> Option { assert_initialized_main_thread!(); - unsafe { - from_glib_full(gst_sys::gst_device_provider_factory_find( - name.to_glib_none().0, - )) - } + unsafe { from_glib_full(ffi::gst_device_provider_factory_find(name.to_glib_none().0)) } } pub fn get_by_name(factoryname: &str) -> Option { assert_initialized_main_thread!(); unsafe { - from_glib_full(gst_sys::gst_device_provider_factory_get_by_name( + from_glib_full(ffi::gst_device_provider_factory_get_by_name( factoryname.to_glib_none().0, )) } @@ -95,7 +82,7 @@ impl DeviceProviderFactory { assert_initialized_main_thread!(); unsafe { FromGlibPtrContainer::from_glib_full( - gst_sys::gst_device_provider_factory_list_get_device_providers(minrank.to_glib()), + ffi::gst_device_provider_factory_list_get_device_providers(minrank.to_glib()), ) } } diff --git a/gstreamer/src/auto/element.rs b/gstreamer/src/auto/element.rs index 306ddac5d..9b8b4794d 100644 --- a/gstreamer/src/auto/element.rs +++ b/gstreamer/src/auto/element.rs @@ -2,34 +2,31 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Bus; +use crate::Caps; +use crate::Clock; +use crate::ClockTime; +use crate::Context; +use crate::ElementFactory; +use crate::Object; +use crate::Pad; +use crate::PadLinkCheck; +use crate::PadTemplate; +use crate::URIType; use glib::object::Cast; use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; -use glib_sys; -use gst_sys; use std::boxed::Box as Box_; use std::mem::transmute; use std::ptr; -use Bus; -use Caps; -use Clock; -use ClockTime; -use Context; -use ElementFactory; -use Object; -use Pad; -use PadLinkCheck; -use PadTemplate; -use URIType; -glib_wrapper! { - pub struct Element(Object) @extends Object; +glib::glib_wrapper! { + pub struct Element(Object) @extends Object; match fn { - get_type => || gst_sys::gst_element_get_type(), + get_type => || ffi::gst_element_get_type(), } } @@ -42,7 +39,7 @@ impl Element { assert_initialized_main_thread!(); unsafe { let mut error = ptr::null_mut(); - let ret = gst_sys::gst_element_make_from_uri( + let ret = ffi::gst_element_make_from_uri( type_.to_glib(), uri.to_glib_none().0, elementname.to_glib_none().0, @@ -203,14 +200,14 @@ pub trait ElementExt: 'static { impl> ElementExt for O { fn abort_state(&self) { unsafe { - gst_sys::gst_element_abort_state(self.as_ref().to_glib_none().0); + ffi::gst_element_abort_state(self.as_ref().to_glib_none().0); } } fn add_pad>(&self, pad: &P) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_element_add_pad( + glib::glib_result_from_gboolean!( + ffi::gst_element_add_pad( self.as_ref().to_glib_none().0, pad.as_ref().to_glib_none().0 ), @@ -221,7 +218,7 @@ impl> ElementExt for O { fn create_all_pads(&self) { unsafe { - gst_sys::gst_element_create_all_pads(self.as_ref().to_glib_none().0); + ffi::gst_element_create_all_pads(self.as_ref().to_glib_none().0); } } @@ -230,10 +227,10 @@ impl> ElementExt for O { fn foreach_pad bool>(&self, func: P) -> bool { let func_data: P = func; unsafe extern "C" fn func_func bool>( - element: *mut gst_sys::GstElement, - pad: *mut gst_sys::GstPad, - user_data: glib_sys::gpointer, - ) -> glib_sys::gboolean { + element: *mut ffi::GstElement, + pad: *mut ffi::GstPad, + user_data: glib::ffi::gpointer, + ) -> glib::ffi::gboolean { let element = from_glib_borrow(element); let pad = from_glib_borrow(pad); let callback: *mut P = user_data as *const _ as usize as *mut P; @@ -243,7 +240,7 @@ impl> ElementExt for O { let func = Some(func_func::

as _); let super_callback0: &P = &func_data; unsafe { - from_glib(gst_sys::gst_element_foreach_pad( + from_glib(ffi::gst_element_foreach_pad( self.as_ref().to_glib_none().0, func, super_callback0 as *const _ as usize as *mut _, @@ -256,10 +253,10 @@ impl> ElementExt for O { fn foreach_sink_pad bool>(&self, func: P) -> bool { let func_data: P = func; unsafe extern "C" fn func_func bool>( - element: *mut gst_sys::GstElement, - pad: *mut gst_sys::GstPad, - user_data: glib_sys::gpointer, - ) -> glib_sys::gboolean { + element: *mut ffi::GstElement, + pad: *mut ffi::GstPad, + user_data: glib::ffi::gpointer, + ) -> glib::ffi::gboolean { let element = from_glib_borrow(element); let pad = from_glib_borrow(pad); let callback: *mut P = user_data as *const _ as usize as *mut P; @@ -269,7 +266,7 @@ impl> ElementExt for O { let func = Some(func_func::

as _); let super_callback0: &P = &func_data; unsafe { - from_glib(gst_sys::gst_element_foreach_sink_pad( + from_glib(ffi::gst_element_foreach_sink_pad( self.as_ref().to_glib_none().0, func, super_callback0 as *const _ as usize as *mut _, @@ -282,10 +279,10 @@ impl> ElementExt for O { fn foreach_src_pad bool>(&self, func: P) -> bool { let func_data: P = func; unsafe extern "C" fn func_func bool>( - element: *mut gst_sys::GstElement, - pad: *mut gst_sys::GstPad, - user_data: glib_sys::gpointer, - ) -> glib_sys::gboolean { + element: *mut ffi::GstElement, + pad: *mut ffi::GstPad, + user_data: glib::ffi::gpointer, + ) -> glib::ffi::gboolean { let element = from_glib_borrow(element); let pad = from_glib_borrow(pad); let callback: *mut P = user_data as *const _ as usize as *mut P; @@ -295,7 +292,7 @@ impl> ElementExt for O { let func = Some(func_func::

as _); let super_callback0: &P = &func_data; unsafe { - from_glib(gst_sys::gst_element_foreach_src_pad( + from_glib(ffi::gst_element_foreach_src_pad( self.as_ref().to_glib_none().0, func, super_callback0 as *const _ as usize as *mut _, @@ -305,27 +302,23 @@ impl> ElementExt for O { fn get_base_time(&self) -> ClockTime { unsafe { - from_glib(gst_sys::gst_element_get_base_time( + from_glib(ffi::gst_element_get_base_time( self.as_ref().to_glib_none().0, )) } } fn get_bus(&self) -> Option { - unsafe { from_glib_full(gst_sys::gst_element_get_bus(self.as_ref().to_glib_none().0)) } + unsafe { from_glib_full(ffi::gst_element_get_bus(self.as_ref().to_glib_none().0)) } } fn get_clock(&self) -> Option { - unsafe { - from_glib_full(gst_sys::gst_element_get_clock( - self.as_ref().to_glib_none().0, - )) - } + unsafe { from_glib_full(ffi::gst_element_get_clock(self.as_ref().to_glib_none().0)) } } fn get_compatible_pad>(&self, pad: &P, caps: Option<&Caps>) -> Option { unsafe { - from_glib_full(gst_sys::gst_element_get_compatible_pad( + from_glib_full(ffi::gst_element_get_compatible_pad( self.as_ref().to_glib_none().0, pad.as_ref().to_glib_none().0, caps.to_glib_none().0, @@ -335,7 +328,7 @@ impl> ElementExt for O { fn get_compatible_pad_template(&self, compattempl: &PadTemplate) -> Option { unsafe { - from_glib_none(gst_sys::gst_element_get_compatible_pad_template( + from_glib_none(ffi::gst_element_get_compatible_pad_template( self.as_ref().to_glib_none().0, compattempl.to_glib_none().0, )) @@ -344,7 +337,7 @@ impl> ElementExt for O { fn get_context(&self, context_type: &str) -> Option { unsafe { - from_glib_full(gst_sys::gst_element_get_context( + from_glib_full(ffi::gst_element_get_context( self.as_ref().to_glib_none().0, context_type.to_glib_none().0, )) @@ -353,23 +346,19 @@ impl> ElementExt for O { fn get_contexts(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_element_get_contexts( + FromGlibPtrContainer::from_glib_full(ffi::gst_element_get_contexts( self.as_ref().to_glib_none().0, )) } } fn get_factory(&self) -> Option { - unsafe { - from_glib_none(gst_sys::gst_element_get_factory( - self.as_ref().to_glib_none().0, - )) - } + unsafe { from_glib_none(ffi::gst_element_get_factory(self.as_ref().to_glib_none().0)) } } fn get_request_pad(&self, name: &str) -> Option { unsafe { - from_glib_full(gst_sys::gst_element_get_request_pad( + from_glib_full(ffi::gst_element_get_request_pad( self.as_ref().to_glib_none().0, name.to_glib_none().0, )) @@ -378,7 +367,7 @@ impl> ElementExt for O { fn get_start_time(&self) -> ClockTime { unsafe { - from_glib(gst_sys::gst_element_get_start_time( + from_glib(ffi::gst_element_get_start_time( self.as_ref().to_glib_none().0, )) } @@ -386,7 +375,7 @@ impl> ElementExt for O { fn get_static_pad(&self, name: &str) -> Option { unsafe { - from_glib_full(gst_sys::gst_element_get_static_pad( + from_glib_full(ffi::gst_element_get_static_pad( self.as_ref().to_glib_none().0, name.to_glib_none().0, )) @@ -395,28 +384,28 @@ impl> ElementExt for O { fn is_locked_state(&self) -> bool { unsafe { - from_glib(gst_sys::gst_element_is_locked_state( + from_glib(ffi::gst_element_is_locked_state( self.as_ref().to_glib_none().0, )) } } //fn iterate_pads(&self) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_element_iterate_pads() } + // unsafe { TODO: call ffi:gst_element_iterate_pads() } //} //fn iterate_sink_pads(&self) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_element_iterate_sink_pads() } + // unsafe { TODO: call ffi:gst_element_iterate_sink_pads() } //} //fn iterate_src_pads(&self) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_element_iterate_src_pads() } + // unsafe { TODO: call ffi:gst_element_iterate_src_pads() } //} fn link>(&self, dest: &P) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_element_link( + glib::glib_result_from_gboolean!( + ffi::gst_element_link( self.as_ref().to_glib_none().0, dest.as_ref().to_glib_none().0 ), @@ -431,8 +420,8 @@ impl> ElementExt for O { filter: Option<&Caps>, ) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_element_link_filtered( + glib::glib_result_from_gboolean!( + ffi::gst_element_link_filtered( self.as_ref().to_glib_none().0, dest.as_ref().to_glib_none().0, filter.to_glib_none().0 @@ -443,7 +432,7 @@ impl> ElementExt for O { } //fn link_many>(&self, element_2: &P, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> bool { - // unsafe { TODO: call gst_sys:gst_element_link_many() } + // unsafe { TODO: call ffi:gst_element_link_many() } //} fn link_pads>( @@ -453,8 +442,8 @@ impl> ElementExt for O { destpadname: Option<&str>, ) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_element_link_pads( + glib::glib_result_from_gboolean!( + ffi::gst_element_link_pads( self.as_ref().to_glib_none().0, srcpadname.to_glib_none().0, dest.as_ref().to_glib_none().0, @@ -473,8 +462,8 @@ impl> ElementExt for O { filter: Option<&Caps>, ) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_element_link_pads_filtered( + glib::glib_result_from_gboolean!( + ffi::gst_element_link_pads_filtered( self.as_ref().to_glib_none().0, srcpadname.to_glib_none().0, dest.as_ref().to_glib_none().0, @@ -494,8 +483,8 @@ impl> ElementExt for O { flags: PadLinkCheck, ) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_element_link_pads_full( + glib::glib_result_from_gboolean!( + ffi::gst_element_link_pads_full( self.as_ref().to_glib_none().0, srcpadname.to_glib_none().0, dest.as_ref().to_glib_none().0, @@ -509,29 +498,29 @@ impl> ElementExt for O { fn lost_state(&self) { unsafe { - gst_sys::gst_element_lost_state(self.as_ref().to_glib_none().0); + ffi::gst_element_lost_state(self.as_ref().to_glib_none().0); } } //fn message_full(&self, type_: /*Ignored*/MessageType, domain: /*Ignored*/glib::Quark, code: i32, text: Option<&str>, debug: Option<&str>, file: &str, function: &str, line: i32) { - // unsafe { TODO: call gst_sys:gst_element_message_full() } + // unsafe { TODO: call ffi:gst_element_message_full() } //} //#[cfg(any(feature = "v1_10", feature = "dox"))] //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] //fn message_full_with_details(&self, type_: /*Ignored*/MessageType, domain: /*Ignored*/glib::Quark, code: i32, text: Option<&str>, debug: Option<&str>, file: &str, function: &str, line: i32, structure: &mut Structure) { - // unsafe { TODO: call gst_sys:gst_element_message_full_with_details() } + // unsafe { TODO: call ffi:gst_element_message_full_with_details() } //} fn no_more_pads(&self) { unsafe { - gst_sys::gst_element_no_more_pads(self.as_ref().to_glib_none().0); + ffi::gst_element_no_more_pads(self.as_ref().to_glib_none().0); } } fn provide_clock(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_element_provide_clock( + from_glib_full(ffi::gst_element_provide_clock( self.as_ref().to_glib_none().0, )) } @@ -539,7 +528,7 @@ impl> ElementExt for O { fn release_request_pad>(&self, pad: &P) { unsafe { - gst_sys::gst_element_release_request_pad( + ffi::gst_element_release_request_pad( self.as_ref().to_glib_none().0, pad.as_ref().to_glib_none().0, ); @@ -548,8 +537,8 @@ impl> ElementExt for O { fn remove_pad>(&self, pad: &P) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_element_remove_pad( + glib::glib_result_from_gboolean!( + ffi::gst_element_remove_pad( self.as_ref().to_glib_none().0, pad.as_ref().to_glib_none().0 ), @@ -565,7 +554,7 @@ impl> ElementExt for O { caps: Option<&Caps>, ) -> Option { unsafe { - from_glib_full(gst_sys::gst_element_request_pad( + 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, @@ -576,20 +565,20 @@ impl> ElementExt for O { fn set_base_time(&self, time: ClockTime) { unsafe { - gst_sys::gst_element_set_base_time(self.as_ref().to_glib_none().0, time.to_glib()); + ffi::gst_element_set_base_time(self.as_ref().to_glib_none().0, time.to_glib()); } } fn set_bus(&self, bus: Option<&Bus>) { unsafe { - gst_sys::gst_element_set_bus(self.as_ref().to_glib_none().0, bus.to_glib_none().0); + ffi::gst_element_set_bus(self.as_ref().to_glib_none().0, bus.to_glib_none().0); } } fn set_clock>(&self, clock: Option<&P>) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_element_set_clock( + glib::glib_result_from_gboolean!( + ffi::gst_element_set_clock( self.as_ref().to_glib_none().0, clock.map(|p| p.as_ref()).to_glib_none().0 ), @@ -600,16 +589,13 @@ impl> ElementExt for O { fn set_context(&self, context: &Context) { unsafe { - gst_sys::gst_element_set_context( - self.as_ref().to_glib_none().0, - context.to_glib_none().0, - ); + ffi::gst_element_set_context(self.as_ref().to_glib_none().0, context.to_glib_none().0); } } fn set_locked_state(&self, locked_state: bool) -> bool { unsafe { - from_glib(gst_sys::gst_element_set_locked_state( + from_glib(ffi::gst_element_set_locked_state( self.as_ref().to_glib_none().0, locked_state.to_glib(), )) @@ -618,14 +604,14 @@ impl> ElementExt for O { fn set_start_time(&self, time: ClockTime) { unsafe { - gst_sys::gst_element_set_start_time(self.as_ref().to_glib_none().0, time.to_glib()); + ffi::gst_element_set_start_time(self.as_ref().to_glib_none().0, time.to_glib()); } } fn sync_state_with_parent(&self) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_element_sync_state_with_parent(self.as_ref().to_glib_none().0), + glib::glib_result_from_gboolean!( + ffi::gst_element_sync_state_with_parent(self.as_ref().to_glib_none().0), "Failed to sync state with parent" ) } @@ -633,7 +619,7 @@ impl> ElementExt for O { fn unlink>(&self, dest: &P) { unsafe { - gst_sys::gst_element_unlink( + ffi::gst_element_unlink( self.as_ref().to_glib_none().0, dest.as_ref().to_glib_none().0, ); @@ -641,12 +627,12 @@ impl> ElementExt for O { } //fn unlink_many>(&self, element_2: &P, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) { - // unsafe { TODO: call gst_sys:gst_element_unlink_many() } + // unsafe { TODO: call ffi:gst_element_unlink_many() } //} fn unlink_pads>(&self, srcpadname: &str, dest: &P, destpadname: &str) { unsafe { - gst_sys::gst_element_unlink_pads( + ffi::gst_element_unlink_pads( self.as_ref().to_glib_none().0, srcpadname.to_glib_none().0, dest.as_ref().to_glib_none().0, @@ -657,8 +643,8 @@ impl> ElementExt for O { fn connect_no_more_pads(&self, f: F) -> SignalHandlerId { unsafe extern "C" fn no_more_pads_trampoline( - this: *mut gst_sys::GstElement, - f: glib_sys::gpointer, + this: *mut ffi::GstElement, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -683,9 +669,9 @@ impl> ElementExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn pad_added_trampoline( - this: *mut gst_sys::GstElement, - new_pad: *mut gst_sys::GstPad, - f: glib_sys::gpointer, + this: *mut ffi::GstElement, + new_pad: *mut ffi::GstPad, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -713,9 +699,9 @@ impl> ElementExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn pad_removed_trampoline( - this: *mut gst_sys::GstElement, - old_pad: *mut gst_sys::GstPad, - f: glib_sys::gpointer, + this: *mut ffi::GstElement, + old_pad: *mut ffi::GstPad, + f: glib::ffi::gpointer, ) where P: IsA, { diff --git a/gstreamer/src/auto/element_factory.rs b/gstreamer/src/auto/element_factory.rs index eb9484e65..f39b2755b 100644 --- a/gstreamer/src/auto/element_factory.rs +++ b/gstreamer/src/auto/element_factory.rs @@ -2,32 +2,29 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Caps; +use crate::Element; +use crate::ElementFactoryListType; +use crate::Object; +use crate::PadDirection; +use crate::PluginFeature; +use crate::Rank; +use crate::StaticPadTemplate; +use crate::URIType; use glib::translate::*; -use glib::GString; -use gst_sys; -use Caps; -use Element; -use ElementFactoryListType; -use Object; -use PadDirection; -use PluginFeature; -use Rank; -use StaticPadTemplate; -use URIType; -glib_wrapper! { - pub struct ElementFactory(Object) @extends PluginFeature, Object; +glib::glib_wrapper! { + pub struct ElementFactory(Object) @extends PluginFeature, Object; match fn { - get_type => || gst_sys::gst_element_factory_get_type(), + get_type => || ffi::gst_element_factory_get_type(), } } impl ElementFactory { pub fn can_sink_all_caps(&self, caps: &Caps) -> bool { unsafe { - from_glib(gst_sys::gst_element_factory_can_sink_all_caps( + from_glib(ffi::gst_element_factory_can_sink_all_caps( self.to_glib_none().0, caps.to_glib_none().0, )) @@ -36,7 +33,7 @@ impl ElementFactory { pub fn can_sink_any_caps(&self, caps: &Caps) -> bool { unsafe { - from_glib(gst_sys::gst_element_factory_can_sink_any_caps( + from_glib(ffi::gst_element_factory_can_sink_any_caps( self.to_glib_none().0, caps.to_glib_none().0, )) @@ -45,7 +42,7 @@ impl ElementFactory { pub fn can_src_all_caps(&self, caps: &Caps) -> bool { unsafe { - from_glib(gst_sys::gst_element_factory_can_src_all_caps( + from_glib(ffi::gst_element_factory_can_src_all_caps( self.to_glib_none().0, caps.to_glib_none().0, )) @@ -54,7 +51,7 @@ impl ElementFactory { pub fn can_src_any_caps(&self, caps: &Caps) -> bool { unsafe { - from_glib(gst_sys::gst_element_factory_can_src_any_caps( + from_glib(ffi::gst_element_factory_can_src_any_caps( self.to_glib_none().0, caps.to_glib_none().0, )) @@ -63,70 +60,66 @@ impl ElementFactory { pub fn create(&self, name: Option<&str>) -> Result { unsafe { - Option::<_>::from_glib_none(gst_sys::gst_element_factory_create( + Option::<_>::from_glib_none(ffi::gst_element_factory_create( self.to_glib_none().0, name.to_glib_none().0, )) - .ok_or_else(|| glib_bool_error!("Failed to create element from factory")) + .ok_or_else(|| glib::glib_bool_error!("Failed to create element from factory")) } } pub fn get_element_type(&self) -> glib::types::Type { unsafe { - from_glib(gst_sys::gst_element_factory_get_element_type( + from_glib(ffi::gst_element_factory_get_element_type( self.to_glib_none().0, )) } } - pub fn get_metadata(&self, key: &str) -> Option { + pub fn get_metadata(&self, key: &str) -> Option { unsafe { - from_glib_none(gst_sys::gst_element_factory_get_metadata( + from_glib_none(ffi::gst_element_factory_get_metadata( self.to_glib_none().0, key.to_glib_none().0, )) } } - pub fn get_metadata_keys(&self) -> Vec { + pub fn get_metadata_keys(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_element_factory_get_metadata_keys( + FromGlibPtrContainer::from_glib_full(ffi::gst_element_factory_get_metadata_keys( self.to_glib_none().0, )) } } pub fn get_num_pad_templates(&self) -> u32 { - unsafe { gst_sys::gst_element_factory_get_num_pad_templates(self.to_glib_none().0) } + unsafe { ffi::gst_element_factory_get_num_pad_templates(self.to_glib_none().0) } } pub fn get_static_pad_templates(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_none( - gst_sys::gst_element_factory_get_static_pad_templates(self.to_glib_none().0), - ) + FromGlibPtrContainer::from_glib_none(ffi::gst_element_factory_get_static_pad_templates( + self.to_glib_none().0, + )) } } - pub fn get_uri_protocols(&self) -> Vec { + pub fn get_uri_protocols(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_none(gst_sys::gst_element_factory_get_uri_protocols( + FromGlibPtrContainer::from_glib_none(ffi::gst_element_factory_get_uri_protocols( self.to_glib_none().0, )) } } pub fn get_uri_type(&self) -> URIType { - unsafe { - from_glib(gst_sys::gst_element_factory_get_uri_type( - self.to_glib_none().0, - )) - } + unsafe { from_glib(ffi::gst_element_factory_get_uri_type(self.to_glib_none().0)) } } pub fn has_interface(&self, interfacename: &str) -> bool { unsafe { - from_glib(gst_sys::gst_element_factory_has_interface( + from_glib(ffi::gst_element_factory_has_interface( self.to_glib_none().0, interfacename.to_glib_none().0, )) @@ -135,7 +128,7 @@ impl ElementFactory { pub fn list_is_type(&self, type_: ElementFactoryListType) -> bool { unsafe { - from_glib(gst_sys::gst_element_factory_list_is_type( + from_glib(ffi::gst_element_factory_list_is_type( self.to_glib_none().0, type_, )) @@ -144,7 +137,7 @@ impl ElementFactory { pub fn find(name: &str) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_full(gst_sys::gst_element_factory_find(name.to_glib_none().0)) } + unsafe { from_glib_full(ffi::gst_element_factory_find(name.to_glib_none().0)) } } pub fn list_filter( @@ -155,7 +148,7 @@ impl ElementFactory { ) -> Vec { assert_initialized_main_thread!(); unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_element_factory_list_filter( + FromGlibPtrContainer::from_glib_full(ffi::gst_element_factory_list_filter( list.to_glib_none().0, caps.to_glib_none().0, direction.to_glib(), @@ -167,7 +160,7 @@ impl ElementFactory { pub fn list_get_elements(type_: ElementFactoryListType, minrank: Rank) -> Vec { assert_initialized_main_thread!(); unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_element_factory_list_get_elements( + FromGlibPtrContainer::from_glib_full(ffi::gst_element_factory_list_get_elements( type_, minrank.to_glib(), )) @@ -177,11 +170,11 @@ impl ElementFactory { pub fn make(factoryname: &str, name: Option<&str>) -> Result { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_none(gst_sys::gst_element_factory_make( + Option::<_>::from_glib_none(ffi::gst_element_factory_make( factoryname.to_glib_none().0, name.to_glib_none().0, )) - .ok_or_else(|| glib_bool_error!("Failed to create element from factory name")) + .ok_or_else(|| glib::glib_bool_error!("Failed to create element from factory name")) } } } diff --git a/gstreamer/src/auto/enums.rs b/gstreamer/src/auto/enums.rs index ffbb6ee43..04b0bf82f 100644 --- a/gstreamer/src/auto/enums.rs +++ b/gstreamer/src/auto/enums.rs @@ -11,8 +11,6 @@ use glib::value::Value; use glib::Quark; use glib::StaticType; use glib::Type; -use gobject_sys; -use gst_sys; #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[non_exhaustive] @@ -27,22 +25,22 @@ pub enum BufferingMode { #[doc(hidden)] impl ToGlib for BufferingMode { - type GlibType = gst_sys::GstBufferingMode; + type GlibType = ffi::GstBufferingMode; - fn to_glib(&self) -> gst_sys::GstBufferingMode { + fn to_glib(&self) -> ffi::GstBufferingMode { match *self { - BufferingMode::Stream => gst_sys::GST_BUFFERING_STREAM, - BufferingMode::Download => gst_sys::GST_BUFFERING_DOWNLOAD, - BufferingMode::Timeshift => gst_sys::GST_BUFFERING_TIMESHIFT, - BufferingMode::Live => gst_sys::GST_BUFFERING_LIVE, + BufferingMode::Stream => ffi::GST_BUFFERING_STREAM, + BufferingMode::Download => ffi::GST_BUFFERING_DOWNLOAD, + BufferingMode::Timeshift => ffi::GST_BUFFERING_TIMESHIFT, + BufferingMode::Live => ffi::GST_BUFFERING_LIVE, BufferingMode::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for BufferingMode { - fn from_glib(value: gst_sys::GstBufferingMode) -> Self { +impl FromGlib for BufferingMode { + fn from_glib(value: ffi::GstBufferingMode) -> Self { skip_assert_initialized!(); match value { 0 => BufferingMode::Stream, @@ -56,7 +54,7 @@ impl FromGlib for BufferingMode { impl StaticType for BufferingMode { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_buffering_mode_get_type()) } + unsafe { from_glib(ffi::gst_buffering_mode_get_type()) } } } @@ -68,13 +66,13 @@ impl<'a> FromValueOptional<'a> for BufferingMode { impl<'a> FromValue<'a> for BufferingMode { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for BufferingMode { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -90,21 +88,21 @@ pub enum BusSyncReply { #[doc(hidden)] impl ToGlib for BusSyncReply { - type GlibType = gst_sys::GstBusSyncReply; + type GlibType = ffi::GstBusSyncReply; - fn to_glib(&self) -> gst_sys::GstBusSyncReply { + fn to_glib(&self) -> ffi::GstBusSyncReply { match *self { - BusSyncReply::Drop => gst_sys::GST_BUS_DROP, - BusSyncReply::Pass => gst_sys::GST_BUS_PASS, - BusSyncReply::Async => gst_sys::GST_BUS_ASYNC, + BusSyncReply::Drop => ffi::GST_BUS_DROP, + BusSyncReply::Pass => ffi::GST_BUS_PASS, + BusSyncReply::Async => ffi::GST_BUS_ASYNC, BusSyncReply::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for BusSyncReply { - fn from_glib(value: gst_sys::GstBusSyncReply) -> Self { +impl FromGlib for BusSyncReply { + fn from_glib(value: ffi::GstBusSyncReply) -> Self { skip_assert_initialized!(); match value { 0 => BusSyncReply::Drop, @@ -117,7 +115,7 @@ impl FromGlib for BusSyncReply { impl StaticType for BusSyncReply { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_bus_sync_reply_get_type()) } + unsafe { from_glib(ffi::gst_bus_sync_reply_get_type()) } } } @@ -129,13 +127,13 @@ impl<'a> FromValueOptional<'a> for BusSyncReply { impl<'a> FromValue<'a> for BusSyncReply { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for BusSyncReply { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -150,20 +148,20 @@ pub enum CapsIntersectMode { #[doc(hidden)] impl ToGlib for CapsIntersectMode { - type GlibType = gst_sys::GstCapsIntersectMode; + type GlibType = ffi::GstCapsIntersectMode; - fn to_glib(&self) -> gst_sys::GstCapsIntersectMode { + fn to_glib(&self) -> ffi::GstCapsIntersectMode { match *self { - CapsIntersectMode::ZigZag => gst_sys::GST_CAPS_INTERSECT_ZIG_ZAG, - CapsIntersectMode::First => gst_sys::GST_CAPS_INTERSECT_FIRST, + CapsIntersectMode::ZigZag => ffi::GST_CAPS_INTERSECT_ZIG_ZAG, + CapsIntersectMode::First => ffi::GST_CAPS_INTERSECT_FIRST, CapsIntersectMode::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for CapsIntersectMode { - fn from_glib(value: gst_sys::GstCapsIntersectMode) -> Self { +impl FromGlib for CapsIntersectMode { + fn from_glib(value: ffi::GstCapsIntersectMode) -> Self { skip_assert_initialized!(); match value { 0 => CapsIntersectMode::ZigZag, @@ -175,7 +173,7 @@ impl FromGlib for CapsIntersectMode { impl StaticType for CapsIntersectMode { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_caps_intersect_mode_get_type()) } + unsafe { from_glib(ffi::gst_caps_intersect_mode_get_type()) } } } @@ -187,13 +185,13 @@ impl<'a> FromValueOptional<'a> for CapsIntersectMode { impl<'a> FromValue<'a> for CapsIntersectMode { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for CapsIntersectMode { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -208,20 +206,20 @@ pub enum ClockEntryType { #[doc(hidden)] impl ToGlib for ClockEntryType { - type GlibType = gst_sys::GstClockEntryType; + type GlibType = ffi::GstClockEntryType; - fn to_glib(&self) -> gst_sys::GstClockEntryType { + fn to_glib(&self) -> ffi::GstClockEntryType { match *self { - ClockEntryType::Single => gst_sys::GST_CLOCK_ENTRY_SINGLE, - ClockEntryType::Periodic => gst_sys::GST_CLOCK_ENTRY_PERIODIC, + ClockEntryType::Single => ffi::GST_CLOCK_ENTRY_SINGLE, + ClockEntryType::Periodic => ffi::GST_CLOCK_ENTRY_PERIODIC, ClockEntryType::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for ClockEntryType { - fn from_glib(value: gst_sys::GstClockEntryType) -> Self { +impl FromGlib for ClockEntryType { + fn from_glib(value: ffi::GstClockEntryType) -> Self { skip_assert_initialized!(); match value { 0 => ClockEntryType::Single, @@ -233,7 +231,7 @@ impl FromGlib for ClockEntryType { impl StaticType for ClockEntryType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_clock_entry_type_get_type()) } + unsafe { from_glib(ffi::gst_clock_entry_type_get_type()) } } } @@ -245,13 +243,13 @@ impl<'a> FromValueOptional<'a> for ClockEntryType { impl<'a> FromValue<'a> for ClockEntryType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for ClockEntryType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -273,26 +271,26 @@ pub enum ClockReturn { #[doc(hidden)] impl ToGlib for ClockReturn { - type GlibType = gst_sys::GstClockReturn; + type GlibType = ffi::GstClockReturn; - fn to_glib(&self) -> gst_sys::GstClockReturn { + fn to_glib(&self) -> ffi::GstClockReturn { match *self { - ClockReturn::Ok => gst_sys::GST_CLOCK_OK, - ClockReturn::Early => gst_sys::GST_CLOCK_EARLY, - ClockReturn::Unscheduled => gst_sys::GST_CLOCK_UNSCHEDULED, - ClockReturn::Busy => gst_sys::GST_CLOCK_BUSY, - ClockReturn::Badtime => gst_sys::GST_CLOCK_BADTIME, - ClockReturn::Error => gst_sys::GST_CLOCK_ERROR, - ClockReturn::Unsupported => gst_sys::GST_CLOCK_UNSUPPORTED, - ClockReturn::Done => gst_sys::GST_CLOCK_DONE, + ClockReturn::Ok => ffi::GST_CLOCK_OK, + ClockReturn::Early => ffi::GST_CLOCK_EARLY, + ClockReturn::Unscheduled => ffi::GST_CLOCK_UNSCHEDULED, + ClockReturn::Busy => ffi::GST_CLOCK_BUSY, + ClockReturn::Badtime => ffi::GST_CLOCK_BADTIME, + ClockReturn::Error => ffi::GST_CLOCK_ERROR, + ClockReturn::Unsupported => ffi::GST_CLOCK_UNSUPPORTED, + ClockReturn::Done => ffi::GST_CLOCK_DONE, ClockReturn::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for ClockReturn { - fn from_glib(value: gst_sys::GstClockReturn) -> Self { +impl FromGlib for ClockReturn { + fn from_glib(value: ffi::GstClockReturn) -> Self { skip_assert_initialized!(); match value { 0 => ClockReturn::Ok, @@ -310,7 +308,7 @@ impl FromGlib for ClockReturn { impl StaticType for ClockReturn { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_clock_return_get_type()) } + unsafe { from_glib(ffi::gst_clock_return_get_type()) } } } @@ -322,13 +320,13 @@ impl<'a> FromValueOptional<'a> for ClockReturn { impl<'a> FromValue<'a> for ClockReturn { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for ClockReturn { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -347,23 +345,23 @@ pub enum ClockType { #[doc(hidden)] impl ToGlib for ClockType { - type GlibType = gst_sys::GstClockType; + type GlibType = ffi::GstClockType; - fn to_glib(&self) -> gst_sys::GstClockType { + fn to_glib(&self) -> ffi::GstClockType { match *self { - ClockType::Realtime => gst_sys::GST_CLOCK_TYPE_REALTIME, - ClockType::Monotonic => gst_sys::GST_CLOCK_TYPE_MONOTONIC, - ClockType::Other => gst_sys::GST_CLOCK_TYPE_OTHER, + ClockType::Realtime => ffi::GST_CLOCK_TYPE_REALTIME, + ClockType::Monotonic => ffi::GST_CLOCK_TYPE_MONOTONIC, + ClockType::Other => ffi::GST_CLOCK_TYPE_OTHER, #[cfg(any(feature = "v1_18", feature = "dox"))] - ClockType::Tai => gst_sys::GST_CLOCK_TYPE_TAI, + ClockType::Tai => ffi::GST_CLOCK_TYPE_TAI, ClockType::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for ClockType { - fn from_glib(value: gst_sys::GstClockType) -> Self { +impl FromGlib for ClockType { + fn from_glib(value: ffi::GstClockType) -> Self { skip_assert_initialized!(); match value { 0 => ClockType::Realtime, @@ -378,7 +376,7 @@ impl FromGlib for ClockType { impl StaticType for ClockType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_clock_type_get_type()) } + unsafe { from_glib(ffi::gst_clock_type_get_type()) } } } @@ -390,13 +388,13 @@ impl<'a> FromValueOptional<'a> for ClockType { impl<'a> FromValue<'a> for ClockType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for ClockType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -424,33 +422,33 @@ pub enum CoreError { #[doc(hidden)] impl ToGlib for CoreError { - type GlibType = gst_sys::GstCoreError; + type GlibType = ffi::GstCoreError; - fn to_glib(&self) -> gst_sys::GstCoreError { + fn to_glib(&self) -> ffi::GstCoreError { match *self { - CoreError::Failed => gst_sys::GST_CORE_ERROR_FAILED, - CoreError::TooLazy => gst_sys::GST_CORE_ERROR_TOO_LAZY, - CoreError::NotImplemented => gst_sys::GST_CORE_ERROR_NOT_IMPLEMENTED, - CoreError::StateChange => gst_sys::GST_CORE_ERROR_STATE_CHANGE, - CoreError::Pad => gst_sys::GST_CORE_ERROR_PAD, - CoreError::Thread => gst_sys::GST_CORE_ERROR_THREAD, - CoreError::Negotiation => gst_sys::GST_CORE_ERROR_NEGOTIATION, - CoreError::Event => gst_sys::GST_CORE_ERROR_EVENT, - CoreError::Seek => gst_sys::GST_CORE_ERROR_SEEK, - CoreError::Caps => gst_sys::GST_CORE_ERROR_CAPS, - CoreError::Tag => gst_sys::GST_CORE_ERROR_TAG, - CoreError::MissingPlugin => gst_sys::GST_CORE_ERROR_MISSING_PLUGIN, - CoreError::Clock => gst_sys::GST_CORE_ERROR_CLOCK, - CoreError::Disabled => gst_sys::GST_CORE_ERROR_DISABLED, - CoreError::NumErrors => gst_sys::GST_CORE_ERROR_NUM_ERRORS, + CoreError::Failed => ffi::GST_CORE_ERROR_FAILED, + CoreError::TooLazy => ffi::GST_CORE_ERROR_TOO_LAZY, + CoreError::NotImplemented => ffi::GST_CORE_ERROR_NOT_IMPLEMENTED, + CoreError::StateChange => ffi::GST_CORE_ERROR_STATE_CHANGE, + CoreError::Pad => ffi::GST_CORE_ERROR_PAD, + CoreError::Thread => ffi::GST_CORE_ERROR_THREAD, + CoreError::Negotiation => ffi::GST_CORE_ERROR_NEGOTIATION, + CoreError::Event => ffi::GST_CORE_ERROR_EVENT, + CoreError::Seek => ffi::GST_CORE_ERROR_SEEK, + CoreError::Caps => ffi::GST_CORE_ERROR_CAPS, + CoreError::Tag => ffi::GST_CORE_ERROR_TAG, + CoreError::MissingPlugin => ffi::GST_CORE_ERROR_MISSING_PLUGIN, + CoreError::Clock => ffi::GST_CORE_ERROR_CLOCK, + CoreError::Disabled => ffi::GST_CORE_ERROR_DISABLED, + CoreError::NumErrors => ffi::GST_CORE_ERROR_NUM_ERRORS, CoreError::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for CoreError { - fn from_glib(value: gst_sys::GstCoreError) -> Self { +impl FromGlib for CoreError { + fn from_glib(value: ffi::GstCoreError) -> Self { skip_assert_initialized!(); match value { 1 => CoreError::Failed, @@ -477,7 +475,7 @@ impl ErrorDomain for CoreError { fn domain() -> Quark { skip_assert_initialized!(); - unsafe { from_glib(gst_sys::gst_core_error_quark()) } + unsafe { from_glib(ffi::gst_core_error_quark()) } } fn code(self) -> i32 { @@ -509,7 +507,7 @@ impl ErrorDomain for CoreError { impl StaticType for CoreError { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_core_error_get_type()) } + unsafe { from_glib(ffi::gst_core_error_get_type()) } } } @@ -521,13 +519,13 @@ impl<'a> FromValueOptional<'a> for CoreError { impl<'a> FromValue<'a> for CoreError { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for CoreError { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -550,28 +548,28 @@ pub enum DebugLevel { #[doc(hidden)] impl ToGlib for DebugLevel { - type GlibType = gst_sys::GstDebugLevel; + type GlibType = ffi::GstDebugLevel; - fn to_glib(&self) -> gst_sys::GstDebugLevel { + fn to_glib(&self) -> ffi::GstDebugLevel { match *self { - DebugLevel::None => gst_sys::GST_LEVEL_NONE, - DebugLevel::Error => gst_sys::GST_LEVEL_ERROR, - DebugLevel::Warning => gst_sys::GST_LEVEL_WARNING, - DebugLevel::Fixme => gst_sys::GST_LEVEL_FIXME, - DebugLevel::Info => gst_sys::GST_LEVEL_INFO, - DebugLevel::Debug => gst_sys::GST_LEVEL_DEBUG, - DebugLevel::Log => gst_sys::GST_LEVEL_LOG, - DebugLevel::Trace => gst_sys::GST_LEVEL_TRACE, - DebugLevel::Memdump => gst_sys::GST_LEVEL_MEMDUMP, - DebugLevel::Count => gst_sys::GST_LEVEL_COUNT, + DebugLevel::None => ffi::GST_LEVEL_NONE, + DebugLevel::Error => ffi::GST_LEVEL_ERROR, + DebugLevel::Warning => ffi::GST_LEVEL_WARNING, + DebugLevel::Fixme => ffi::GST_LEVEL_FIXME, + DebugLevel::Info => ffi::GST_LEVEL_INFO, + DebugLevel::Debug => ffi::GST_LEVEL_DEBUG, + DebugLevel::Log => ffi::GST_LEVEL_LOG, + DebugLevel::Trace => ffi::GST_LEVEL_TRACE, + DebugLevel::Memdump => ffi::GST_LEVEL_MEMDUMP, + DebugLevel::Count => ffi::GST_LEVEL_COUNT, DebugLevel::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for DebugLevel { - fn from_glib(value: gst_sys::GstDebugLevel) -> Self { +impl FromGlib for DebugLevel { + fn from_glib(value: ffi::GstDebugLevel) -> Self { skip_assert_initialized!(); match value { 0 => DebugLevel::None, @@ -591,7 +589,7 @@ impl FromGlib for DebugLevel { impl StaticType for DebugLevel { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_debug_level_get_type()) } + unsafe { from_glib(ffi::gst_debug_level_get_type()) } } } @@ -603,13 +601,13 @@ impl<'a> FromValueOptional<'a> for DebugLevel { impl<'a> FromValue<'a> for DebugLevel { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for DebugLevel { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -662,54 +660,54 @@ pub enum EventType { #[doc(hidden)] impl ToGlib for EventType { - type GlibType = gst_sys::GstEventType; + type GlibType = ffi::GstEventType; - fn to_glib(&self) -> gst_sys::GstEventType { + fn to_glib(&self) -> ffi::GstEventType { match *self { - EventType::Unknown => gst_sys::GST_EVENT_UNKNOWN, - EventType::FlushStart => gst_sys::GST_EVENT_FLUSH_START, - EventType::FlushStop => gst_sys::GST_EVENT_FLUSH_STOP, - EventType::StreamStart => gst_sys::GST_EVENT_STREAM_START, - EventType::Caps => gst_sys::GST_EVENT_CAPS, - EventType::Segment => gst_sys::GST_EVENT_SEGMENT, - EventType::StreamCollection => gst_sys::GST_EVENT_STREAM_COLLECTION, - EventType::Tag => gst_sys::GST_EVENT_TAG, - EventType::Buffersize => gst_sys::GST_EVENT_BUFFERSIZE, - EventType::SinkMessage => gst_sys::GST_EVENT_SINK_MESSAGE, + EventType::Unknown => ffi::GST_EVENT_UNKNOWN, + EventType::FlushStart => ffi::GST_EVENT_FLUSH_START, + EventType::FlushStop => ffi::GST_EVENT_FLUSH_STOP, + EventType::StreamStart => ffi::GST_EVENT_STREAM_START, + EventType::Caps => ffi::GST_EVENT_CAPS, + EventType::Segment => ffi::GST_EVENT_SEGMENT, + EventType::StreamCollection => ffi::GST_EVENT_STREAM_COLLECTION, + EventType::Tag => ffi::GST_EVENT_TAG, + EventType::Buffersize => ffi::GST_EVENT_BUFFERSIZE, + EventType::SinkMessage => ffi::GST_EVENT_SINK_MESSAGE, #[cfg(any(feature = "v1_10", feature = "dox"))] - EventType::StreamGroupDone => gst_sys::GST_EVENT_STREAM_GROUP_DONE, - EventType::Eos => gst_sys::GST_EVENT_EOS, - EventType::Toc => gst_sys::GST_EVENT_TOC, - EventType::Protection => gst_sys::GST_EVENT_PROTECTION, - EventType::SegmentDone => gst_sys::GST_EVENT_SEGMENT_DONE, - EventType::Gap => gst_sys::GST_EVENT_GAP, + EventType::StreamGroupDone => ffi::GST_EVENT_STREAM_GROUP_DONE, + EventType::Eos => ffi::GST_EVENT_EOS, + EventType::Toc => ffi::GST_EVENT_TOC, + EventType::Protection => ffi::GST_EVENT_PROTECTION, + EventType::SegmentDone => ffi::GST_EVENT_SEGMENT_DONE, + EventType::Gap => ffi::GST_EVENT_GAP, #[cfg(any(feature = "v1_18", feature = "dox"))] - EventType::InstantRateChange => gst_sys::GST_EVENT_INSTANT_RATE_CHANGE, - EventType::Qos => gst_sys::GST_EVENT_QOS, - EventType::Seek => gst_sys::GST_EVENT_SEEK, - EventType::Navigation => gst_sys::GST_EVENT_NAVIGATION, - EventType::Latency => gst_sys::GST_EVENT_LATENCY, - EventType::Step => gst_sys::GST_EVENT_STEP, - EventType::Reconfigure => gst_sys::GST_EVENT_RECONFIGURE, - EventType::TocSelect => gst_sys::GST_EVENT_TOC_SELECT, + EventType::InstantRateChange => ffi::GST_EVENT_INSTANT_RATE_CHANGE, + EventType::Qos => ffi::GST_EVENT_QOS, + EventType::Seek => ffi::GST_EVENT_SEEK, + EventType::Navigation => ffi::GST_EVENT_NAVIGATION, + EventType::Latency => ffi::GST_EVENT_LATENCY, + EventType::Step => ffi::GST_EVENT_STEP, + EventType::Reconfigure => ffi::GST_EVENT_RECONFIGURE, + EventType::TocSelect => ffi::GST_EVENT_TOC_SELECT, #[cfg(any(feature = "v1_10", feature = "dox"))] - EventType::SelectStreams => gst_sys::GST_EVENT_SELECT_STREAMS, + EventType::SelectStreams => ffi::GST_EVENT_SELECT_STREAMS, #[cfg(any(feature = "v1_18", feature = "dox"))] - EventType::InstantRateSyncTime => gst_sys::GST_EVENT_INSTANT_RATE_SYNC_TIME, - EventType::CustomUpstream => gst_sys::GST_EVENT_CUSTOM_UPSTREAM, - EventType::CustomDownstream => gst_sys::GST_EVENT_CUSTOM_DOWNSTREAM, - EventType::CustomDownstreamOob => gst_sys::GST_EVENT_CUSTOM_DOWNSTREAM_OOB, - EventType::CustomDownstreamSticky => gst_sys::GST_EVENT_CUSTOM_DOWNSTREAM_STICKY, - EventType::CustomBoth => gst_sys::GST_EVENT_CUSTOM_BOTH, - EventType::CustomBothOob => gst_sys::GST_EVENT_CUSTOM_BOTH_OOB, + EventType::InstantRateSyncTime => ffi::GST_EVENT_INSTANT_RATE_SYNC_TIME, + EventType::CustomUpstream => ffi::GST_EVENT_CUSTOM_UPSTREAM, + EventType::CustomDownstream => ffi::GST_EVENT_CUSTOM_DOWNSTREAM, + EventType::CustomDownstreamOob => ffi::GST_EVENT_CUSTOM_DOWNSTREAM_OOB, + EventType::CustomDownstreamSticky => ffi::GST_EVENT_CUSTOM_DOWNSTREAM_STICKY, + EventType::CustomBoth => ffi::GST_EVENT_CUSTOM_BOTH, + EventType::CustomBothOob => ffi::GST_EVENT_CUSTOM_BOTH_OOB, EventType::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for EventType { - fn from_glib(value: gst_sys::GstEventType) -> Self { +impl FromGlib for EventType { + fn from_glib(value: ffi::GstEventType) -> Self { skip_assert_initialized!(); match value { 0 => EventType::Unknown, @@ -755,7 +753,7 @@ impl FromGlib for EventType { impl StaticType for EventType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_event_type_get_type()) } + unsafe { from_glib(ffi::gst_event_type_get_type()) } } } @@ -767,13 +765,13 @@ impl<'a> FromValueOptional<'a> for EventType { impl<'a> FromValue<'a> for EventType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for EventType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -800,31 +798,31 @@ pub enum FlowReturn { #[doc(hidden)] impl ToGlib for FlowReturn { - type GlibType = gst_sys::GstFlowReturn; + type GlibType = ffi::GstFlowReturn; - fn to_glib(&self) -> gst_sys::GstFlowReturn { + fn to_glib(&self) -> ffi::GstFlowReturn { match *self { - FlowReturn::CustomSuccess2 => gst_sys::GST_FLOW_CUSTOM_SUCCESS_2, - FlowReturn::CustomSuccess1 => gst_sys::GST_FLOW_CUSTOM_SUCCESS_1, - FlowReturn::CustomSuccess => gst_sys::GST_FLOW_CUSTOM_SUCCESS, - FlowReturn::Ok => gst_sys::GST_FLOW_OK, - FlowReturn::NotLinked => gst_sys::GST_FLOW_NOT_LINKED, - FlowReturn::Flushing => gst_sys::GST_FLOW_FLUSHING, - FlowReturn::Eos => gst_sys::GST_FLOW_EOS, - FlowReturn::NotNegotiated => gst_sys::GST_FLOW_NOT_NEGOTIATED, - FlowReturn::Error => gst_sys::GST_FLOW_ERROR, - FlowReturn::NotSupported => gst_sys::GST_FLOW_NOT_SUPPORTED, - FlowReturn::CustomError => gst_sys::GST_FLOW_CUSTOM_ERROR, - FlowReturn::CustomError1 => gst_sys::GST_FLOW_CUSTOM_ERROR_1, - FlowReturn::CustomError2 => gst_sys::GST_FLOW_CUSTOM_ERROR_2, + FlowReturn::CustomSuccess2 => ffi::GST_FLOW_CUSTOM_SUCCESS_2, + FlowReturn::CustomSuccess1 => ffi::GST_FLOW_CUSTOM_SUCCESS_1, + FlowReturn::CustomSuccess => ffi::GST_FLOW_CUSTOM_SUCCESS, + FlowReturn::Ok => ffi::GST_FLOW_OK, + FlowReturn::NotLinked => ffi::GST_FLOW_NOT_LINKED, + FlowReturn::Flushing => ffi::GST_FLOW_FLUSHING, + FlowReturn::Eos => ffi::GST_FLOW_EOS, + FlowReturn::NotNegotiated => ffi::GST_FLOW_NOT_NEGOTIATED, + FlowReturn::Error => ffi::GST_FLOW_ERROR, + FlowReturn::NotSupported => ffi::GST_FLOW_NOT_SUPPORTED, + FlowReturn::CustomError => ffi::GST_FLOW_CUSTOM_ERROR, + FlowReturn::CustomError1 => ffi::GST_FLOW_CUSTOM_ERROR_1, + FlowReturn::CustomError2 => ffi::GST_FLOW_CUSTOM_ERROR_2, FlowReturn::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for FlowReturn { - fn from_glib(value: gst_sys::GstFlowReturn) -> Self { +impl FromGlib for FlowReturn { + fn from_glib(value: ffi::GstFlowReturn) -> Self { skip_assert_initialized!(); match value { 102 => FlowReturn::CustomSuccess2, @@ -847,7 +845,7 @@ impl FromGlib for FlowReturn { impl StaticType for FlowReturn { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_flow_return_get_type()) } + unsafe { from_glib(ffi::gst_flow_return_get_type()) } } } @@ -859,17 +857,17 @@ impl<'a> FromValueOptional<'a> for FlowReturn { impl<'a> FromValue<'a> for FlowReturn { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for FlowReturn { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } -#[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)] #[non_exhaustive] pub enum Format { @@ -885,24 +883,24 @@ pub enum Format { #[doc(hidden)] impl ToGlib for Format { - type GlibType = gst_sys::GstFormat; + type GlibType = ffi::GstFormat; - fn to_glib(&self) -> gst_sys::GstFormat { + fn to_glib(&self) -> ffi::GstFormat { match *self { - Format::Undefined => gst_sys::GST_FORMAT_UNDEFINED, - Format::Default => gst_sys::GST_FORMAT_DEFAULT, - Format::Bytes => gst_sys::GST_FORMAT_BYTES, - Format::Time => gst_sys::GST_FORMAT_TIME, - Format::Buffers => gst_sys::GST_FORMAT_BUFFERS, - Format::Percent => gst_sys::GST_FORMAT_PERCENT, + Format::Undefined => ffi::GST_FORMAT_UNDEFINED, + Format::Default => ffi::GST_FORMAT_DEFAULT, + Format::Bytes => ffi::GST_FORMAT_BYTES, + Format::Time => ffi::GST_FORMAT_TIME, + Format::Buffers => ffi::GST_FORMAT_BUFFERS, + Format::Percent => ffi::GST_FORMAT_PERCENT, Format::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for Format { - fn from_glib(value: gst_sys::GstFormat) -> Self { +impl FromGlib for Format { + fn from_glib(value: ffi::GstFormat) -> Self { skip_assert_initialized!(); match value { 0 => Format::Undefined, @@ -918,7 +916,7 @@ impl FromGlib for Format { impl StaticType for Format { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_format_get_type()) } + unsafe { from_glib(ffi::gst_format_get_type()) } } } @@ -930,13 +928,13 @@ impl<'a> FromValueOptional<'a> for Format { impl<'a> FromValue<'a> for Format { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for Format { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -956,25 +954,25 @@ pub enum LibraryError { #[doc(hidden)] impl ToGlib for LibraryError { - type GlibType = gst_sys::GstLibraryError; + type GlibType = ffi::GstLibraryError; - fn to_glib(&self) -> gst_sys::GstLibraryError { + fn to_glib(&self) -> ffi::GstLibraryError { match *self { - LibraryError::Failed => gst_sys::GST_LIBRARY_ERROR_FAILED, - LibraryError::TooLazy => gst_sys::GST_LIBRARY_ERROR_TOO_LAZY, - LibraryError::Init => gst_sys::GST_LIBRARY_ERROR_INIT, - LibraryError::Shutdown => gst_sys::GST_LIBRARY_ERROR_SHUTDOWN, - LibraryError::Settings => gst_sys::GST_LIBRARY_ERROR_SETTINGS, - LibraryError::Encode => gst_sys::GST_LIBRARY_ERROR_ENCODE, - LibraryError::NumErrors => gst_sys::GST_LIBRARY_ERROR_NUM_ERRORS, + LibraryError::Failed => ffi::GST_LIBRARY_ERROR_FAILED, + LibraryError::TooLazy => ffi::GST_LIBRARY_ERROR_TOO_LAZY, + LibraryError::Init => ffi::GST_LIBRARY_ERROR_INIT, + LibraryError::Shutdown => ffi::GST_LIBRARY_ERROR_SHUTDOWN, + LibraryError::Settings => ffi::GST_LIBRARY_ERROR_SETTINGS, + LibraryError::Encode => ffi::GST_LIBRARY_ERROR_ENCODE, + LibraryError::NumErrors => ffi::GST_LIBRARY_ERROR_NUM_ERRORS, LibraryError::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for LibraryError { - fn from_glib(value: gst_sys::GstLibraryError) -> Self { +impl FromGlib for LibraryError { + fn from_glib(value: ffi::GstLibraryError) -> Self { skip_assert_initialized!(); match value { 1 => LibraryError::Failed, @@ -993,7 +991,7 @@ impl ErrorDomain for LibraryError { fn domain() -> Quark { skip_assert_initialized!(); - unsafe { from_glib(gst_sys::gst_library_error_quark()) } + unsafe { from_glib(ffi::gst_library_error_quark()) } } fn code(self) -> i32 { @@ -1017,7 +1015,7 @@ impl ErrorDomain for LibraryError { impl StaticType for LibraryError { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_library_error_get_type()) } + unsafe { from_glib(ffi::gst_library_error_get_type()) } } } @@ -1029,13 +1027,13 @@ impl<'a> FromValueOptional<'a> for LibraryError { impl<'a> FromValue<'a> for LibraryError { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for LibraryError { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1051,21 +1049,21 @@ pub enum PadDirection { #[doc(hidden)] impl ToGlib for PadDirection { - type GlibType = gst_sys::GstPadDirection; + type GlibType = ffi::GstPadDirection; - fn to_glib(&self) -> gst_sys::GstPadDirection { + fn to_glib(&self) -> ffi::GstPadDirection { match *self { - PadDirection::Unknown => gst_sys::GST_PAD_UNKNOWN, - PadDirection::Src => gst_sys::GST_PAD_SRC, - PadDirection::Sink => gst_sys::GST_PAD_SINK, + PadDirection::Unknown => ffi::GST_PAD_UNKNOWN, + PadDirection::Src => ffi::GST_PAD_SRC, + PadDirection::Sink => ffi::GST_PAD_SINK, PadDirection::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for PadDirection { - fn from_glib(value: gst_sys::GstPadDirection) -> Self { +impl FromGlib for PadDirection { + fn from_glib(value: ffi::GstPadDirection) -> Self { skip_assert_initialized!(); match value { 0 => PadDirection::Unknown, @@ -1078,7 +1076,7 @@ impl FromGlib for PadDirection { impl StaticType for PadDirection { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_pad_direction_get_type()) } + unsafe { from_glib(ffi::gst_pad_direction_get_type()) } } } @@ -1090,13 +1088,13 @@ impl<'a> FromValueOptional<'a> for PadDirection { impl<'a> FromValue<'a> for PadDirection { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for PadDirection { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1117,25 +1115,25 @@ pub enum PadLinkReturn { #[doc(hidden)] impl ToGlib for PadLinkReturn { - type GlibType = gst_sys::GstPadLinkReturn; + type GlibType = ffi::GstPadLinkReturn; - fn to_glib(&self) -> gst_sys::GstPadLinkReturn { + fn to_glib(&self) -> ffi::GstPadLinkReturn { match *self { - PadLinkReturn::Ok => gst_sys::GST_PAD_LINK_OK, - PadLinkReturn::WrongHierarchy => gst_sys::GST_PAD_LINK_WRONG_HIERARCHY, - PadLinkReturn::WasLinked => gst_sys::GST_PAD_LINK_WAS_LINKED, - PadLinkReturn::WrongDirection => gst_sys::GST_PAD_LINK_WRONG_DIRECTION, - PadLinkReturn::Noformat => gst_sys::GST_PAD_LINK_NOFORMAT, - PadLinkReturn::Nosched => gst_sys::GST_PAD_LINK_NOSCHED, - PadLinkReturn::Refused => gst_sys::GST_PAD_LINK_REFUSED, + PadLinkReturn::Ok => ffi::GST_PAD_LINK_OK, + PadLinkReturn::WrongHierarchy => ffi::GST_PAD_LINK_WRONG_HIERARCHY, + PadLinkReturn::WasLinked => ffi::GST_PAD_LINK_WAS_LINKED, + PadLinkReturn::WrongDirection => ffi::GST_PAD_LINK_WRONG_DIRECTION, + PadLinkReturn::Noformat => ffi::GST_PAD_LINK_NOFORMAT, + PadLinkReturn::Nosched => ffi::GST_PAD_LINK_NOSCHED, + PadLinkReturn::Refused => ffi::GST_PAD_LINK_REFUSED, PadLinkReturn::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for PadLinkReturn { - fn from_glib(value: gst_sys::GstPadLinkReturn) -> Self { +impl FromGlib for PadLinkReturn { + fn from_glib(value: ffi::GstPadLinkReturn) -> Self { skip_assert_initialized!(); match value { 0 => PadLinkReturn::Ok, @@ -1152,7 +1150,7 @@ impl FromGlib for PadLinkReturn { impl StaticType for PadLinkReturn { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_pad_link_return_get_type()) } + unsafe { from_glib(ffi::gst_pad_link_return_get_type()) } } } @@ -1164,13 +1162,13 @@ impl<'a> FromValueOptional<'a> for PadLinkReturn { impl<'a> FromValue<'a> for PadLinkReturn { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for PadLinkReturn { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1186,21 +1184,21 @@ pub enum PadMode { #[doc(hidden)] impl ToGlib for PadMode { - type GlibType = gst_sys::GstPadMode; + type GlibType = ffi::GstPadMode; - fn to_glib(&self) -> gst_sys::GstPadMode { + fn to_glib(&self) -> ffi::GstPadMode { match *self { - PadMode::None => gst_sys::GST_PAD_MODE_NONE, - PadMode::Push => gst_sys::GST_PAD_MODE_PUSH, - PadMode::Pull => gst_sys::GST_PAD_MODE_PULL, + PadMode::None => ffi::GST_PAD_MODE_NONE, + PadMode::Push => ffi::GST_PAD_MODE_PUSH, + PadMode::Pull => ffi::GST_PAD_MODE_PULL, PadMode::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for PadMode { - fn from_glib(value: gst_sys::GstPadMode) -> Self { +impl FromGlib for PadMode { + fn from_glib(value: ffi::GstPadMode) -> Self { skip_assert_initialized!(); match value { 0 => PadMode::None, @@ -1213,7 +1211,7 @@ impl FromGlib for PadMode { impl StaticType for PadMode { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_pad_mode_get_type()) } + unsafe { from_glib(ffi::gst_pad_mode_get_type()) } } } @@ -1225,13 +1223,13 @@ impl<'a> FromValueOptional<'a> for PadMode { impl<'a> FromValue<'a> for PadMode { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for PadMode { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1247,21 +1245,21 @@ pub enum PadPresence { #[doc(hidden)] impl ToGlib for PadPresence { - type GlibType = gst_sys::GstPadPresence; + type GlibType = ffi::GstPadPresence; - fn to_glib(&self) -> gst_sys::GstPadPresence { + fn to_glib(&self) -> ffi::GstPadPresence { match *self { - PadPresence::Always => gst_sys::GST_PAD_ALWAYS, - PadPresence::Sometimes => gst_sys::GST_PAD_SOMETIMES, - PadPresence::Request => gst_sys::GST_PAD_REQUEST, + PadPresence::Always => ffi::GST_PAD_ALWAYS, + PadPresence::Sometimes => ffi::GST_PAD_SOMETIMES, + PadPresence::Request => ffi::GST_PAD_REQUEST, PadPresence::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for PadPresence { - fn from_glib(value: gst_sys::GstPadPresence) -> Self { +impl FromGlib for PadPresence { + fn from_glib(value: ffi::GstPadPresence) -> Self { skip_assert_initialized!(); match value { 0 => PadPresence::Always, @@ -1274,7 +1272,7 @@ impl FromGlib for PadPresence { impl StaticType for PadPresence { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_pad_presence_get_type()) } + unsafe { from_glib(ffi::gst_pad_presence_get_type()) } } } @@ -1286,13 +1284,13 @@ impl<'a> FromValueOptional<'a> for PadPresence { impl<'a> FromValue<'a> for PadPresence { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for PadPresence { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1310,23 +1308,23 @@ pub enum PadProbeReturn { #[doc(hidden)] impl ToGlib for PadProbeReturn { - type GlibType = gst_sys::GstPadProbeReturn; + type GlibType = ffi::GstPadProbeReturn; - fn to_glib(&self) -> gst_sys::GstPadProbeReturn { + fn to_glib(&self) -> ffi::GstPadProbeReturn { match *self { - PadProbeReturn::Drop => gst_sys::GST_PAD_PROBE_DROP, - PadProbeReturn::Ok => gst_sys::GST_PAD_PROBE_OK, - PadProbeReturn::Remove => gst_sys::GST_PAD_PROBE_REMOVE, - PadProbeReturn::Pass => gst_sys::GST_PAD_PROBE_PASS, - PadProbeReturn::Handled => gst_sys::GST_PAD_PROBE_HANDLED, + PadProbeReturn::Drop => ffi::GST_PAD_PROBE_DROP, + PadProbeReturn::Ok => ffi::GST_PAD_PROBE_OK, + PadProbeReturn::Remove => ffi::GST_PAD_PROBE_REMOVE, + PadProbeReturn::Pass => ffi::GST_PAD_PROBE_PASS, + PadProbeReturn::Handled => ffi::GST_PAD_PROBE_HANDLED, PadProbeReturn::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for PadProbeReturn { - fn from_glib(value: gst_sys::GstPadProbeReturn) -> Self { +impl FromGlib for PadProbeReturn { + fn from_glib(value: ffi::GstPadProbeReturn) -> Self { skip_assert_initialized!(); match value { 0 => PadProbeReturn::Drop, @@ -1341,7 +1339,7 @@ impl FromGlib for PadProbeReturn { impl StaticType for PadProbeReturn { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_pad_probe_return_get_type()) } + unsafe { from_glib(ffi::gst_pad_probe_return_get_type()) } } } @@ -1353,13 +1351,13 @@ impl<'a> FromValueOptional<'a> for PadProbeReturn { impl<'a> FromValue<'a> for PadProbeReturn { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for PadProbeReturn { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1380,26 +1378,26 @@ pub enum ParseError { #[doc(hidden)] impl ToGlib for ParseError { - type GlibType = gst_sys::GstParseError; + type GlibType = ffi::GstParseError; - fn to_glib(&self) -> gst_sys::GstParseError { + fn to_glib(&self) -> ffi::GstParseError { match *self { - ParseError::Syntax => gst_sys::GST_PARSE_ERROR_SYNTAX, - ParseError::NoSuchElement => gst_sys::GST_PARSE_ERROR_NO_SUCH_ELEMENT, - ParseError::NoSuchProperty => gst_sys::GST_PARSE_ERROR_NO_SUCH_PROPERTY, - ParseError::Link => gst_sys::GST_PARSE_ERROR_LINK, - ParseError::CouldNotSetProperty => gst_sys::GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY, - ParseError::EmptyBin => gst_sys::GST_PARSE_ERROR_EMPTY_BIN, - ParseError::Empty => gst_sys::GST_PARSE_ERROR_EMPTY, - ParseError::DelayedLink => gst_sys::GST_PARSE_ERROR_DELAYED_LINK, + ParseError::Syntax => ffi::GST_PARSE_ERROR_SYNTAX, + ParseError::NoSuchElement => ffi::GST_PARSE_ERROR_NO_SUCH_ELEMENT, + ParseError::NoSuchProperty => ffi::GST_PARSE_ERROR_NO_SUCH_PROPERTY, + ParseError::Link => ffi::GST_PARSE_ERROR_LINK, + ParseError::CouldNotSetProperty => ffi::GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY, + ParseError::EmptyBin => ffi::GST_PARSE_ERROR_EMPTY_BIN, + ParseError::Empty => ffi::GST_PARSE_ERROR_EMPTY, + ParseError::DelayedLink => ffi::GST_PARSE_ERROR_DELAYED_LINK, ParseError::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for ParseError { - fn from_glib(value: gst_sys::GstParseError) -> Self { +impl FromGlib for ParseError { + fn from_glib(value: ffi::GstParseError) -> Self { skip_assert_initialized!(); match value { 0 => ParseError::Syntax, @@ -1419,7 +1417,7 @@ impl ErrorDomain for ParseError { fn domain() -> Quark { skip_assert_initialized!(); - unsafe { from_glib(gst_sys::gst_parse_error_quark()) } + unsafe { from_glib(ffi::gst_parse_error_quark()) } } fn code(self) -> i32 { @@ -1444,7 +1442,7 @@ impl ErrorDomain for ParseError { impl StaticType for ParseError { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_parse_error_get_type()) } + unsafe { from_glib(ffi::gst_parse_error_get_type()) } } } @@ -1456,13 +1454,13 @@ impl<'a> FromValueOptional<'a> for ParseError { impl<'a> FromValue<'a> for ParseError { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for ParseError { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1478,21 +1476,21 @@ pub enum PluginError { #[doc(hidden)] impl ToGlib for PluginError { - type GlibType = gst_sys::GstPluginError; + type GlibType = ffi::GstPluginError; - fn to_glib(&self) -> gst_sys::GstPluginError { + fn to_glib(&self) -> ffi::GstPluginError { match *self { - PluginError::Module => gst_sys::GST_PLUGIN_ERROR_MODULE, - PluginError::Dependencies => gst_sys::GST_PLUGIN_ERROR_DEPENDENCIES, - PluginError::NameMismatch => gst_sys::GST_PLUGIN_ERROR_NAME_MISMATCH, + PluginError::Module => ffi::GST_PLUGIN_ERROR_MODULE, + PluginError::Dependencies => ffi::GST_PLUGIN_ERROR_DEPENDENCIES, + PluginError::NameMismatch => ffi::GST_PLUGIN_ERROR_NAME_MISMATCH, PluginError::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for PluginError { - fn from_glib(value: gst_sys::GstPluginError) -> Self { +impl FromGlib for PluginError { + fn from_glib(value: ffi::GstPluginError) -> Self { skip_assert_initialized!(); match value { 0 => PluginError::Module, @@ -1507,7 +1505,7 @@ impl ErrorDomain for PluginError { fn domain() -> Quark { skip_assert_initialized!(); - unsafe { from_glib(gst_sys::gst_plugin_error_quark()) } + unsafe { from_glib(ffi::gst_plugin_error_quark()) } } fn code(self) -> i32 { @@ -1527,7 +1525,7 @@ impl ErrorDomain for PluginError { impl StaticType for PluginError { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_plugin_error_get_type()) } + unsafe { from_glib(ffi::gst_plugin_error_get_type()) } } } @@ -1539,13 +1537,13 @@ impl<'a> FromValueOptional<'a> for PluginError { impl<'a> FromValue<'a> for PluginError { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for PluginError { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1563,23 +1561,23 @@ pub enum ProgressType { #[doc(hidden)] impl ToGlib for ProgressType { - type GlibType = gst_sys::GstProgressType; + type GlibType = ffi::GstProgressType; - fn to_glib(&self) -> gst_sys::GstProgressType { + fn to_glib(&self) -> ffi::GstProgressType { match *self { - ProgressType::Start => gst_sys::GST_PROGRESS_TYPE_START, - ProgressType::Continue => gst_sys::GST_PROGRESS_TYPE_CONTINUE, - ProgressType::Complete => gst_sys::GST_PROGRESS_TYPE_COMPLETE, - ProgressType::Canceled => gst_sys::GST_PROGRESS_TYPE_CANCELED, - ProgressType::Error => gst_sys::GST_PROGRESS_TYPE_ERROR, + ProgressType::Start => ffi::GST_PROGRESS_TYPE_START, + ProgressType::Continue => ffi::GST_PROGRESS_TYPE_CONTINUE, + ProgressType::Complete => ffi::GST_PROGRESS_TYPE_COMPLETE, + ProgressType::Canceled => ffi::GST_PROGRESS_TYPE_CANCELED, + ProgressType::Error => ffi::GST_PROGRESS_TYPE_ERROR, ProgressType::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for ProgressType { - fn from_glib(value: gst_sys::GstProgressType) -> Self { +impl FromGlib for ProgressType { + fn from_glib(value: ffi::GstProgressType) -> Self { skip_assert_initialized!(); match value { 0 => ProgressType::Start, @@ -1594,7 +1592,7 @@ impl FromGlib for ProgressType { impl StaticType for ProgressType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_progress_type_get_type()) } + unsafe { from_glib(ffi::gst_progress_type_get_type()) } } } @@ -1606,13 +1604,13 @@ impl<'a> FromValueOptional<'a> for ProgressType { impl<'a> FromValue<'a> for ProgressType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for ProgressType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1633,14 +1631,14 @@ pub enum PromiseResult { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] #[doc(hidden)] impl ToGlib for PromiseResult { - type GlibType = gst_sys::GstPromiseResult; + type GlibType = ffi::GstPromiseResult; - fn to_glib(&self) -> gst_sys::GstPromiseResult { + fn to_glib(&self) -> ffi::GstPromiseResult { match *self { - PromiseResult::Pending => gst_sys::GST_PROMISE_RESULT_PENDING, - PromiseResult::Interrupted => gst_sys::GST_PROMISE_RESULT_INTERRUPTED, - PromiseResult::Replied => gst_sys::GST_PROMISE_RESULT_REPLIED, - PromiseResult::Expired => gst_sys::GST_PROMISE_RESULT_EXPIRED, + PromiseResult::Pending => ffi::GST_PROMISE_RESULT_PENDING, + PromiseResult::Interrupted => ffi::GST_PROMISE_RESULT_INTERRUPTED, + PromiseResult::Replied => ffi::GST_PROMISE_RESULT_REPLIED, + PromiseResult::Expired => ffi::GST_PROMISE_RESULT_EXPIRED, PromiseResult::__Unknown(value) => value, } } @@ -1649,8 +1647,8 @@ impl ToGlib for PromiseResult { #[cfg(any(feature = "v1_14", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] #[doc(hidden)] -impl FromGlib for PromiseResult { - fn from_glib(value: gst_sys::GstPromiseResult) -> Self { +impl FromGlib for PromiseResult { + fn from_glib(value: ffi::GstPromiseResult) -> Self { skip_assert_initialized!(); match value { 0 => PromiseResult::Pending, @@ -1666,7 +1664,7 @@ impl FromGlib for PromiseResult { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] impl StaticType for PromiseResult { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_promise_result_get_type()) } + unsafe { from_glib(ffi::gst_promise_result_get_type()) } } } @@ -1682,7 +1680,7 @@ impl<'a> FromValueOptional<'a> for PromiseResult { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] impl<'a> FromValue<'a> for PromiseResult { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } @@ -1690,7 +1688,7 @@ impl<'a> FromValue<'a> for PromiseResult { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] impl SetValue for PromiseResult { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1706,21 +1704,21 @@ pub enum QOSType { #[doc(hidden)] impl ToGlib for QOSType { - type GlibType = gst_sys::GstQOSType; + type GlibType = ffi::GstQOSType; - fn to_glib(&self) -> gst_sys::GstQOSType { + fn to_glib(&self) -> ffi::GstQOSType { match *self { - QOSType::Overflow => gst_sys::GST_QOS_TYPE_OVERFLOW, - QOSType::Underflow => gst_sys::GST_QOS_TYPE_UNDERFLOW, - QOSType::Throttle => gst_sys::GST_QOS_TYPE_THROTTLE, + QOSType::Overflow => ffi::GST_QOS_TYPE_OVERFLOW, + QOSType::Underflow => ffi::GST_QOS_TYPE_UNDERFLOW, + QOSType::Throttle => ffi::GST_QOS_TYPE_THROTTLE, QOSType::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for QOSType { - fn from_glib(value: gst_sys::GstQOSType) -> Self { +impl FromGlib for QOSType { + fn from_glib(value: ffi::GstQOSType) -> Self { skip_assert_initialized!(); match value { 0 => QOSType::Overflow, @@ -1733,7 +1731,7 @@ impl FromGlib for QOSType { impl StaticType for QOSType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_qos_type_get_type()) } + unsafe { from_glib(ffi::gst_qos_type_get_type()) } } } @@ -1745,13 +1743,13 @@ impl<'a> FromValueOptional<'a> for QOSType { impl<'a> FromValue<'a> for QOSType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for QOSType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1768,22 +1766,22 @@ pub enum Rank { #[doc(hidden)] impl ToGlib for Rank { - type GlibType = gst_sys::GstRank; + type GlibType = ffi::GstRank; - fn to_glib(&self) -> gst_sys::GstRank { + fn to_glib(&self) -> ffi::GstRank { match *self { - Rank::None => gst_sys::GST_RANK_NONE, - Rank::Marginal => gst_sys::GST_RANK_MARGINAL, - Rank::Secondary => gst_sys::GST_RANK_SECONDARY, - Rank::Primary => gst_sys::GST_RANK_PRIMARY, + Rank::None => ffi::GST_RANK_NONE, + Rank::Marginal => ffi::GST_RANK_MARGINAL, + Rank::Secondary => ffi::GST_RANK_SECONDARY, + Rank::Primary => ffi::GST_RANK_PRIMARY, Rank::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for Rank { - fn from_glib(value: gst_sys::GstRank) -> Self { +impl FromGlib for Rank { + fn from_glib(value: ffi::GstRank) -> Self { skip_assert_initialized!(); match value { 0 => Rank::None, @@ -1797,7 +1795,7 @@ impl FromGlib for Rank { impl StaticType for Rank { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_rank_get_type()) } + unsafe { from_glib(ffi::gst_rank_get_type()) } } } @@ -1809,13 +1807,13 @@ impl<'a> FromValueOptional<'a> for Rank { impl<'a> FromValue<'a> for Rank { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for Rank { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1844,34 +1842,34 @@ pub enum ResourceError { #[doc(hidden)] impl ToGlib for ResourceError { - type GlibType = gst_sys::GstResourceError; + type GlibType = ffi::GstResourceError; - fn to_glib(&self) -> gst_sys::GstResourceError { + fn to_glib(&self) -> ffi::GstResourceError { match *self { - ResourceError::Failed => gst_sys::GST_RESOURCE_ERROR_FAILED, - ResourceError::TooLazy => gst_sys::GST_RESOURCE_ERROR_TOO_LAZY, - ResourceError::NotFound => gst_sys::GST_RESOURCE_ERROR_NOT_FOUND, - ResourceError::Busy => gst_sys::GST_RESOURCE_ERROR_BUSY, - ResourceError::OpenRead => gst_sys::GST_RESOURCE_ERROR_OPEN_READ, - ResourceError::OpenWrite => gst_sys::GST_RESOURCE_ERROR_OPEN_WRITE, - ResourceError::OpenReadWrite => gst_sys::GST_RESOURCE_ERROR_OPEN_READ_WRITE, - ResourceError::Close => gst_sys::GST_RESOURCE_ERROR_CLOSE, - ResourceError::Read => gst_sys::GST_RESOURCE_ERROR_READ, - ResourceError::Write => gst_sys::GST_RESOURCE_ERROR_WRITE, - ResourceError::Seek => gst_sys::GST_RESOURCE_ERROR_SEEK, - ResourceError::Sync => gst_sys::GST_RESOURCE_ERROR_SYNC, - ResourceError::Settings => gst_sys::GST_RESOURCE_ERROR_SETTINGS, - ResourceError::NoSpaceLeft => gst_sys::GST_RESOURCE_ERROR_NO_SPACE_LEFT, - ResourceError::NotAuthorized => gst_sys::GST_RESOURCE_ERROR_NOT_AUTHORIZED, - ResourceError::NumErrors => gst_sys::GST_RESOURCE_ERROR_NUM_ERRORS, + ResourceError::Failed => ffi::GST_RESOURCE_ERROR_FAILED, + ResourceError::TooLazy => ffi::GST_RESOURCE_ERROR_TOO_LAZY, + ResourceError::NotFound => ffi::GST_RESOURCE_ERROR_NOT_FOUND, + ResourceError::Busy => ffi::GST_RESOURCE_ERROR_BUSY, + ResourceError::OpenRead => ffi::GST_RESOURCE_ERROR_OPEN_READ, + ResourceError::OpenWrite => ffi::GST_RESOURCE_ERROR_OPEN_WRITE, + ResourceError::OpenReadWrite => ffi::GST_RESOURCE_ERROR_OPEN_READ_WRITE, + ResourceError::Close => ffi::GST_RESOURCE_ERROR_CLOSE, + ResourceError::Read => ffi::GST_RESOURCE_ERROR_READ, + ResourceError::Write => ffi::GST_RESOURCE_ERROR_WRITE, + ResourceError::Seek => ffi::GST_RESOURCE_ERROR_SEEK, + ResourceError::Sync => ffi::GST_RESOURCE_ERROR_SYNC, + ResourceError::Settings => ffi::GST_RESOURCE_ERROR_SETTINGS, + ResourceError::NoSpaceLeft => ffi::GST_RESOURCE_ERROR_NO_SPACE_LEFT, + ResourceError::NotAuthorized => ffi::GST_RESOURCE_ERROR_NOT_AUTHORIZED, + ResourceError::NumErrors => ffi::GST_RESOURCE_ERROR_NUM_ERRORS, ResourceError::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for ResourceError { - fn from_glib(value: gst_sys::GstResourceError) -> Self { +impl FromGlib for ResourceError { + fn from_glib(value: ffi::GstResourceError) -> Self { skip_assert_initialized!(); match value { 1 => ResourceError::Failed, @@ -1899,7 +1897,7 @@ impl ErrorDomain for ResourceError { fn domain() -> Quark { skip_assert_initialized!(); - unsafe { from_glib(gst_sys::gst_resource_error_quark()) } + unsafe { from_glib(ffi::gst_resource_error_quark()) } } fn code(self) -> i32 { @@ -1932,7 +1930,7 @@ impl ErrorDomain for ResourceError { impl StaticType for ResourceError { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_resource_error_get_type()) } + unsafe { from_glib(ffi::gst_resource_error_get_type()) } } } @@ -1944,13 +1942,13 @@ impl<'a> FromValueOptional<'a> for ResourceError { impl<'a> FromValue<'a> for ResourceError { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for ResourceError { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1966,21 +1964,21 @@ pub enum SeekType { #[doc(hidden)] impl ToGlib for SeekType { - type GlibType = gst_sys::GstSeekType; + type GlibType = ffi::GstSeekType; - fn to_glib(&self) -> gst_sys::GstSeekType { + fn to_glib(&self) -> ffi::GstSeekType { match *self { - SeekType::None => gst_sys::GST_SEEK_TYPE_NONE, - SeekType::Set => gst_sys::GST_SEEK_TYPE_SET, - SeekType::End => gst_sys::GST_SEEK_TYPE_END, + SeekType::None => ffi::GST_SEEK_TYPE_NONE, + SeekType::Set => ffi::GST_SEEK_TYPE_SET, + SeekType::End => ffi::GST_SEEK_TYPE_END, SeekType::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for SeekType { - fn from_glib(value: gst_sys::GstSeekType) -> Self { +impl FromGlib for SeekType { + fn from_glib(value: ffi::GstSeekType) -> Self { skip_assert_initialized!(); match value { 0 => SeekType::None, @@ -1993,7 +1991,7 @@ impl FromGlib for SeekType { impl StaticType for SeekType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_seek_type_get_type()) } + unsafe { from_glib(ffi::gst_seek_type_get_type()) } } } @@ -2005,13 +2003,13 @@ impl<'a> FromValueOptional<'a> for SeekType { impl<'a> FromValue<'a> for SeekType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for SeekType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -2029,23 +2027,23 @@ pub enum State { #[doc(hidden)] impl ToGlib for State { - type GlibType = gst_sys::GstState; + type GlibType = ffi::GstState; - fn to_glib(&self) -> gst_sys::GstState { + fn to_glib(&self) -> ffi::GstState { match *self { - State::VoidPending => gst_sys::GST_STATE_VOID_PENDING, - State::Null => gst_sys::GST_STATE_NULL, - State::Ready => gst_sys::GST_STATE_READY, - State::Paused => gst_sys::GST_STATE_PAUSED, - State::Playing => gst_sys::GST_STATE_PLAYING, + State::VoidPending => ffi::GST_STATE_VOID_PENDING, + State::Null => ffi::GST_STATE_NULL, + State::Ready => ffi::GST_STATE_READY, + State::Paused => ffi::GST_STATE_PAUSED, + State::Playing => ffi::GST_STATE_PLAYING, State::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for State { - fn from_glib(value: gst_sys::GstState) -> Self { +impl FromGlib for State { + fn from_glib(value: ffi::GstState) -> Self { skip_assert_initialized!(); match value { 0 => State::VoidPending, @@ -2060,7 +2058,7 @@ impl FromGlib for State { impl StaticType for State { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_state_get_type()) } + unsafe { from_glib(ffi::gst_state_get_type()) } } } @@ -2072,13 +2070,13 @@ impl<'a> FromValueOptional<'a> for State { impl<'a> FromValue<'a> for State { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for State { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -2101,28 +2099,28 @@ pub enum StateChange { #[doc(hidden)] impl ToGlib for StateChange { - type GlibType = gst_sys::GstStateChange; + type GlibType = ffi::GstStateChange; - fn to_glib(&self) -> gst_sys::GstStateChange { + fn to_glib(&self) -> ffi::GstStateChange { match *self { - StateChange::NullToReady => gst_sys::GST_STATE_CHANGE_NULL_TO_READY, - StateChange::ReadyToPaused => gst_sys::GST_STATE_CHANGE_READY_TO_PAUSED, - StateChange::PausedToPlaying => gst_sys::GST_STATE_CHANGE_PAUSED_TO_PLAYING, - StateChange::PlayingToPaused => gst_sys::GST_STATE_CHANGE_PLAYING_TO_PAUSED, - StateChange::PausedToReady => gst_sys::GST_STATE_CHANGE_PAUSED_TO_READY, - StateChange::ReadyToNull => gst_sys::GST_STATE_CHANGE_READY_TO_NULL, - StateChange::NullToNull => gst_sys::GST_STATE_CHANGE_NULL_TO_NULL, - StateChange::ReadyToReady => gst_sys::GST_STATE_CHANGE_READY_TO_READY, - StateChange::PausedToPaused => gst_sys::GST_STATE_CHANGE_PAUSED_TO_PAUSED, - StateChange::PlayingToPlaying => gst_sys::GST_STATE_CHANGE_PLAYING_TO_PLAYING, + StateChange::NullToReady => ffi::GST_STATE_CHANGE_NULL_TO_READY, + StateChange::ReadyToPaused => ffi::GST_STATE_CHANGE_READY_TO_PAUSED, + StateChange::PausedToPlaying => ffi::GST_STATE_CHANGE_PAUSED_TO_PLAYING, + StateChange::PlayingToPaused => ffi::GST_STATE_CHANGE_PLAYING_TO_PAUSED, + StateChange::PausedToReady => ffi::GST_STATE_CHANGE_PAUSED_TO_READY, + StateChange::ReadyToNull => ffi::GST_STATE_CHANGE_READY_TO_NULL, + StateChange::NullToNull => ffi::GST_STATE_CHANGE_NULL_TO_NULL, + StateChange::ReadyToReady => ffi::GST_STATE_CHANGE_READY_TO_READY, + StateChange::PausedToPaused => ffi::GST_STATE_CHANGE_PAUSED_TO_PAUSED, + StateChange::PlayingToPlaying => ffi::GST_STATE_CHANGE_PLAYING_TO_PLAYING, StateChange::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for StateChange { - fn from_glib(value: gst_sys::GstStateChange) -> Self { +impl FromGlib for StateChange { + fn from_glib(value: ffi::GstStateChange) -> Self { skip_assert_initialized!(); match value { 10 => StateChange::NullToReady, @@ -2142,7 +2140,7 @@ impl FromGlib for StateChange { impl StaticType for StateChange { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_state_change_get_type()) } + unsafe { from_glib(ffi::gst_state_change_get_type()) } } } @@ -2154,13 +2152,13 @@ impl<'a> FromValueOptional<'a> for StateChange { impl<'a> FromValue<'a> for StateChange { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for StateChange { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -2178,22 +2176,22 @@ pub enum StateChangeReturn { #[doc(hidden)] impl ToGlib for StateChangeReturn { - type GlibType = gst_sys::GstStateChangeReturn; + type GlibType = ffi::GstStateChangeReturn; - fn to_glib(&self) -> gst_sys::GstStateChangeReturn { + fn to_glib(&self) -> ffi::GstStateChangeReturn { match *self { - StateChangeReturn::Failure => gst_sys::GST_STATE_CHANGE_FAILURE, - StateChangeReturn::Success => gst_sys::GST_STATE_CHANGE_SUCCESS, - StateChangeReturn::Async => gst_sys::GST_STATE_CHANGE_ASYNC, - StateChangeReturn::NoPreroll => gst_sys::GST_STATE_CHANGE_NO_PREROLL, + StateChangeReturn::Failure => ffi::GST_STATE_CHANGE_FAILURE, + StateChangeReturn::Success => ffi::GST_STATE_CHANGE_SUCCESS, + StateChangeReturn::Async => ffi::GST_STATE_CHANGE_ASYNC, + StateChangeReturn::NoPreroll => ffi::GST_STATE_CHANGE_NO_PREROLL, StateChangeReturn::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for StateChangeReturn { - fn from_glib(value: gst_sys::GstStateChangeReturn) -> Self { +impl FromGlib for StateChangeReturn { + fn from_glib(value: ffi::GstStateChangeReturn) -> Self { skip_assert_initialized!(); match value { 0 => StateChangeReturn::Failure, @@ -2207,7 +2205,7 @@ impl FromGlib for StateChangeReturn { impl StaticType for StateChangeReturn { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_state_change_return_get_type()) } + unsafe { from_glib(ffi::gst_state_change_return_get_type()) } } } @@ -2219,13 +2217,13 @@ impl<'a> FromValueOptional<'a> for StateChangeReturn { impl<'a> FromValue<'a> for StateChangeReturn { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for StateChangeReturn { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -2252,32 +2250,32 @@ pub enum StreamError { #[doc(hidden)] impl ToGlib for StreamError { - type GlibType = gst_sys::GstStreamError; + type GlibType = ffi::GstStreamError; - fn to_glib(&self) -> gst_sys::GstStreamError { + fn to_glib(&self) -> ffi::GstStreamError { match *self { - StreamError::Failed => gst_sys::GST_STREAM_ERROR_FAILED, - StreamError::TooLazy => gst_sys::GST_STREAM_ERROR_TOO_LAZY, - StreamError::NotImplemented => gst_sys::GST_STREAM_ERROR_NOT_IMPLEMENTED, - StreamError::TypeNotFound => gst_sys::GST_STREAM_ERROR_TYPE_NOT_FOUND, - StreamError::WrongType => gst_sys::GST_STREAM_ERROR_WRONG_TYPE, - StreamError::CodecNotFound => gst_sys::GST_STREAM_ERROR_CODEC_NOT_FOUND, - StreamError::Decode => gst_sys::GST_STREAM_ERROR_DECODE, - StreamError::Encode => gst_sys::GST_STREAM_ERROR_ENCODE, - StreamError::Demux => gst_sys::GST_STREAM_ERROR_DEMUX, - StreamError::Mux => gst_sys::GST_STREAM_ERROR_MUX, - StreamError::Format => gst_sys::GST_STREAM_ERROR_FORMAT, - StreamError::Decrypt => gst_sys::GST_STREAM_ERROR_DECRYPT, - StreamError::DecryptNokey => gst_sys::GST_STREAM_ERROR_DECRYPT_NOKEY, - StreamError::NumErrors => gst_sys::GST_STREAM_ERROR_NUM_ERRORS, + StreamError::Failed => ffi::GST_STREAM_ERROR_FAILED, + StreamError::TooLazy => ffi::GST_STREAM_ERROR_TOO_LAZY, + StreamError::NotImplemented => ffi::GST_STREAM_ERROR_NOT_IMPLEMENTED, + StreamError::TypeNotFound => ffi::GST_STREAM_ERROR_TYPE_NOT_FOUND, + StreamError::WrongType => ffi::GST_STREAM_ERROR_WRONG_TYPE, + StreamError::CodecNotFound => ffi::GST_STREAM_ERROR_CODEC_NOT_FOUND, + StreamError::Decode => ffi::GST_STREAM_ERROR_DECODE, + StreamError::Encode => ffi::GST_STREAM_ERROR_ENCODE, + StreamError::Demux => ffi::GST_STREAM_ERROR_DEMUX, + StreamError::Mux => ffi::GST_STREAM_ERROR_MUX, + StreamError::Format => ffi::GST_STREAM_ERROR_FORMAT, + StreamError::Decrypt => ffi::GST_STREAM_ERROR_DECRYPT, + StreamError::DecryptNokey => ffi::GST_STREAM_ERROR_DECRYPT_NOKEY, + StreamError::NumErrors => ffi::GST_STREAM_ERROR_NUM_ERRORS, StreamError::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for StreamError { - fn from_glib(value: gst_sys::GstStreamError) -> Self { +impl FromGlib for StreamError { + fn from_glib(value: ffi::GstStreamError) -> Self { skip_assert_initialized!(); match value { 1 => StreamError::Failed, @@ -2303,7 +2301,7 @@ impl ErrorDomain for StreamError { fn domain() -> Quark { skip_assert_initialized!(); - unsafe { from_glib(gst_sys::gst_stream_error_quark()) } + unsafe { from_glib(ffi::gst_stream_error_quark()) } } fn code(self) -> i32 { @@ -2334,7 +2332,7 @@ impl ErrorDomain for StreamError { impl StaticType for StreamError { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_stream_error_get_type()) } + unsafe { from_glib(ffi::gst_stream_error_get_type()) } } } @@ -2346,13 +2344,13 @@ impl<'a> FromValueOptional<'a> for StreamError { impl<'a> FromValue<'a> for StreamError { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for StreamError { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -2372,25 +2370,25 @@ pub enum StreamStatusType { #[doc(hidden)] impl ToGlib for StreamStatusType { - type GlibType = gst_sys::GstStreamStatusType; + type GlibType = ffi::GstStreamStatusType; - fn to_glib(&self) -> gst_sys::GstStreamStatusType { + fn to_glib(&self) -> ffi::GstStreamStatusType { match *self { - StreamStatusType::Create => gst_sys::GST_STREAM_STATUS_TYPE_CREATE, - StreamStatusType::Enter => gst_sys::GST_STREAM_STATUS_TYPE_ENTER, - StreamStatusType::Leave => gst_sys::GST_STREAM_STATUS_TYPE_LEAVE, - StreamStatusType::Destroy => gst_sys::GST_STREAM_STATUS_TYPE_DESTROY, - StreamStatusType::Start => gst_sys::GST_STREAM_STATUS_TYPE_START, - StreamStatusType::Pause => gst_sys::GST_STREAM_STATUS_TYPE_PAUSE, - StreamStatusType::Stop => gst_sys::GST_STREAM_STATUS_TYPE_STOP, + StreamStatusType::Create => ffi::GST_STREAM_STATUS_TYPE_CREATE, + StreamStatusType::Enter => ffi::GST_STREAM_STATUS_TYPE_ENTER, + StreamStatusType::Leave => ffi::GST_STREAM_STATUS_TYPE_LEAVE, + StreamStatusType::Destroy => ffi::GST_STREAM_STATUS_TYPE_DESTROY, + StreamStatusType::Start => ffi::GST_STREAM_STATUS_TYPE_START, + StreamStatusType::Pause => ffi::GST_STREAM_STATUS_TYPE_PAUSE, + StreamStatusType::Stop => ffi::GST_STREAM_STATUS_TYPE_STOP, StreamStatusType::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for StreamStatusType { - fn from_glib(value: gst_sys::GstStreamStatusType) -> Self { +impl FromGlib for StreamStatusType { + fn from_glib(value: ffi::GstStreamStatusType) -> Self { skip_assert_initialized!(); match value { 0 => StreamStatusType::Create, @@ -2407,7 +2405,7 @@ impl FromGlib for StreamStatusType { impl StaticType for StreamStatusType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_stream_status_type_get_type()) } + unsafe { from_glib(ffi::gst_stream_status_type_get_type()) } } } @@ -2419,13 +2417,13 @@ impl<'a> FromValueOptional<'a> for StreamStatusType { impl<'a> FromValue<'a> for StreamStatusType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for StreamStatusType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -2440,20 +2438,20 @@ pub enum StructureChangeType { #[doc(hidden)] impl ToGlib for StructureChangeType { - type GlibType = gst_sys::GstStructureChangeType; + type GlibType = ffi::GstStructureChangeType; - fn to_glib(&self) -> gst_sys::GstStructureChangeType { + fn to_glib(&self) -> ffi::GstStructureChangeType { match *self { - StructureChangeType::Link => gst_sys::GST_STRUCTURE_CHANGE_TYPE_PAD_LINK, - StructureChangeType::Unlink => gst_sys::GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK, + StructureChangeType::Link => ffi::GST_STRUCTURE_CHANGE_TYPE_PAD_LINK, + StructureChangeType::Unlink => ffi::GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK, StructureChangeType::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for StructureChangeType { - fn from_glib(value: gst_sys::GstStructureChangeType) -> Self { +impl FromGlib for StructureChangeType { + fn from_glib(value: ffi::GstStructureChangeType) -> Self { skip_assert_initialized!(); match value { 0 => StructureChangeType::Link, @@ -2465,7 +2463,7 @@ impl FromGlib for StructureChangeType { impl StaticType for StructureChangeType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_structure_change_type_get_type()) } + unsafe { from_glib(ffi::gst_structure_change_type_get_type()) } } } @@ -2477,13 +2475,13 @@ impl<'a> FromValueOptional<'a> for StructureChangeType { impl<'a> FromValue<'a> for StructureChangeType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for StructureChangeType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -2501,23 +2499,23 @@ pub enum TagFlag { #[doc(hidden)] impl ToGlib for TagFlag { - type GlibType = gst_sys::GstTagFlag; + type GlibType = ffi::GstTagFlag; - fn to_glib(&self) -> gst_sys::GstTagFlag { + fn to_glib(&self) -> ffi::GstTagFlag { match *self { - TagFlag::Undefined => gst_sys::GST_TAG_FLAG_UNDEFINED, - TagFlag::Meta => gst_sys::GST_TAG_FLAG_META, - TagFlag::Encoded => gst_sys::GST_TAG_FLAG_ENCODED, - TagFlag::Decoded => gst_sys::GST_TAG_FLAG_DECODED, - TagFlag::Count => gst_sys::GST_TAG_FLAG_COUNT, + TagFlag::Undefined => ffi::GST_TAG_FLAG_UNDEFINED, + TagFlag::Meta => ffi::GST_TAG_FLAG_META, + TagFlag::Encoded => ffi::GST_TAG_FLAG_ENCODED, + TagFlag::Decoded => ffi::GST_TAG_FLAG_DECODED, + TagFlag::Count => ffi::GST_TAG_FLAG_COUNT, TagFlag::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for TagFlag { - fn from_glib(value: gst_sys::GstTagFlag) -> Self { +impl FromGlib for TagFlag { + fn from_glib(value: ffi::GstTagFlag) -> Self { skip_assert_initialized!(); match value { 0 => TagFlag::Undefined, @@ -2532,7 +2530,7 @@ impl FromGlib for TagFlag { impl StaticType for TagFlag { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_tag_flag_get_type()) } + unsafe { from_glib(ffi::gst_tag_flag_get_type()) } } } @@ -2544,13 +2542,13 @@ impl<'a> FromValueOptional<'a> for TagFlag { impl<'a> FromValue<'a> for TagFlag { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for TagFlag { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -2571,26 +2569,26 @@ pub enum TagMergeMode { #[doc(hidden)] impl ToGlib for TagMergeMode { - type GlibType = gst_sys::GstTagMergeMode; + type GlibType = ffi::GstTagMergeMode; - fn to_glib(&self) -> gst_sys::GstTagMergeMode { + fn to_glib(&self) -> ffi::GstTagMergeMode { match *self { - TagMergeMode::Undefined => gst_sys::GST_TAG_MERGE_UNDEFINED, - TagMergeMode::ReplaceAll => gst_sys::GST_TAG_MERGE_REPLACE_ALL, - TagMergeMode::Replace => gst_sys::GST_TAG_MERGE_REPLACE, - TagMergeMode::Append => gst_sys::GST_TAG_MERGE_APPEND, - TagMergeMode::Prepend => gst_sys::GST_TAG_MERGE_PREPEND, - TagMergeMode::Keep => gst_sys::GST_TAG_MERGE_KEEP, - TagMergeMode::KeepAll => gst_sys::GST_TAG_MERGE_KEEP_ALL, - TagMergeMode::Count => gst_sys::GST_TAG_MERGE_COUNT, + TagMergeMode::Undefined => ffi::GST_TAG_MERGE_UNDEFINED, + TagMergeMode::ReplaceAll => ffi::GST_TAG_MERGE_REPLACE_ALL, + TagMergeMode::Replace => ffi::GST_TAG_MERGE_REPLACE, + TagMergeMode::Append => ffi::GST_TAG_MERGE_APPEND, + TagMergeMode::Prepend => ffi::GST_TAG_MERGE_PREPEND, + TagMergeMode::Keep => ffi::GST_TAG_MERGE_KEEP, + TagMergeMode::KeepAll => ffi::GST_TAG_MERGE_KEEP_ALL, + TagMergeMode::Count => ffi::GST_TAG_MERGE_COUNT, TagMergeMode::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for TagMergeMode { - fn from_glib(value: gst_sys::GstTagMergeMode) -> Self { +impl FromGlib for TagMergeMode { + fn from_glib(value: ffi::GstTagMergeMode) -> Self { skip_assert_initialized!(); match value { 0 => TagMergeMode::Undefined, @@ -2608,7 +2606,7 @@ impl FromGlib for TagMergeMode { impl StaticType for TagMergeMode { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_tag_merge_mode_get_type()) } + unsafe { from_glib(ffi::gst_tag_merge_mode_get_type()) } } } @@ -2620,17 +2618,17 @@ impl<'a> FromValueOptional<'a> for TagMergeMode { impl<'a> FromValue<'a> for TagMergeMode { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for TagMergeMode { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } -#[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)] #[non_exhaustive] pub enum TagScope { @@ -2642,20 +2640,20 @@ pub enum TagScope { #[doc(hidden)] impl ToGlib for TagScope { - type GlibType = gst_sys::GstTagScope; + type GlibType = ffi::GstTagScope; - fn to_glib(&self) -> gst_sys::GstTagScope { + fn to_glib(&self) -> ffi::GstTagScope { match *self { - TagScope::Stream => gst_sys::GST_TAG_SCOPE_STREAM, - TagScope::Global => gst_sys::GST_TAG_SCOPE_GLOBAL, + TagScope::Stream => ffi::GST_TAG_SCOPE_STREAM, + TagScope::Global => ffi::GST_TAG_SCOPE_GLOBAL, TagScope::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for TagScope { - fn from_glib(value: gst_sys::GstTagScope) -> Self { +impl FromGlib for TagScope { + fn from_glib(value: ffi::GstTagScope) -> Self { skip_assert_initialized!(); match value { 0 => TagScope::Stream, @@ -2667,7 +2665,7 @@ impl FromGlib for TagScope { impl StaticType for TagScope { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_tag_scope_get_type()) } + unsafe { from_glib(ffi::gst_tag_scope_get_type()) } } } @@ -2679,13 +2677,13 @@ impl<'a> FromValueOptional<'a> for TagScope { impl<'a> FromValue<'a> for TagScope { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for TagScope { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -2701,21 +2699,21 @@ pub enum TaskState { #[doc(hidden)] impl ToGlib for TaskState { - type GlibType = gst_sys::GstTaskState; + type GlibType = ffi::GstTaskState; - fn to_glib(&self) -> gst_sys::GstTaskState { + fn to_glib(&self) -> ffi::GstTaskState { match *self { - TaskState::Started => gst_sys::GST_TASK_STARTED, - TaskState::Stopped => gst_sys::GST_TASK_STOPPED, - TaskState::Paused => gst_sys::GST_TASK_PAUSED, + TaskState::Started => ffi::GST_TASK_STARTED, + TaskState::Stopped => ffi::GST_TASK_STOPPED, + TaskState::Paused => ffi::GST_TASK_PAUSED, TaskState::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for TaskState { - fn from_glib(value: gst_sys::GstTaskState) -> Self { +impl FromGlib for TaskState { + fn from_glib(value: ffi::GstTaskState) -> Self { skip_assert_initialized!(); match value { 0 => TaskState::Started, @@ -2728,7 +2726,7 @@ impl FromGlib for TaskState { impl StaticType for TaskState { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_task_state_get_type()) } + unsafe { from_glib(ffi::gst_task_state_get_type()) } } } @@ -2740,17 +2738,17 @@ impl<'a> FromValueOptional<'a> for TaskState { impl<'a> FromValue<'a> for TaskState { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for TaskState { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } -#[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)] #[non_exhaustive] pub enum TocEntryType { @@ -2767,25 +2765,25 @@ pub enum TocEntryType { #[doc(hidden)] impl ToGlib for TocEntryType { - type GlibType = gst_sys::GstTocEntryType; + type GlibType = ffi::GstTocEntryType; - fn to_glib(&self) -> gst_sys::GstTocEntryType { + fn to_glib(&self) -> ffi::GstTocEntryType { match *self { - TocEntryType::Angle => gst_sys::GST_TOC_ENTRY_TYPE_ANGLE, - TocEntryType::Version => gst_sys::GST_TOC_ENTRY_TYPE_VERSION, - TocEntryType::Edition => gst_sys::GST_TOC_ENTRY_TYPE_EDITION, - TocEntryType::Invalid => gst_sys::GST_TOC_ENTRY_TYPE_INVALID, - TocEntryType::Title => gst_sys::GST_TOC_ENTRY_TYPE_TITLE, - TocEntryType::Track => gst_sys::GST_TOC_ENTRY_TYPE_TRACK, - TocEntryType::Chapter => gst_sys::GST_TOC_ENTRY_TYPE_CHAPTER, + TocEntryType::Angle => ffi::GST_TOC_ENTRY_TYPE_ANGLE, + TocEntryType::Version => ffi::GST_TOC_ENTRY_TYPE_VERSION, + TocEntryType::Edition => ffi::GST_TOC_ENTRY_TYPE_EDITION, + TocEntryType::Invalid => ffi::GST_TOC_ENTRY_TYPE_INVALID, + TocEntryType::Title => ffi::GST_TOC_ENTRY_TYPE_TITLE, + TocEntryType::Track => ffi::GST_TOC_ENTRY_TYPE_TRACK, + TocEntryType::Chapter => ffi::GST_TOC_ENTRY_TYPE_CHAPTER, TocEntryType::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for TocEntryType { - fn from_glib(value: gst_sys::GstTocEntryType) -> Self { +impl FromGlib for TocEntryType { + fn from_glib(value: ffi::GstTocEntryType) -> Self { skip_assert_initialized!(); match value { -3 => TocEntryType::Angle, @@ -2802,7 +2800,7 @@ impl FromGlib for TocEntryType { impl StaticType for TocEntryType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_toc_entry_type_get_type()) } + unsafe { from_glib(ffi::gst_toc_entry_type_get_type()) } } } @@ -2814,17 +2812,17 @@ impl<'a> FromValueOptional<'a> for TocEntryType { impl<'a> FromValue<'a> for TocEntryType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for TocEntryType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } -#[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)] #[non_exhaustive] pub enum TocLoopType { @@ -2838,22 +2836,22 @@ pub enum TocLoopType { #[doc(hidden)] impl ToGlib for TocLoopType { - type GlibType = gst_sys::GstTocLoopType; + type GlibType = ffi::GstTocLoopType; - fn to_glib(&self) -> gst_sys::GstTocLoopType { + fn to_glib(&self) -> ffi::GstTocLoopType { match *self { - TocLoopType::None => gst_sys::GST_TOC_LOOP_NONE, - TocLoopType::Forward => gst_sys::GST_TOC_LOOP_FORWARD, - TocLoopType::Reverse => gst_sys::GST_TOC_LOOP_REVERSE, - TocLoopType::PingPong => gst_sys::GST_TOC_LOOP_PING_PONG, + TocLoopType::None => ffi::GST_TOC_LOOP_NONE, + TocLoopType::Forward => ffi::GST_TOC_LOOP_FORWARD, + TocLoopType::Reverse => ffi::GST_TOC_LOOP_REVERSE, + TocLoopType::PingPong => ffi::GST_TOC_LOOP_PING_PONG, TocLoopType::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for TocLoopType { - fn from_glib(value: gst_sys::GstTocLoopType) -> Self { +impl FromGlib for TocLoopType { + fn from_glib(value: ffi::GstTocLoopType) -> Self { skip_assert_initialized!(); match value { 0 => TocLoopType::None, @@ -2867,7 +2865,7 @@ impl FromGlib for TocLoopType { impl StaticType for TocLoopType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_toc_loop_type_get_type()) } + unsafe { from_glib(ffi::gst_toc_loop_type_get_type()) } } } @@ -2879,17 +2877,17 @@ impl<'a> FromValueOptional<'a> for TocLoopType { impl<'a> FromValue<'a> for TocLoopType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for TocLoopType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } -#[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)] #[non_exhaustive] pub enum TocScope { @@ -2901,20 +2899,20 @@ pub enum TocScope { #[doc(hidden)] impl ToGlib for TocScope { - type GlibType = gst_sys::GstTocScope; + type GlibType = ffi::GstTocScope; - fn to_glib(&self) -> gst_sys::GstTocScope { + fn to_glib(&self) -> ffi::GstTocScope { match *self { - TocScope::Global => gst_sys::GST_TOC_SCOPE_GLOBAL, - TocScope::Current => gst_sys::GST_TOC_SCOPE_CURRENT, + TocScope::Global => ffi::GST_TOC_SCOPE_GLOBAL, + TocScope::Current => ffi::GST_TOC_SCOPE_CURRENT, TocScope::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for TocScope { - fn from_glib(value: gst_sys::GstTocScope) -> Self { +impl FromGlib for TocScope { + fn from_glib(value: ffi::GstTocScope) -> Self { skip_assert_initialized!(); match value { 1 => TocScope::Global, @@ -2926,7 +2924,7 @@ impl FromGlib for TocScope { impl StaticType for TocScope { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_toc_scope_get_type()) } + unsafe { from_glib(ffi::gst_toc_scope_get_type()) } } } @@ -2938,13 +2936,13 @@ impl<'a> FromValueOptional<'a> for TocScope { impl<'a> FromValue<'a> for TocScope { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for TocScope { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -2963,24 +2961,24 @@ pub enum TypeFindProbability { #[doc(hidden)] impl ToGlib for TypeFindProbability { - type GlibType = gst_sys::GstTypeFindProbability; + type GlibType = ffi::GstTypeFindProbability; - fn to_glib(&self) -> gst_sys::GstTypeFindProbability { + fn to_glib(&self) -> ffi::GstTypeFindProbability { match *self { - TypeFindProbability::None => gst_sys::GST_TYPE_FIND_NONE, - TypeFindProbability::Minimum => gst_sys::GST_TYPE_FIND_MINIMUM, - TypeFindProbability::Possible => gst_sys::GST_TYPE_FIND_POSSIBLE, - TypeFindProbability::Likely => gst_sys::GST_TYPE_FIND_LIKELY, - TypeFindProbability::NearlyCertain => gst_sys::GST_TYPE_FIND_NEARLY_CERTAIN, - TypeFindProbability::Maximum => gst_sys::GST_TYPE_FIND_MAXIMUM, + TypeFindProbability::None => ffi::GST_TYPE_FIND_NONE, + TypeFindProbability::Minimum => ffi::GST_TYPE_FIND_MINIMUM, + TypeFindProbability::Possible => ffi::GST_TYPE_FIND_POSSIBLE, + TypeFindProbability::Likely => ffi::GST_TYPE_FIND_LIKELY, + TypeFindProbability::NearlyCertain => ffi::GST_TYPE_FIND_NEARLY_CERTAIN, + TypeFindProbability::Maximum => ffi::GST_TYPE_FIND_MAXIMUM, TypeFindProbability::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for TypeFindProbability { - fn from_glib(value: gst_sys::GstTypeFindProbability) -> Self { +impl FromGlib for TypeFindProbability { + fn from_glib(value: ffi::GstTypeFindProbability) -> Self { skip_assert_initialized!(); match value { 0 => TypeFindProbability::None, @@ -2996,7 +2994,7 @@ impl FromGlib for TypeFindProbability { impl StaticType for TypeFindProbability { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_type_find_probability_get_type()) } + unsafe { from_glib(ffi::gst_type_find_probability_get_type()) } } } @@ -3008,13 +3006,13 @@ impl<'a> FromValueOptional<'a> for TypeFindProbability { impl<'a> FromValue<'a> for TypeFindProbability { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for TypeFindProbability { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -3031,22 +3029,22 @@ pub enum URIError { #[doc(hidden)] impl ToGlib for URIError { - type GlibType = gst_sys::GstURIError; + type GlibType = ffi::GstURIError; - fn to_glib(&self) -> gst_sys::GstURIError { + fn to_glib(&self) -> ffi::GstURIError { match *self { - URIError::UnsupportedProtocol => gst_sys::GST_URI_ERROR_UNSUPPORTED_PROTOCOL, - URIError::BadUri => gst_sys::GST_URI_ERROR_BAD_URI, - URIError::BadState => gst_sys::GST_URI_ERROR_BAD_STATE, - URIError::BadReference => gst_sys::GST_URI_ERROR_BAD_REFERENCE, + URIError::UnsupportedProtocol => ffi::GST_URI_ERROR_UNSUPPORTED_PROTOCOL, + URIError::BadUri => ffi::GST_URI_ERROR_BAD_URI, + URIError::BadState => ffi::GST_URI_ERROR_BAD_STATE, + URIError::BadReference => ffi::GST_URI_ERROR_BAD_REFERENCE, URIError::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for URIError { - fn from_glib(value: gst_sys::GstURIError) -> Self { +impl FromGlib for URIError { + fn from_glib(value: ffi::GstURIError) -> Self { skip_assert_initialized!(); match value { 0 => URIError::UnsupportedProtocol, @@ -3062,7 +3060,7 @@ impl ErrorDomain for URIError { fn domain() -> Quark { skip_assert_initialized!(); - unsafe { from_glib(gst_sys::gst_uri_error_quark()) } + unsafe { from_glib(ffi::gst_uri_error_quark()) } } fn code(self) -> i32 { @@ -3083,7 +3081,7 @@ impl ErrorDomain for URIError { impl StaticType for URIError { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_uri_error_get_type()) } + unsafe { from_glib(ffi::gst_uri_error_get_type()) } } } @@ -3095,13 +3093,13 @@ impl<'a> FromValueOptional<'a> for URIError { impl<'a> FromValue<'a> for URIError { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for URIError { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } @@ -3117,21 +3115,21 @@ pub enum URIType { #[doc(hidden)] impl ToGlib for URIType { - type GlibType = gst_sys::GstURIType; + type GlibType = ffi::GstURIType; - fn to_glib(&self) -> gst_sys::GstURIType { + fn to_glib(&self) -> ffi::GstURIType { match *self { - URIType::Unknown => gst_sys::GST_URI_UNKNOWN, - URIType::Sink => gst_sys::GST_URI_SINK, - URIType::Src => gst_sys::GST_URI_SRC, + URIType::Unknown => ffi::GST_URI_UNKNOWN, + URIType::Sink => ffi::GST_URI_SINK, + URIType::Src => ffi::GST_URI_SRC, URIType::__Unknown(value) => value, } } } #[doc(hidden)] -impl FromGlib for URIType { - fn from_glib(value: gst_sys::GstURIType) -> Self { +impl FromGlib for URIType { + fn from_glib(value: ffi::GstURIType) -> Self { skip_assert_initialized!(); match value { 0 => URIType::Unknown, @@ -3144,7 +3142,7 @@ impl FromGlib for URIType { impl StaticType for URIType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_uri_type_get_type()) } + unsafe { from_glib(ffi::gst_uri_type_get_type()) } } } @@ -3156,12 +3154,12 @@ impl<'a> FromValueOptional<'a> for URIType { impl<'a> FromValue<'a> for URIType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_enum(value.to_glib_none().0)) } } impl SetValue for URIType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib()) } } diff --git a/gstreamer/src/auto/flags.rs b/gstreamer/src/auto/flags.rs index 35407f89e..12447a198 100644 --- a/gstreamer/src/auto/flags.rs +++ b/gstreamer/src/auto/flags.rs @@ -2,6 +2,7 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use bitflags::bitflags; use glib::translate::*; use glib::value::FromValue; use glib::value::FromValueOptional; @@ -9,8 +10,6 @@ use glib::value::SetValue; use glib::value::Value; use glib::StaticType; use glib::Type; -use gobject_sys; -use gst_sys; bitflags! { pub struct BinFlags: u32 { @@ -23,16 +22,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for BinFlags { - type GlibType = gst_sys::GstBinFlags; + type GlibType = ffi::GstBinFlags; - fn to_glib(&self) -> gst_sys::GstBinFlags { + fn to_glib(&self) -> ffi::GstBinFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for BinFlags { - fn from_glib(value: gst_sys::GstBinFlags) -> BinFlags { +impl FromGlib for BinFlags { + fn from_glib(value: ffi::GstBinFlags) -> BinFlags { skip_assert_initialized!(); BinFlags::from_bits_truncate(value) } @@ -40,7 +39,7 @@ impl FromGlib for BinFlags { impl StaticType for BinFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_bin_flags_get_type()) } + unsafe { from_glib(ffi::gst_bin_flags_get_type()) } } } @@ -52,13 +51,13 @@ impl<'a> FromValueOptional<'a> for BinFlags { impl<'a> FromValue<'a> for BinFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for BinFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -75,16 +74,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for BufferCopyFlags { - type GlibType = gst_sys::GstBufferCopyFlags; + type GlibType = ffi::GstBufferCopyFlags; - fn to_glib(&self) -> gst_sys::GstBufferCopyFlags { + fn to_glib(&self) -> ffi::GstBufferCopyFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for BufferCopyFlags { - fn from_glib(value: gst_sys::GstBufferCopyFlags) -> BufferCopyFlags { +impl FromGlib for BufferCopyFlags { + fn from_glib(value: ffi::GstBufferCopyFlags) -> BufferCopyFlags { skip_assert_initialized!(); BufferCopyFlags::from_bits_truncate(value) } @@ -92,7 +91,7 @@ impl FromGlib for BufferCopyFlags { impl StaticType for BufferCopyFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_buffer_copy_flags_get_type()) } + unsafe { from_glib(ffi::gst_buffer_copy_flags_get_type()) } } } @@ -104,18 +103,18 @@ impl<'a> FromValueOptional<'a> for BufferCopyFlags { impl<'a> FromValue<'a> for BufferCopyFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for BufferCopyFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } bitflags! { - #[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))] + #[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] pub struct BufferFlags: u32 { const LIVE = 16; const DECODE_ONLY = 32; @@ -137,16 +136,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for BufferFlags { - type GlibType = gst_sys::GstBufferFlags; + type GlibType = ffi::GstBufferFlags; - fn to_glib(&self) -> gst_sys::GstBufferFlags { + fn to_glib(&self) -> ffi::GstBufferFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for BufferFlags { - fn from_glib(value: gst_sys::GstBufferFlags) -> BufferFlags { +impl FromGlib for BufferFlags { + fn from_glib(value: ffi::GstBufferFlags) -> BufferFlags { skip_assert_initialized!(); BufferFlags::from_bits_truncate(value) } @@ -154,7 +153,7 @@ impl FromGlib for BufferFlags { impl StaticType for BufferFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_buffer_flags_get_type()) } + unsafe { from_glib(ffi::gst_buffer_flags_get_type()) } } } @@ -166,13 +165,13 @@ impl<'a> FromValueOptional<'a> for BufferFlags { impl<'a> FromValue<'a> for BufferFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for BufferFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -186,16 +185,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for BufferPoolAcquireFlags { - type GlibType = gst_sys::GstBufferPoolAcquireFlags; + type GlibType = ffi::GstBufferPoolAcquireFlags; - fn to_glib(&self) -> gst_sys::GstBufferPoolAcquireFlags { + fn to_glib(&self) -> ffi::GstBufferPoolAcquireFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for BufferPoolAcquireFlags { - fn from_glib(value: gst_sys::GstBufferPoolAcquireFlags) -> BufferPoolAcquireFlags { +impl FromGlib for BufferPoolAcquireFlags { + fn from_glib(value: ffi::GstBufferPoolAcquireFlags) -> BufferPoolAcquireFlags { skip_assert_initialized!(); BufferPoolAcquireFlags::from_bits_truncate(value) } @@ -203,7 +202,7 @@ impl FromGlib for BufferPoolAcquireFlags { impl StaticType for BufferPoolAcquireFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_buffer_pool_acquire_flags_get_type()) } + unsafe { from_glib(ffi::gst_buffer_pool_acquire_flags_get_type()) } } } @@ -215,13 +214,13 @@ impl<'a> FromValueOptional<'a> for BufferPoolAcquireFlags { impl<'a> FromValue<'a> for BufferPoolAcquireFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for BufferPoolAcquireFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -239,16 +238,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for ClockFlags { - type GlibType = gst_sys::GstClockFlags; + type GlibType = ffi::GstClockFlags; - fn to_glib(&self) -> gst_sys::GstClockFlags { + fn to_glib(&self) -> ffi::GstClockFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for ClockFlags { - fn from_glib(value: gst_sys::GstClockFlags) -> ClockFlags { +impl FromGlib for ClockFlags { + fn from_glib(value: ffi::GstClockFlags) -> ClockFlags { skip_assert_initialized!(); ClockFlags::from_bits_truncate(value) } @@ -256,7 +255,7 @@ impl FromGlib for ClockFlags { impl StaticType for ClockFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_clock_flags_get_type()) } + unsafe { from_glib(ffi::gst_clock_flags_get_type()) } } } @@ -268,13 +267,13 @@ impl<'a> FromValueOptional<'a> for ClockFlags { impl<'a> FromValue<'a> for ClockFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for ClockFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -303,16 +302,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for DebugColorFlags { - type GlibType = gst_sys::GstDebugColorFlags; + type GlibType = ffi::GstDebugColorFlags; - fn to_glib(&self) -> gst_sys::GstDebugColorFlags { + fn to_glib(&self) -> ffi::GstDebugColorFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for DebugColorFlags { - fn from_glib(value: gst_sys::GstDebugColorFlags) -> DebugColorFlags { +impl FromGlib for DebugColorFlags { + fn from_glib(value: ffi::GstDebugColorFlags) -> DebugColorFlags { skip_assert_initialized!(); DebugColorFlags::from_bits_truncate(value) } @@ -320,7 +319,7 @@ impl FromGlib for DebugColorFlags { impl StaticType for DebugColorFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_debug_color_flags_get_type()) } + unsafe { from_glib(ffi::gst_debug_color_flags_get_type()) } } } @@ -332,13 +331,13 @@ impl<'a> FromValueOptional<'a> for DebugColorFlags { impl<'a> FromValue<'a> for DebugColorFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for DebugColorFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -356,16 +355,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for DebugGraphDetails { - type GlibType = gst_sys::GstDebugGraphDetails; + type GlibType = ffi::GstDebugGraphDetails; - fn to_glib(&self) -> gst_sys::GstDebugGraphDetails { + fn to_glib(&self) -> ffi::GstDebugGraphDetails { self.bits() } } #[doc(hidden)] -impl FromGlib for DebugGraphDetails { - fn from_glib(value: gst_sys::GstDebugGraphDetails) -> DebugGraphDetails { +impl FromGlib for DebugGraphDetails { + fn from_glib(value: ffi::GstDebugGraphDetails) -> DebugGraphDetails { skip_assert_initialized!(); DebugGraphDetails::from_bits_truncate(value) } @@ -373,7 +372,7 @@ impl FromGlib for DebugGraphDetails { impl StaticType for DebugGraphDetails { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_debug_graph_details_get_type()) } + unsafe { from_glib(ffi::gst_debug_graph_details_get_type()) } } } @@ -385,13 +384,13 @@ impl<'a> FromValueOptional<'a> for DebugGraphDetails { impl<'a> FromValue<'a> for DebugGraphDetails { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for DebugGraphDetails { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -408,16 +407,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for ElementFlags { - type GlibType = gst_sys::GstElementFlags; + type GlibType = ffi::GstElementFlags; - fn to_glib(&self) -> gst_sys::GstElementFlags { + fn to_glib(&self) -> ffi::GstElementFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for ElementFlags { - fn from_glib(value: gst_sys::GstElementFlags) -> ElementFlags { +impl FromGlib for ElementFlags { + fn from_glib(value: ffi::GstElementFlags) -> ElementFlags { skip_assert_initialized!(); ElementFlags::from_bits_truncate(value) } @@ -425,7 +424,7 @@ impl FromGlib for ElementFlags { impl StaticType for ElementFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_element_flags_get_type()) } + unsafe { from_glib(ffi::gst_element_flags_get_type()) } } } @@ -437,13 +436,13 @@ impl<'a> FromValueOptional<'a> for ElementFlags { impl<'a> FromValue<'a> for ElementFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for ElementFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -460,16 +459,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for MemoryFlags { - type GlibType = gst_sys::GstMemoryFlags; + type GlibType = ffi::GstMemoryFlags; - fn to_glib(&self) -> gst_sys::GstMemoryFlags { + fn to_glib(&self) -> ffi::GstMemoryFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for MemoryFlags { - fn from_glib(value: gst_sys::GstMemoryFlags) -> MemoryFlags { +impl FromGlib for MemoryFlags { + fn from_glib(value: ffi::GstMemoryFlags) -> MemoryFlags { skip_assert_initialized!(); MemoryFlags::from_bits_truncate(value) } @@ -477,7 +476,7 @@ impl FromGlib for MemoryFlags { impl StaticType for MemoryFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_memory_flags_get_type()) } + unsafe { from_glib(ffi::gst_memory_flags_get_type()) } } } @@ -489,13 +488,13 @@ impl<'a> FromValueOptional<'a> for MemoryFlags { impl<'a> FromValue<'a> for MemoryFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for MemoryFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -509,16 +508,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for ObjectFlags { - type GlibType = gst_sys::GstObjectFlags; + type GlibType = ffi::GstObjectFlags; - fn to_glib(&self) -> gst_sys::GstObjectFlags { + fn to_glib(&self) -> ffi::GstObjectFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for ObjectFlags { - fn from_glib(value: gst_sys::GstObjectFlags) -> ObjectFlags { +impl FromGlib for ObjectFlags { + fn from_glib(value: ffi::GstObjectFlags) -> ObjectFlags { skip_assert_initialized!(); ObjectFlags::from_bits_truncate(value) } @@ -526,7 +525,7 @@ impl FromGlib for ObjectFlags { impl StaticType for ObjectFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_object_flags_get_type()) } + unsafe { from_glib(ffi::gst_object_flags_get_type()) } } } @@ -538,13 +537,13 @@ impl<'a> FromValueOptional<'a> for ObjectFlags { impl<'a> FromValue<'a> for ObjectFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for ObjectFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -568,16 +567,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for PadFlags { - type GlibType = gst_sys::GstPadFlags; + type GlibType = ffi::GstPadFlags; - fn to_glib(&self) -> gst_sys::GstPadFlags { + fn to_glib(&self) -> ffi::GstPadFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for PadFlags { - fn from_glib(value: gst_sys::GstPadFlags) -> PadFlags { +impl FromGlib for PadFlags { + fn from_glib(value: ffi::GstPadFlags) -> PadFlags { skip_assert_initialized!(); PadFlags::from_bits_truncate(value) } @@ -585,7 +584,7 @@ impl FromGlib for PadFlags { impl StaticType for PadFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_pad_flags_get_type()) } + unsafe { from_glib(ffi::gst_pad_flags_get_type()) } } } @@ -597,13 +596,13 @@ impl<'a> FromValueOptional<'a> for PadFlags { impl<'a> FromValue<'a> for PadFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for PadFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -619,16 +618,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for PadLinkCheck { - type GlibType = gst_sys::GstPadLinkCheck; + type GlibType = ffi::GstPadLinkCheck; - fn to_glib(&self) -> gst_sys::GstPadLinkCheck { + fn to_glib(&self) -> ffi::GstPadLinkCheck { self.bits() } } #[doc(hidden)] -impl FromGlib for PadLinkCheck { - fn from_glib(value: gst_sys::GstPadLinkCheck) -> PadLinkCheck { +impl FromGlib for PadLinkCheck { + fn from_glib(value: ffi::GstPadLinkCheck) -> PadLinkCheck { skip_assert_initialized!(); PadLinkCheck::from_bits_truncate(value) } @@ -636,7 +635,7 @@ impl FromGlib for PadLinkCheck { impl StaticType for PadLinkCheck { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_pad_link_check_get_type()) } + unsafe { from_glib(ffi::gst_pad_link_check_get_type()) } } } @@ -648,13 +647,13 @@ impl<'a> FromValueOptional<'a> for PadLinkCheck { impl<'a> FromValue<'a> for PadLinkCheck { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for PadLinkCheck { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -686,16 +685,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for PadProbeType { - type GlibType = gst_sys::GstPadProbeType; + type GlibType = ffi::GstPadProbeType; - fn to_glib(&self) -> gst_sys::GstPadProbeType { + fn to_glib(&self) -> ffi::GstPadProbeType { self.bits() } } #[doc(hidden)] -impl FromGlib for PadProbeType { - fn from_glib(value: gst_sys::GstPadProbeType) -> PadProbeType { +impl FromGlib for PadProbeType { + fn from_glib(value: ffi::GstPadProbeType) -> PadProbeType { skip_assert_initialized!(); PadProbeType::from_bits_truncate(value) } @@ -703,7 +702,7 @@ impl FromGlib for PadProbeType { impl StaticType for PadProbeType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_pad_probe_type_get_type()) } + unsafe { from_glib(ffi::gst_pad_probe_type_get_type()) } } } @@ -715,13 +714,13 @@ impl<'a> FromValueOptional<'a> for PadProbeType { impl<'a> FromValue<'a> for PadProbeType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for PadProbeType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -737,16 +736,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for ParseFlags { - type GlibType = gst_sys::GstParseFlags; + type GlibType = ffi::GstParseFlags; - fn to_glib(&self) -> gst_sys::GstParseFlags { + fn to_glib(&self) -> ffi::GstParseFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for ParseFlags { - fn from_glib(value: gst_sys::GstParseFlags) -> ParseFlags { +impl FromGlib for ParseFlags { + fn from_glib(value: ffi::GstParseFlags) -> ParseFlags { skip_assert_initialized!(); ParseFlags::from_bits_truncate(value) } @@ -754,7 +753,7 @@ impl FromGlib for ParseFlags { impl StaticType for ParseFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_parse_flags_get_type()) } + unsafe { from_glib(ffi::gst_parse_flags_get_type()) } } } @@ -766,13 +765,13 @@ impl<'a> FromValueOptional<'a> for ParseFlags { impl<'a> FromValue<'a> for ParseFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for ParseFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -784,16 +783,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for PipelineFlags { - type GlibType = gst_sys::GstPipelineFlags; + type GlibType = ffi::GstPipelineFlags; - fn to_glib(&self) -> gst_sys::GstPipelineFlags { + fn to_glib(&self) -> ffi::GstPipelineFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for PipelineFlags { - fn from_glib(value: gst_sys::GstPipelineFlags) -> PipelineFlags { +impl FromGlib for PipelineFlags { + fn from_glib(value: ffi::GstPipelineFlags) -> PipelineFlags { skip_assert_initialized!(); PipelineFlags::from_bits_truncate(value) } @@ -801,7 +800,7 @@ impl FromGlib for PipelineFlags { impl StaticType for PipelineFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_pipeline_flags_get_type()) } + unsafe { from_glib(ffi::gst_pipeline_flags_get_type()) } } } @@ -813,13 +812,13 @@ impl<'a> FromValueOptional<'a> for PipelineFlags { impl<'a> FromValue<'a> for PipelineFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for PipelineFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -835,9 +834,9 @@ bitflags! { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(hidden)] impl ToGlib for PluginAPIFlags { - type GlibType = gst_sys::GstPluginAPIFlags; + type GlibType = ffi::GstPluginAPIFlags; - fn to_glib(&self) -> gst_sys::GstPluginAPIFlags { + fn to_glib(&self) -> ffi::GstPluginAPIFlags { self.bits() } } @@ -845,8 +844,8 @@ impl ToGlib for PluginAPIFlags { #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(hidden)] -impl FromGlib for PluginAPIFlags { - fn from_glib(value: gst_sys::GstPluginAPIFlags) -> PluginAPIFlags { +impl FromGlib for PluginAPIFlags { + fn from_glib(value: ffi::GstPluginAPIFlags) -> PluginAPIFlags { skip_assert_initialized!(); PluginAPIFlags::from_bits_truncate(value) } @@ -856,7 +855,7 @@ impl FromGlib for PluginAPIFlags { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] impl StaticType for PluginAPIFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_plugin_api_flags_get_type()) } + unsafe { from_glib(ffi::gst_plugin_api_flags_get_type()) } } } @@ -872,7 +871,7 @@ impl<'a> FromValueOptional<'a> for PluginAPIFlags { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] impl<'a> FromValue<'a> for PluginAPIFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } @@ -880,7 +879,7 @@ impl<'a> FromValue<'a> for PluginAPIFlags { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] impl SetValue for PluginAPIFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -896,16 +895,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for PluginDependencyFlags { - type GlibType = gst_sys::GstPluginDependencyFlags; + type GlibType = ffi::GstPluginDependencyFlags; - fn to_glib(&self) -> gst_sys::GstPluginDependencyFlags { + fn to_glib(&self) -> ffi::GstPluginDependencyFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for PluginDependencyFlags { - fn from_glib(value: gst_sys::GstPluginDependencyFlags) -> PluginDependencyFlags { +impl FromGlib for PluginDependencyFlags { + fn from_glib(value: ffi::GstPluginDependencyFlags) -> PluginDependencyFlags { skip_assert_initialized!(); PluginDependencyFlags::from_bits_truncate(value) } @@ -913,7 +912,7 @@ impl FromGlib for PluginDependencyFlags { impl StaticType for PluginDependencyFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_plugin_dependency_flags_get_type()) } + unsafe { from_glib(ffi::gst_plugin_dependency_flags_get_type()) } } } @@ -925,13 +924,13 @@ impl<'a> FromValueOptional<'a> for PluginDependencyFlags { impl<'a> FromValue<'a> for PluginDependencyFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for PluginDependencyFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -944,16 +943,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for PluginFlags { - type GlibType = gst_sys::GstPluginFlags; + type GlibType = ffi::GstPluginFlags; - fn to_glib(&self) -> gst_sys::GstPluginFlags { + fn to_glib(&self) -> ffi::GstPluginFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for PluginFlags { - fn from_glib(value: gst_sys::GstPluginFlags) -> PluginFlags { +impl FromGlib for PluginFlags { + fn from_glib(value: ffi::GstPluginFlags) -> PluginFlags { skip_assert_initialized!(); PluginFlags::from_bits_truncate(value) } @@ -961,7 +960,7 @@ impl FromGlib for PluginFlags { impl StaticType for PluginFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_plugin_flags_get_type()) } + unsafe { from_glib(ffi::gst_plugin_flags_get_type()) } } } @@ -973,13 +972,13 @@ impl<'a> FromValueOptional<'a> for PluginFlags { impl<'a> FromValue<'a> for PluginFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for PluginFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -993,16 +992,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for SchedulingFlags { - type GlibType = gst_sys::GstSchedulingFlags; + type GlibType = ffi::GstSchedulingFlags; - fn to_glib(&self) -> gst_sys::GstSchedulingFlags { + fn to_glib(&self) -> ffi::GstSchedulingFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for SchedulingFlags { - fn from_glib(value: gst_sys::GstSchedulingFlags) -> SchedulingFlags { +impl FromGlib for SchedulingFlags { + fn from_glib(value: ffi::GstSchedulingFlags) -> SchedulingFlags { skip_assert_initialized!(); SchedulingFlags::from_bits_truncate(value) } @@ -1010,7 +1009,7 @@ impl FromGlib for SchedulingFlags { impl StaticType for SchedulingFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_scheduling_flags_get_type()) } + unsafe { from_glib(ffi::gst_scheduling_flags_get_type()) } } } @@ -1022,13 +1021,13 @@ impl<'a> FromValueOptional<'a> for SchedulingFlags { impl<'a> FromValue<'a> for SchedulingFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for SchedulingFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1056,16 +1055,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for SeekFlags { - type GlibType = gst_sys::GstSeekFlags; + type GlibType = ffi::GstSeekFlags; - fn to_glib(&self) -> gst_sys::GstSeekFlags { + fn to_glib(&self) -> ffi::GstSeekFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for SeekFlags { - fn from_glib(value: gst_sys::GstSeekFlags) -> SeekFlags { +impl FromGlib for SeekFlags { + fn from_glib(value: ffi::GstSeekFlags) -> SeekFlags { skip_assert_initialized!(); SeekFlags::from_bits_truncate(value) } @@ -1073,7 +1072,7 @@ impl FromGlib for SeekFlags { impl StaticType for SeekFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_seek_flags_get_type()) } + unsafe { from_glib(ffi::gst_seek_flags_get_type()) } } } @@ -1085,18 +1084,18 @@ impl<'a> FromValueOptional<'a> for SeekFlags { impl<'a> FromValue<'a> for SeekFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for SeekFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } bitflags! { - #[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))] + #[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] pub struct SegmentFlags: u32 { const RESET = 1; const TRICKMODE = 16; @@ -1112,16 +1111,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for SegmentFlags { - type GlibType = gst_sys::GstSegmentFlags; + type GlibType = ffi::GstSegmentFlags; - fn to_glib(&self) -> gst_sys::GstSegmentFlags { + fn to_glib(&self) -> ffi::GstSegmentFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for SegmentFlags { - fn from_glib(value: gst_sys::GstSegmentFlags) -> SegmentFlags { +impl FromGlib for SegmentFlags { + fn from_glib(value: ffi::GstSegmentFlags) -> SegmentFlags { skip_assert_initialized!(); SegmentFlags::from_bits_truncate(value) } @@ -1129,7 +1128,7 @@ impl FromGlib for SegmentFlags { impl StaticType for SegmentFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_segment_flags_get_type()) } + unsafe { from_glib(ffi::gst_segment_flags_get_type()) } } } @@ -1141,13 +1140,13 @@ impl<'a> FromValueOptional<'a> for SegmentFlags { impl<'a> FromValue<'a> for SegmentFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for SegmentFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1163,9 +1162,9 @@ bitflags! { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] #[doc(hidden)] impl ToGlib for StackTraceFlags { - type GlibType = gst_sys::GstStackTraceFlags; + type GlibType = ffi::GstStackTraceFlags; - fn to_glib(&self) -> gst_sys::GstStackTraceFlags { + fn to_glib(&self) -> ffi::GstStackTraceFlags { self.bits() } } @@ -1173,8 +1172,8 @@ impl ToGlib for StackTraceFlags { #[cfg(any(feature = "v1_12", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] #[doc(hidden)] -impl FromGlib for StackTraceFlags { - fn from_glib(value: gst_sys::GstStackTraceFlags) -> StackTraceFlags { +impl FromGlib for StackTraceFlags { + fn from_glib(value: ffi::GstStackTraceFlags) -> StackTraceFlags { skip_assert_initialized!(); StackTraceFlags::from_bits_truncate(value) } @@ -1184,7 +1183,7 @@ impl FromGlib for StackTraceFlags { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] impl StaticType for StackTraceFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_stack_trace_flags_get_type()) } + unsafe { from_glib(ffi::gst_stack_trace_flags_get_type()) } } } @@ -1200,7 +1199,7 @@ impl<'a> FromValueOptional<'a> for StackTraceFlags { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] impl<'a> FromValue<'a> for StackTraceFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } @@ -1208,7 +1207,7 @@ impl<'a> FromValue<'a> for StackTraceFlags { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] impl SetValue for StackTraceFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1222,16 +1221,16 @@ bitflags! { #[doc(hidden)] impl ToGlib for StreamFlags { - type GlibType = gst_sys::GstStreamFlags; + type GlibType = ffi::GstStreamFlags; - fn to_glib(&self) -> gst_sys::GstStreamFlags { + fn to_glib(&self) -> ffi::GstStreamFlags { self.bits() } } #[doc(hidden)] -impl FromGlib for StreamFlags { - fn from_glib(value: gst_sys::GstStreamFlags) -> StreamFlags { +impl FromGlib for StreamFlags { + fn from_glib(value: ffi::GstStreamFlags) -> StreamFlags { skip_assert_initialized!(); StreamFlags::from_bits_truncate(value) } @@ -1239,7 +1238,7 @@ impl FromGlib for StreamFlags { impl StaticType for StreamFlags { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_stream_flags_get_type()) } + unsafe { from_glib(ffi::gst_stream_flags_get_type()) } } } @@ -1251,13 +1250,13 @@ impl<'a> FromValueOptional<'a> for StreamFlags { impl<'a> FromValue<'a> for StreamFlags { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } impl SetValue for StreamFlags { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } @@ -1277,9 +1276,9 @@ bitflags! { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] #[doc(hidden)] impl ToGlib for StreamType { - type GlibType = gst_sys::GstStreamType; + type GlibType = ffi::GstStreamType; - fn to_glib(&self) -> gst_sys::GstStreamType { + fn to_glib(&self) -> ffi::GstStreamType { self.bits() } } @@ -1287,8 +1286,8 @@ impl ToGlib for StreamType { #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] #[doc(hidden)] -impl FromGlib for StreamType { - fn from_glib(value: gst_sys::GstStreamType) -> StreamType { +impl FromGlib for StreamType { + fn from_glib(value: ffi::GstStreamType) -> StreamType { skip_assert_initialized!(); StreamType::from_bits_truncate(value) } @@ -1298,7 +1297,7 @@ impl FromGlib for StreamType { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] impl StaticType for StreamType { fn static_type() -> Type { - unsafe { from_glib(gst_sys::gst_stream_type_get_type()) } + unsafe { from_glib(ffi::gst_stream_type_get_type()) } } } @@ -1314,7 +1313,7 @@ impl<'a> FromValueOptional<'a> for StreamType { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] impl<'a> FromValue<'a> for StreamType { unsafe fn from_value(value: &Value) -> Self { - from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0)) + from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0)) } } @@ -1322,6 +1321,6 @@ impl<'a> FromValue<'a> for StreamType { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] impl SetValue for StreamType { unsafe fn set_value(value: &mut Value, this: &Self) { - gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib()) } } diff --git a/gstreamer/src/auto/functions.rs b/gstreamer/src/auto/functions.rs index 404d2be75..409b6a878 100644 --- a/gstreamer/src/auto/functions.rs +++ b/gstreamer/src/auto/functions.rs @@ -2,39 +2,35 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; -use glib::object::IsA; -use glib::translate::*; -use glib::GString; -use gst_sys; -use std; -use std::mem; -use std::ptr; -use Bin; -use ClockTime; -use DebugGraphDetails; -use DebugLevel; -use Element; +use crate::Bin; +use crate::ClockTime; +use crate::DebugGraphDetails; +use crate::DebugLevel; +use crate::Element; #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] -use PluginAPIFlags; +use crate::PluginAPIFlags; #[cfg(any(feature = "v1_12", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] -use StackTraceFlags; +use crate::StackTraceFlags; +use glib::object::IsA; +use glib::translate::*; +use std::mem; +use std::ptr; #[cfg(any(feature = "v1_14", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] pub fn debug_add_ring_buffer_logger(max_size_per_thread: u32, thread_timeout: u32) { skip_assert_initialized!(); unsafe { - gst_sys::gst_debug_add_ring_buffer_logger(max_size_per_thread, thread_timeout); + ffi::gst_debug_add_ring_buffer_logger(max_size_per_thread, thread_timeout); } } -pub fn debug_bin_to_dot_data>(bin: &P, details: DebugGraphDetails) -> GString { +pub fn debug_bin_to_dot_data>(bin: &P, details: DebugGraphDetails) -> glib::GString { skip_assert_initialized!(); unsafe { - from_glib_full(gst_sys::gst_debug_bin_to_dot_data( + from_glib_full(ffi::gst_debug_bin_to_dot_data( bin.as_ref().to_glib_none().0, details.to_glib(), )) @@ -48,7 +44,7 @@ pub fn debug_bin_to_dot_file, Q: AsRef>( ) { skip_assert_initialized!(); unsafe { - gst_sys::gst_debug_bin_to_dot_file( + ffi::gst_debug_bin_to_dot_file( bin.as_ref().to_glib_none().0, details.to_glib(), file_name.as_ref().to_glib_none().0, @@ -63,7 +59,7 @@ pub fn debug_bin_to_dot_file_with_ts, Q: AsRef>( ) { skip_assert_initialized!(); unsafe { - gst_sys::gst_debug_bin_to_dot_file_with_ts( + ffi::gst_debug_bin_to_dot_file_with_ts( bin.as_ref().to_glib_none().0, details.to_glib(), file_name.as_ref().to_glib_none().0, @@ -73,33 +69,33 @@ pub fn debug_bin_to_dot_file_with_ts, Q: AsRef>( pub fn debug_get_default_threshold() -> DebugLevel { skip_assert_initialized!(); - unsafe { from_glib(gst_sys::gst_debug_get_default_threshold()) } + unsafe { from_glib(ffi::gst_debug_get_default_threshold()) } } #[cfg(any(feature = "v1_12", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] -pub fn debug_get_stack_trace(flags: StackTraceFlags) -> Result { +pub fn debug_get_stack_trace(flags: StackTraceFlags) -> Result { skip_assert_initialized!(); unsafe { - Option::<_>::from_glib_full(gst_sys::gst_debug_get_stack_trace(flags.to_glib())) - .ok_or_else(|| glib_bool_error!("Failed to get stack trace")) + Option::<_>::from_glib_full(ffi::gst_debug_get_stack_trace(flags.to_glib())) + .ok_or_else(|| glib::glib_bool_error!("Failed to get stack trace")) } } pub fn debug_is_active() -> bool { skip_assert_initialized!(); - unsafe { from_glib(gst_sys::gst_debug_is_active()) } + unsafe { from_glib(ffi::gst_debug_is_active()) } } pub fn debug_is_colored() -> bool { skip_assert_initialized!(); - unsafe { from_glib(gst_sys::gst_debug_is_colored()) } + unsafe { from_glib(ffi::gst_debug_is_colored()) } } pub fn debug_print_stack_trace() { skip_assert_initialized!(); unsafe { - gst_sys::gst_debug_print_stack_trace(); + ffi::gst_debug_print_stack_trace(); } } @@ -108,68 +104,66 @@ pub fn debug_print_stack_trace() { pub fn debug_remove_ring_buffer_logger() { skip_assert_initialized!(); unsafe { - gst_sys::gst_debug_remove_ring_buffer_logger(); + ffi::gst_debug_remove_ring_buffer_logger(); } } #[cfg(any(feature = "v1_14", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] -pub fn debug_ring_buffer_logger_get_logs() -> Vec { +pub fn debug_ring_buffer_logger_get_logs() -> Vec { skip_assert_initialized!(); - unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_debug_ring_buffer_logger_get_logs()) - } + unsafe { FromGlibPtrContainer::from_glib_full(ffi::gst_debug_ring_buffer_logger_get_logs()) } } pub fn debug_set_active(active: bool) { skip_assert_initialized!(); unsafe { - gst_sys::gst_debug_set_active(active.to_glib()); + ffi::gst_debug_set_active(active.to_glib()); } } pub fn debug_set_colored(colored: bool) { skip_assert_initialized!(); unsafe { - gst_sys::gst_debug_set_colored(colored.to_glib()); + ffi::gst_debug_set_colored(colored.to_glib()); } } pub fn debug_set_default_threshold(level: DebugLevel) { skip_assert_initialized!(); unsafe { - gst_sys::gst_debug_set_default_threshold(level.to_glib()); + ffi::gst_debug_set_default_threshold(level.to_glib()); } } pub fn debug_set_threshold_for_name(name: &str, level: DebugLevel) { skip_assert_initialized!(); unsafe { - gst_sys::gst_debug_set_threshold_for_name(name.to_glib_none().0, level.to_glib()); + ffi::gst_debug_set_threshold_for_name(name.to_glib_none().0, level.to_glib()); } } pub fn debug_set_threshold_from_string(list: &str, reset: bool) { skip_assert_initialized!(); unsafe { - gst_sys::gst_debug_set_threshold_from_string(list.to_glib_none().0, reset.to_glib()); + ffi::gst_debug_set_threshold_from_string(list.to_glib_none().0, reset.to_glib()); } } pub fn debug_unset_threshold_for_name(name: &str) { skip_assert_initialized!(); unsafe { - gst_sys::gst_debug_unset_threshold_for_name(name.to_glib_none().0); + ffi::gst_debug_unset_threshold_for_name(name.to_glib_none().0); } } #[cfg(any(feature = "v1_14", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] -pub fn get_main_executable_path() -> Result { +pub fn get_main_executable_path() -> Result { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_none(gst_sys::gst_get_main_executable_path()) - .ok_or_else(|| glib_bool_error!("Failed to get main executable path")) + Option::<_>::from_glib_none(ffi::gst_get_main_executable_path()) + .ok_or_else(|| glib::glib_bool_error!("Failed to get main executable path")) } } @@ -180,7 +174,7 @@ pub fn parse_bin_from_description( assert_initialized_main_thread!(); unsafe { let mut error = ptr::null_mut(); - let ret = gst_sys::gst_parse_bin_from_description( + let ret = ffi::gst_parse_bin_from_description( bin_description.to_glib_none().0, ghost_unlinked_pads.to_glib(), &mut error, @@ -197,7 +191,7 @@ pub fn parse_launch(pipeline_description: &str) -> Result assert_initialized_main_thread!(); unsafe { let mut error = ptr::null_mut(); - let ret = gst_sys::gst_parse_launch(pipeline_description.to_glib_none().0, &mut error); + let ret = ffi::gst_parse_launch(pipeline_description.to_glib_none().0, &mut error); if error.is_null() { Ok(from_glib_none(ret)) } else { @@ -210,7 +204,7 @@ pub fn parse_launchv(argv: &[&str]) -> Result { assert_initialized_main_thread!(); unsafe { let mut error = ptr::null_mut(); - let ret = gst_sys::gst_parse_launchv(argv.to_glib_none().0, &mut error); + let ret = ffi::gst_parse_launchv(argv.to_glib_none().0, &mut error); if error.is_null() { Ok(from_glib_none(ret)) } else { @@ -222,11 +216,11 @@ pub fn parse_launchv(argv: &[&str]) -> Result { //#[cfg(any(feature = "v1_18", feature = "dox"))] //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] //pub fn tracing_get_active_tracers() -> /*Ignored*/Vec { -// unsafe { TODO: call gst_sys:gst_tracing_get_active_tracers() } +// unsafe { TODO: call ffi:gst_tracing_get_active_tracers() } //} //pub fn tracing_register_hook(tracer: /*Ignored*/&Tracer, detail: &str, func: P) { -// unsafe { TODO: call gst_sys:gst_tracing_register_hook() } +// unsafe { TODO: call ffi:gst_tracing_register_hook() } //} #[cfg(any(feature = "v1_18", feature = "dox"))] @@ -234,15 +228,15 @@ pub fn parse_launchv(argv: &[&str]) -> Result { pub fn type_mark_as_plugin_api(type_: glib::types::Type, flags: PluginAPIFlags) { assert_initialized_main_thread!(); unsafe { - gst_sys::gst_type_mark_as_plugin_api(type_.to_glib(), flags.to_glib()); + ffi::gst_type_mark_as_plugin_api(type_.to_glib(), flags.to_glib()); } } pub fn update_registry() -> Result<(), glib::error::BoolError> { assert_initialized_main_thread!(); unsafe { - glib_result_from_gboolean!( - gst_sys::gst_update_registry(), + glib::glib_result_from_gboolean!( + ffi::gst_update_registry(), "Failed to update the registry" ) } @@ -250,7 +244,7 @@ pub fn update_registry() -> Result<(), glib::error::BoolError> { pub fn util_get_timestamp() -> ClockTime { skip_assert_initialized!(); - unsafe { from_glib(gst_sys::gst_util_get_timestamp()) } + unsafe { from_glib(ffi::gst_util_get_timestamp()) } } pub fn version() -> (u32, u32, u32, u32) { @@ -260,7 +254,7 @@ pub fn version() -> (u32, u32, u32, u32) { let mut minor = mem::MaybeUninit::uninit(); let mut micro = mem::MaybeUninit::uninit(); let mut nano = mem::MaybeUninit::uninit(); - gst_sys::gst_version( + ffi::gst_version( major.as_mut_ptr(), minor.as_mut_ptr(), micro.as_mut_ptr(), @@ -274,7 +268,7 @@ pub fn version() -> (u32, u32, u32, u32) { } } -pub fn version_string() -> GString { +pub fn version_string() -> glib::GString { skip_assert_initialized!(); - unsafe { from_glib_full(gst_sys::gst_version_string()) } + unsafe { from_glib_full(ffi::gst_version_string()) } } diff --git a/gstreamer/src/auto/ghost_pad.rs b/gstreamer/src/auto/ghost_pad.rs index 5c7d29e28..4dfe5aede 100644 --- a/gstreamer/src/auto/ghost_pad.rs +++ b/gstreamer/src/auto/ghost_pad.rs @@ -2,19 +2,17 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Object; +use crate::Pad; +use crate::ProxyPad; use glib::object::IsA; use glib::translate::*; -use gst_sys; -use Object; -use Pad; -use ProxyPad; -glib_wrapper! { - pub struct GhostPad(Object) @extends ProxyPad, Pad, Object; +glib::glib_wrapper! { + pub struct GhostPad(Object) @extends ProxyPad, Pad, Object; match fn { - get_type => || gst_sys::gst_ghost_pad_get_type(), + get_type => || ffi::gst_ghost_pad_get_type(), } } @@ -32,7 +30,7 @@ pub trait GhostPadExt: 'static { impl> GhostPadExt for O { fn get_target(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_ghost_pad_get_target( + from_glib_full(ffi::gst_ghost_pad_get_target( self.as_ref().to_glib_none().0, )) } @@ -40,8 +38,8 @@ impl> GhostPadExt for O { fn set_target>(&self, newtarget: Option<&P>) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_ghost_pad_set_target( + glib::glib_result_from_gboolean!( + ffi::gst_ghost_pad_set_target( self.as_ref().to_glib_none().0, newtarget.map(|p| p.as_ref()).to_glib_none().0 ), diff --git a/gstreamer/src/auto/object.rs b/gstreamer/src/auto/object.rs index 4c4c1c3ae..b0c1f4fdd 100644 --- a/gstreamer/src/auto/object.rs +++ b/gstreamer/src/auto/object.rs @@ -2,25 +2,21 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::ClockTime; +use crate::ControlBinding; use glib::object::Cast; use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; -use glib::GString; -use glib_sys; -use gst_sys; use std::boxed::Box as Box_; use std::mem::transmute; -use ClockTime; -use ControlBinding; -glib_wrapper! { - pub struct Object(Object); +glib::glib_wrapper! { + pub struct Object(Object); match fn { - get_type => || gst_sys::gst_object_get_type(), + get_type => || ffi::gst_object_get_type(), } } @@ -28,7 +24,7 @@ impl Object { pub fn check_uniqueness(list: &[Object], name: &str) -> bool { assert_initialized_main_thread!(); unsafe { - from_glib(gst_sys::gst_object_check_uniqueness( + from_glib(ffi::gst_object_check_uniqueness( list.to_glib_none().0, name.to_glib_none().0, )) @@ -36,15 +32,15 @@ impl Object { } //pub fn default_deep_notify, Q: IsA>(object: &P, orig: &Q, pspec: /*Ignored*/&glib::ParamSpec, excluded_props: &[&str]) { - // unsafe { TODO: call gst_sys:gst_object_default_deep_notify() } + // unsafe { TODO: call ffi:gst_object_default_deep_notify() } //} //pub fn ref_sink(object: /*Unimplemented*/Option) -> /*Unimplemented*/Option { - // unsafe { TODO: call gst_sys:gst_object_ref_sink() } + // unsafe { TODO: call ffi:gst_object_ref_sink() } //} //pub fn replace, Q: IsA>(oldobj: Option<&P>, newobj: Option<&Q>) -> bool { - // unsafe { TODO: call gst_sys:gst_object_replace() } + // unsafe { TODO: call ffi:gst_object_replace() } //} } @@ -65,11 +61,11 @@ pub trait GstObjectExt: 'static { fn get_control_rate(&self) -> ClockTime; - fn get_name(&self) -> GString; + fn get_name(&self) -> glib::GString; fn get_parent(&self) -> Option; - fn get_path_string(&self) -> GString; + fn get_path_string(&self) -> glib::GString; fn get_value(&self, property_name: &str, timestamp: ClockTime) -> Option; @@ -113,8 +109,8 @@ impl> GstObjectExt for O { binding: &P, ) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_object_add_control_binding( + glib::glib_result_from_gboolean!( + ffi::gst_object_add_control_binding( self.as_ref().to_glib_none().0, binding.as_ref().to_glib_none().0 ), @@ -125,7 +121,7 @@ impl> GstObjectExt for O { fn default_error(&self, error: &glib::Error, debug: Option<&str>) { unsafe { - gst_sys::gst_object_default_error( + ffi::gst_object_default_error( self.as_ref().to_glib_none().0, error.to_glib_none().0, debug.to_glib_none().0, @@ -135,7 +131,7 @@ impl> GstObjectExt for O { fn get_control_binding(&self, property_name: &str) -> Option { unsafe { - from_glib_full(gst_sys::gst_object_get_control_binding( + from_glib_full(ffi::gst_object_get_control_binding( self.as_ref().to_glib_none().0, property_name.to_glib_none().0, )) @@ -144,27 +140,23 @@ impl> GstObjectExt for O { fn get_control_rate(&self) -> ClockTime { unsafe { - from_glib(gst_sys::gst_object_get_control_rate( + from_glib(ffi::gst_object_get_control_rate( self.as_ref().to_glib_none().0, )) } } - fn get_name(&self) -> GString { - unsafe { from_glib_full(gst_sys::gst_object_get_name(self.as_ref().to_glib_none().0)) } + fn get_name(&self) -> glib::GString { + unsafe { from_glib_full(ffi::gst_object_get_name(self.as_ref().to_glib_none().0)) } } fn get_parent(&self) -> Option { - unsafe { - from_glib_full(gst_sys::gst_object_get_parent( - self.as_ref().to_glib_none().0, - )) - } + unsafe { from_glib_full(ffi::gst_object_get_parent(self.as_ref().to_glib_none().0)) } } - fn get_path_string(&self) -> GString { + fn get_path_string(&self) -> glib::GString { unsafe { - from_glib_full(gst_sys::gst_object_get_path_string( + from_glib_full(ffi::gst_object_get_path_string( self.as_ref().to_glib_none().0, )) } @@ -172,7 +164,7 @@ impl> GstObjectExt for O { fn get_value(&self, property_name: &str, timestamp: ClockTime) -> Option { unsafe { - from_glib_full(gst_sys::gst_object_get_value( + from_glib_full(ffi::gst_object_get_value( self.as_ref().to_glib_none().0, property_name.to_glib_none().0, timestamp.to_glib(), @@ -181,12 +173,12 @@ impl> GstObjectExt for O { } //fn get_value_array(&self, property_name: &str, timestamp: ClockTime, interval: ClockTime, n_values: u32, values: /*Unimplemented*/Option) -> bool { - // unsafe { TODO: call gst_sys:gst_object_get_value_array() } + // unsafe { TODO: call ffi:gst_object_get_value_array() } //} fn has_active_control_bindings(&self) -> bool { unsafe { - from_glib(gst_sys::gst_object_has_active_control_bindings( + from_glib(ffi::gst_object_has_active_control_bindings( self.as_ref().to_glib_none().0, )) } @@ -194,7 +186,7 @@ impl> GstObjectExt for O { fn has_ancestor>(&self, ancestor: &P) -> bool { unsafe { - from_glib(gst_sys::gst_object_has_ancestor( + from_glib(ffi::gst_object_has_ancestor( self.as_ref().to_glib_none().0, ancestor.as_ref().to_glib_none().0, )) @@ -203,7 +195,7 @@ impl> GstObjectExt for O { fn has_as_ancestor>(&self, ancestor: &P) -> bool { unsafe { - from_glib(gst_sys::gst_object_has_as_ancestor( + from_glib(ffi::gst_object_has_as_ancestor( self.as_ref().to_glib_none().0, ancestor.as_ref().to_glib_none().0, )) @@ -212,7 +204,7 @@ impl> GstObjectExt for O { fn has_as_parent>(&self, parent: &P) -> bool { unsafe { - from_glib(gst_sys::gst_object_has_as_parent( + from_glib(ffi::gst_object_has_as_parent( self.as_ref().to_glib_none().0, parent.as_ref().to_glib_none().0, )) @@ -221,7 +213,7 @@ impl> GstObjectExt for O { fn remove_control_binding>(&self, binding: &P) -> bool { unsafe { - from_glib(gst_sys::gst_object_remove_control_binding( + from_glib(ffi::gst_object_remove_control_binding( self.as_ref().to_glib_none().0, binding.as_ref().to_glib_none().0, )) @@ -230,7 +222,7 @@ impl> GstObjectExt for O { fn set_control_binding_disabled(&self, property_name: &str, disabled: bool) { unsafe { - gst_sys::gst_object_set_control_binding_disabled( + ffi::gst_object_set_control_binding_disabled( self.as_ref().to_glib_none().0, property_name.to_glib_none().0, disabled.to_glib(), @@ -240,7 +232,7 @@ impl> GstObjectExt for O { fn set_control_bindings_disabled(&self, disabled: bool) { unsafe { - gst_sys::gst_object_set_control_bindings_disabled( + ffi::gst_object_set_control_bindings_disabled( self.as_ref().to_glib_none().0, disabled.to_glib(), ); @@ -249,7 +241,7 @@ impl> GstObjectExt for O { fn set_control_rate(&self, control_rate: ClockTime) { unsafe { - gst_sys::gst_object_set_control_rate( + ffi::gst_object_set_control_rate( self.as_ref().to_glib_none().0, control_rate.to_glib(), ); @@ -258,8 +250,8 @@ impl> GstObjectExt for O { fn set_parent>(&self, parent: &P) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_object_set_parent( + glib::glib_result_from_gboolean!( + ffi::gst_object_set_parent( self.as_ref().to_glib_none().0, parent.as_ref().to_glib_none().0 ), @@ -270,7 +262,7 @@ impl> GstObjectExt for O { fn suggest_next_sync(&self) -> ClockTime { unsafe { - from_glib(gst_sys::gst_object_suggest_next_sync( + from_glib(ffi::gst_object_suggest_next_sync( self.as_ref().to_glib_none().0, )) } @@ -278,11 +270,8 @@ impl> GstObjectExt for O { fn sync_values(&self, timestamp: ClockTime) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_object_sync_values( - self.as_ref().to_glib_none().0, - timestamp.to_glib() - ), + glib::glib_result_from_gboolean!( + ffi::gst_object_sync_values(self.as_ref().to_glib_none().0, timestamp.to_glib()), "Failed to sync values" ) } @@ -290,7 +279,7 @@ impl> GstObjectExt for O { fn unparent(&self) { unsafe { - gst_sys::gst_object_unparent(self.as_ref().to_glib_none().0); + ffi::gst_object_unparent(self.as_ref().to_glib_none().0); } } @@ -303,9 +292,9 @@ impl> GstObjectExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn notify_parent_trampoline( - this: *mut gst_sys::GstObject, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstObject, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { diff --git a/gstreamer/src/auto/pad.rs b/gstreamer/src/auto/pad.rs index 7db11eb8c..57bce7f2c 100644 --- a/gstreamer/src/auto/pad.rs +++ b/gstreamer/src/auto/pad.rs @@ -2,43 +2,38 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Caps; +use crate::Element; +use crate::Event; +use crate::EventType; +use crate::Object; +use crate::PadDirection; +#[cfg(any(feature = "v1_10", feature = "dox"))] +#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] +use crate::PadLinkCheck; +use crate::PadMode; +use crate::PadTemplate; +#[cfg(any(feature = "v1_10", feature = "dox"))] +#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] +use crate::Stream; +#[cfg(any(feature = "v1_12", feature = "dox"))] +#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] +use crate::TaskState; use glib::object::Cast; use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; -use glib::GString; use glib::StaticType; use glib::Value; -use glib_sys; -use gobject_sys; -use gst_sys; use std::boxed::Box as Box_; use std::mem::transmute; -use Caps; -use Element; -use Event; -use EventType; -use Object; -use PadDirection; -#[cfg(any(feature = "v1_10", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] -use PadLinkCheck; -use PadMode; -use PadTemplate; -#[cfg(any(feature = "v1_10", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] -use Stream; -#[cfg(any(feature = "v1_12", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] -use TaskState; -glib_wrapper! { - pub struct Pad(Object) @extends Object; +glib::glib_wrapper! { + pub struct Pad(Object) @extends Object; match fn { - get_type => || gst_sys::gst_pad_get_type(), + get_type => || ffi::gst_pad_get_type(), } } @@ -58,11 +53,11 @@ pub trait PadExt: 'static { &self, parent: &P, stream_id: Option<&str>, - ) -> Option; + ) -> Option; - //fn create_stream_id_printf>(&self, parent: &P, stream_id: Option<&str>, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> Option; + //fn create_stream_id_printf>(&self, parent: &P, stream_id: Option<&str>, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> Option; - //fn create_stream_id_printf_valist>(&self, parent: &P, stream_id: Option<&str>, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported) -> Option; + //fn create_stream_id_printf_valist>(&self, parent: &P, stream_id: Option<&str>, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported) -> Option; fn forward bool>(&self, forward: P) -> bool; @@ -94,7 +89,7 @@ pub trait PadExt: 'static { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] fn get_stream(&self) -> Option; - fn get_stream_id(&self) -> Option; + fn get_stream_id(&self) -> Option; #[cfg(any(feature = "v1_12", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] @@ -173,8 +168,8 @@ pub trait PadExt: 'static { impl> PadExt for O { fn activate_mode(&self, mode: PadMode, active: bool) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_pad_activate_mode( + glib::glib_result_from_gboolean!( + ffi::gst_pad_activate_mode( self.as_ref().to_glib_none().0, mode.to_glib(), active.to_glib() @@ -186,7 +181,7 @@ impl> PadExt for O { fn can_link>(&self, sinkpad: &P) -> bool { unsafe { - from_glib(gst_sys::gst_pad_can_link( + from_glib(ffi::gst_pad_can_link( self.as_ref().to_glib_none().0, sinkpad.as_ref().to_glib_none().0, )) @@ -195,7 +190,7 @@ impl> PadExt for O { fn check_reconfigure(&self) -> bool { unsafe { - from_glib(gst_sys::gst_pad_check_reconfigure( + from_glib(ffi::gst_pad_check_reconfigure( self.as_ref().to_glib_none().0, )) } @@ -205,9 +200,9 @@ impl> PadExt for O { &self, parent: &P, stream_id: Option<&str>, - ) -> Option { + ) -> Option { unsafe { - from_glib_full(gst_sys::gst_pad_create_stream_id( + from_glib_full(ffi::gst_pad_create_stream_id( self.as_ref().to_glib_none().0, parent.as_ref().to_glib_none().0, stream_id.to_glib_none().0, @@ -215,20 +210,20 @@ impl> PadExt for O { } } - //fn create_stream_id_printf>(&self, parent: &P, stream_id: Option<&str>, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> Option { - // unsafe { TODO: call gst_sys:gst_pad_create_stream_id_printf() } + //fn create_stream_id_printf>(&self, parent: &P, stream_id: Option<&str>, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> Option { + // unsafe { TODO: call ffi:gst_pad_create_stream_id_printf() } //} - //fn create_stream_id_printf_valist>(&self, parent: &P, stream_id: Option<&str>, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported) -> Option { - // unsafe { TODO: call gst_sys:gst_pad_create_stream_id_printf_valist() } + //fn create_stream_id_printf_valist>(&self, parent: &P, stream_id: Option<&str>, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported) -> Option { + // unsafe { TODO: call ffi:gst_pad_create_stream_id_printf_valist() } //} fn forward bool>(&self, forward: P) -> bool { let forward_data: P = forward; unsafe extern "C" fn forward_func bool>( - pad: *mut gst_sys::GstPad, - user_data: glib_sys::gpointer, - ) -> glib_sys::gboolean { + pad: *mut ffi::GstPad, + user_data: glib::ffi::gpointer, + ) -> glib::ffi::gboolean { let pad = from_glib_borrow(pad); let callback: *mut P = user_data as *const _ as usize as *mut P; let res = (*callback)(&pad); @@ -237,7 +232,7 @@ impl> PadExt for O { let forward = Some(forward_func::

as _); let super_callback0: &P = &forward_data; unsafe { - from_glib(gst_sys::gst_pad_forward( + from_glib(ffi::gst_pad_forward( self.as_ref().to_glib_none().0, forward, super_callback0 as *const _ as usize as *mut _, @@ -247,7 +242,7 @@ impl> PadExt for O { fn get_allowed_caps(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_pad_get_allowed_caps( + from_glib_full(ffi::gst_pad_get_allowed_caps( self.as_ref().to_glib_none().0, )) } @@ -255,31 +250,27 @@ impl> PadExt for O { fn get_current_caps(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_pad_get_current_caps( + from_glib_full(ffi::gst_pad_get_current_caps( self.as_ref().to_glib_none().0, )) } } fn get_direction(&self) -> PadDirection { - unsafe { - from_glib(gst_sys::gst_pad_get_direction( - self.as_ref().to_glib_none().0, - )) - } + unsafe { from_glib(ffi::gst_pad_get_direction(self.as_ref().to_glib_none().0)) } } //fn get_element_private(&self) -> /*Unimplemented*/Option { - // unsafe { TODO: call gst_sys:gst_pad_get_element_private() } + // unsafe { TODO: call ffi:gst_pad_get_element_private() } //} fn get_offset(&self) -> i64 { - unsafe { gst_sys::gst_pad_get_offset(self.as_ref().to_glib_none().0) } + unsafe { ffi::gst_pad_get_offset(self.as_ref().to_glib_none().0) } } fn get_pad_template(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_pad_get_pad_template( + from_glib_full(ffi::gst_pad_get_pad_template( self.as_ref().to_glib_none().0, )) } @@ -287,7 +278,7 @@ impl> PadExt for O { fn get_pad_template_caps(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_pad_get_pad_template_caps( + from_glib_full(ffi::gst_pad_get_pad_template_caps( self.as_ref().to_glib_none().0, )) } @@ -295,21 +286,21 @@ impl> PadExt for O { fn get_parent_element(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_pad_get_parent_element( + from_glib_full(ffi::gst_pad_get_parent_element( self.as_ref().to_glib_none().0, )) } } fn get_peer(&self) -> Option { - unsafe { from_glib_full(gst_sys::gst_pad_get_peer(self.as_ref().to_glib_none().0)) } + unsafe { from_glib_full(ffi::gst_pad_get_peer(self.as_ref().to_glib_none().0)) } } #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] fn get_single_internal_link(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_pad_get_single_internal_link( + from_glib_full(ffi::gst_pad_get_single_internal_link( self.as_ref().to_glib_none().0, )) } @@ -317,7 +308,7 @@ impl> PadExt for O { fn get_sticky_event(&self, event_type: EventType, idx: u32) -> Option { unsafe { - from_glib_full(gst_sys::gst_pad_get_sticky_event( + from_glib_full(ffi::gst_pad_get_sticky_event( self.as_ref().to_glib_none().0, event_type.to_glib(), idx, @@ -328,65 +319,57 @@ impl> PadExt for O { #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] fn get_stream(&self) -> Option { - unsafe { from_glib_full(gst_sys::gst_pad_get_stream(self.as_ref().to_glib_none().0)) } + unsafe { from_glib_full(ffi::gst_pad_get_stream(self.as_ref().to_glib_none().0)) } } - fn get_stream_id(&self) -> Option { - unsafe { - from_glib_full(gst_sys::gst_pad_get_stream_id( - self.as_ref().to_glib_none().0, - )) - } + fn get_stream_id(&self) -> Option { + unsafe { from_glib_full(ffi::gst_pad_get_stream_id(self.as_ref().to_glib_none().0)) } } #[cfg(any(feature = "v1_12", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] fn get_task_state(&self) -> TaskState { - unsafe { - from_glib(gst_sys::gst_pad_get_task_state( - self.as_ref().to_glib_none().0, - )) - } + unsafe { from_glib(ffi::gst_pad_get_task_state(self.as_ref().to_glib_none().0)) } } fn has_current_caps(&self) -> bool { unsafe { - from_glib(gst_sys::gst_pad_has_current_caps( + from_glib(ffi::gst_pad_has_current_caps( self.as_ref().to_glib_none().0, )) } } fn is_active(&self) -> bool { - unsafe { from_glib(gst_sys::gst_pad_is_active(self.as_ref().to_glib_none().0)) } + unsafe { from_glib(ffi::gst_pad_is_active(self.as_ref().to_glib_none().0)) } } fn is_blocked(&self) -> bool { - unsafe { from_glib(gst_sys::gst_pad_is_blocked(self.as_ref().to_glib_none().0)) } + unsafe { from_glib(ffi::gst_pad_is_blocked(self.as_ref().to_glib_none().0)) } } fn is_blocking(&self) -> bool { - unsafe { from_glib(gst_sys::gst_pad_is_blocking(self.as_ref().to_glib_none().0)) } + unsafe { from_glib(ffi::gst_pad_is_blocking(self.as_ref().to_glib_none().0)) } } fn is_linked(&self) -> bool { - unsafe { from_glib(gst_sys::gst_pad_is_linked(self.as_ref().to_glib_none().0)) } + unsafe { from_glib(ffi::gst_pad_is_linked(self.as_ref().to_glib_none().0)) } } //fn iterate_internal_links(&self) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_pad_iterate_internal_links() } + // unsafe { TODO: call ffi:gst_pad_iterate_internal_links() } //} //fn iterate_internal_links_default>(&self, parent: Option<&P>) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_pad_iterate_internal_links_default() } + // unsafe { TODO: call ffi:gst_pad_iterate_internal_links_default() } //} #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] fn link_maybe_ghosting>(&self, sink: &P) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_pad_link_maybe_ghosting( + glib::glib_result_from_gboolean!( + ffi::gst_pad_link_maybe_ghosting( self.as_ref().to_glib_none().0, sink.as_ref().to_glib_none().0 ), @@ -403,8 +386,8 @@ impl> PadExt for O { flags: PadLinkCheck, ) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_pad_link_maybe_ghosting_full( + glib::glib_result_from_gboolean!( + ffi::gst_pad_link_maybe_ghosting_full( self.as_ref().to_glib_none().0, sink.as_ref().to_glib_none().0, flags.to_glib() @@ -416,13 +399,13 @@ impl> PadExt for O { fn mark_reconfigure(&self) { unsafe { - gst_sys::gst_pad_mark_reconfigure(self.as_ref().to_glib_none().0); + ffi::gst_pad_mark_reconfigure(self.as_ref().to_glib_none().0); } } fn needs_reconfigure(&self) -> bool { unsafe { - from_glib(gst_sys::gst_pad_needs_reconfigure( + from_glib(ffi::gst_pad_needs_reconfigure( self.as_ref().to_glib_none().0, )) } @@ -430,8 +413,8 @@ impl> PadExt for O { fn pause_task(&self) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_pad_pause_task(self.as_ref().to_glib_none().0), + glib::glib_result_from_gboolean!( + ffi::gst_pad_pause_task(self.as_ref().to_glib_none().0), "Failed to pause pad task" ) } @@ -439,7 +422,7 @@ impl> PadExt for O { fn peer_query_accept_caps(&self, caps: &Caps) -> bool { unsafe { - from_glib(gst_sys::gst_pad_peer_query_accept_caps( + from_glib(ffi::gst_pad_peer_query_accept_caps( self.as_ref().to_glib_none().0, caps.to_glib_none().0, )) @@ -448,7 +431,7 @@ impl> PadExt for O { fn peer_query_caps(&self, filter: Option<&Caps>) -> Option { unsafe { - from_glib_full(gst_sys::gst_pad_peer_query_caps( + from_glib_full(ffi::gst_pad_peer_query_caps( self.as_ref().to_glib_none().0, filter.to_glib_none().0, )) @@ -457,7 +440,7 @@ impl> PadExt for O { fn query_accept_caps(&self, caps: &Caps) -> bool { unsafe { - from_glib(gst_sys::gst_pad_query_accept_caps( + from_glib(ffi::gst_pad_query_accept_caps( self.as_ref().to_glib_none().0, caps.to_glib_none().0, )) @@ -466,7 +449,7 @@ impl> PadExt for O { fn query_caps(&self, filter: Option<&Caps>) -> Option { unsafe { - from_glib_full(gst_sys::gst_pad_query_caps( + from_glib_full(ffi::gst_pad_query_caps( self.as_ref().to_glib_none().0, filter.to_glib_none().0, )) @@ -475,27 +458,27 @@ impl> PadExt for O { fn set_active(&self, active: bool) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_pad_set_active(self.as_ref().to_glib_none().0, active.to_glib()), + glib::glib_result_from_gboolean!( + ffi::gst_pad_set_active(self.as_ref().to_glib_none().0, active.to_glib()), "Failed to activate pad" ) } } //fn set_element_private(&self, priv_: /*Unimplemented*/Option) { - // unsafe { TODO: call gst_sys:gst_pad_set_element_private() } + // unsafe { TODO: call ffi:gst_pad_set_element_private() } //} fn set_offset(&self, offset: i64) { unsafe { - gst_sys::gst_pad_set_offset(self.as_ref().to_glib_none().0, offset); + ffi::gst_pad_set_offset(self.as_ref().to_glib_none().0, offset); } } fn stop_task(&self) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_pad_stop_task(self.as_ref().to_glib_none().0), + glib::glib_result_from_gboolean!( + ffi::gst_pad_stop_task(self.as_ref().to_glib_none().0), "Failed to stop pad task" ) } @@ -503,8 +486,8 @@ impl> PadExt for O { fn unlink>(&self, sinkpad: &P) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_pad_unlink( + glib::glib_result_from_gboolean!( + ffi::gst_pad_unlink( self.as_ref().to_glib_none().0, sinkpad.as_ref().to_glib_none().0 ), @@ -515,15 +498,15 @@ impl> PadExt for O { fn use_fixed_caps(&self) { unsafe { - gst_sys::gst_pad_use_fixed_caps(self.as_ref().to_glib_none().0); + ffi::gst_pad_use_fixed_caps(self.as_ref().to_glib_none().0); } } fn get_property_caps(&self) -> Option { unsafe { let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_get_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"caps\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); @@ -535,9 +518,9 @@ impl> PadExt for O { fn connect_linked(&self, f: F) -> SignalHandlerId { unsafe extern "C" fn linked_trampoline( - this: *mut gst_sys::GstPad, - peer: *mut gst_sys::GstPad, - f: glib_sys::gpointer, + this: *mut ffi::GstPad, + peer: *mut ffi::GstPad, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -565,9 +548,9 @@ impl> PadExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn unlinked_trampoline( - this: *mut gst_sys::GstPad, - peer: *mut gst_sys::GstPad, - f: glib_sys::gpointer, + this: *mut ffi::GstPad, + peer: *mut ffi::GstPad, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -595,9 +578,9 @@ impl> PadExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn notify_caps_trampoline( - this: *mut gst_sys::GstPad, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstPad, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -622,9 +605,9 @@ impl> PadExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn notify_offset_trampoline( - this: *mut gst_sys::GstPad, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstPad, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { diff --git a/gstreamer/src/auto/pad_template.rs b/gstreamer/src/auto/pad_template.rs index 3876e706d..0bf62f813 100644 --- a/gstreamer/src/auto/pad_template.rs +++ b/gstreamer/src/auto/pad_template.rs @@ -2,31 +2,26 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Caps; +use crate::Object; +use crate::Pad; +use crate::PadDirection; +use crate::PadPresence; use glib::object::IsA; use glib::object::ObjectType as ObjectType_; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; -use glib::GString; use glib::StaticType; use glib::Value; -use glib_sys; -use gobject_sys; -use gst_sys; use std::boxed::Box as Box_; use std::mem::transmute; -use Caps; -use Object; -use Pad; -use PadDirection; -use PadPresence; -glib_wrapper! { - pub struct PadTemplate(Object) @extends Object; +glib::glib_wrapper! { + pub struct PadTemplate(Object) @extends Object; match fn { - get_type => || gst_sys::gst_pad_template_get_type(), + get_type => || ffi::gst_pad_template_get_type(), } } @@ -39,13 +34,13 @@ impl PadTemplate { ) -> Result { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_none(gst_sys::gst_pad_template_new( + Option::<_>::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, )) - .ok_or_else(|| glib_bool_error!("Failed to create pad template")) + .ok_or_else(|| glib::glib_bool_error!("Failed to create pad template")) } } @@ -60,26 +55,26 @@ impl PadTemplate { ) -> Result { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_none(gst_sys::gst_pad_template_new_with_gtype( + Option::<_>::from_glib_none(ffi::gst_pad_template_new_with_gtype( name_template.to_glib_none().0, direction.to_glib(), presence.to_glib(), caps.to_glib_none().0, pad_type.to_glib(), )) - .ok_or_else(|| glib_bool_error!("Failed to create pad template")) + .ok_or_else(|| glib::glib_bool_error!("Failed to create pad template")) } } pub fn get_caps(&self) -> Option { - unsafe { from_glib_full(gst_sys::gst_pad_template_get_caps(self.to_glib_none().0)) } + unsafe { from_glib_full(ffi::gst_pad_template_get_caps(self.to_glib_none().0)) } } #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] pub fn get_documentation_caps(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_pad_template_get_documentation_caps( + from_glib_full(ffi::gst_pad_template_get_documentation_caps( self.to_glib_none().0, )) } @@ -87,10 +82,7 @@ impl PadTemplate { pub fn pad_created>(&self, pad: &P) { unsafe { - gst_sys::gst_pad_template_pad_created( - self.to_glib_none().0, - pad.as_ref().to_glib_none().0, - ); + ffi::gst_pad_template_pad_created(self.to_glib_none().0, pad.as_ref().to_glib_none().0); } } @@ -98,7 +90,7 @@ impl PadTemplate { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] pub fn set_documentation_caps(&self, caps: &Caps) { unsafe { - gst_sys::gst_pad_template_set_documentation_caps( + ffi::gst_pad_template_set_documentation_caps( self.to_glib_none().0, caps.to_glib_none().0, ); @@ -108,8 +100,8 @@ impl PadTemplate { pub fn get_property_direction(&self) -> PadDirection { unsafe { let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.as_ptr() as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_get_property( + self.as_ptr() as *mut glib::gobject_ffi::GObject, b"direction\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); @@ -125,8 +117,8 @@ impl PadTemplate { pub fn get_property_gtype(&self) -> glib::types::Type { unsafe { let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.as_ptr() as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_get_property( + self.as_ptr() as *mut glib::gobject_ffi::GObject, b"gtype\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); @@ -137,11 +129,11 @@ impl PadTemplate { } } - pub fn get_property_name_template(&self) -> Option { + pub fn get_property_name_template(&self) -> Option { unsafe { - let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.as_ptr() as *mut gobject_sys::GObject, + let mut value = Value::from_type(::static_type()); + glib::gobject_ffi::g_object_get_property( + self.as_ptr() as *mut glib::gobject_ffi::GObject, b"name-template\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); @@ -154,8 +146,8 @@ impl PadTemplate { pub fn get_property_presence(&self) -> PadPresence { unsafe { let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.as_ptr() as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_get_property( + self.as_ptr() as *mut glib::gobject_ffi::GObject, b"presence\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); @@ -173,9 +165,9 @@ impl PadTemplate { unsafe extern "C" fn pad_created_trampoline< F: Fn(&PadTemplate, &Pad) + Send + Sync + 'static, >( - this: *mut gst_sys::GstPadTemplate, - pad: *mut gst_sys::GstPad, - f: glib_sys::gpointer, + this: *mut ffi::GstPadTemplate, + pad: *mut ffi::GstPad, + f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f(&from_glib_borrow(this), &from_glib_borrow(pad)) diff --git a/gstreamer/src/auto/pipeline.rs b/gstreamer/src/auto/pipeline.rs index 01ce8393d..b65189429 100644 --- a/gstreamer/src/auto/pipeline.rs +++ b/gstreamer/src/auto/pipeline.rs @@ -2,27 +2,25 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use crate::Bin; +use crate::ChildProxy; +use crate::Clock; +use crate::ClockTime; +use crate::Element; +use crate::Object; use glib::object::Cast; use glib::object::IsA; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; -use glib_sys; -use gst_sys; use std::boxed::Box as Box_; use std::mem::transmute; -use Bin; -use ChildProxy; -use Clock; -use ClockTime; -use Element; -use Object; -glib_wrapper! { - pub struct Pipeline(Object) @extends Bin, Element, Object, @implements ChildProxy; +glib::glib_wrapper! { + pub struct Pipeline(Object) @extends Bin, Element, Object, @implements ChildProxy; match fn { - get_type => || gst_sys::gst_pipeline_get_type(), + get_type => || ffi::gst_pipeline_get_type(), } } @@ -30,7 +28,7 @@ impl Pipeline { pub fn new(name: Option<&str>) -> Pipeline { assert_initialized_main_thread!(); unsafe { - Element::from_glib_none(gst_sys::gst_pipeline_new(name.to_glib_none().0)).unsafe_cast() + Element::from_glib_none(ffi::gst_pipeline_new(name.to_glib_none().0)).unsafe_cast() } } } @@ -78,29 +76,25 @@ pub trait PipelineExt: 'static { impl> PipelineExt for O { fn auto_clock(&self) { unsafe { - gst_sys::gst_pipeline_auto_clock(self.as_ref().to_glib_none().0); + ffi::gst_pipeline_auto_clock(self.as_ref().to_glib_none().0); } } fn get_auto_flush_bus(&self) -> bool { unsafe { - from_glib(gst_sys::gst_pipeline_get_auto_flush_bus( + from_glib(ffi::gst_pipeline_get_auto_flush_bus( self.as_ref().to_glib_none().0, )) } } fn get_delay(&self) -> ClockTime { - unsafe { - from_glib(gst_sys::gst_pipeline_get_delay( - self.as_ref().to_glib_none().0, - )) - } + unsafe { from_glib(ffi::gst_pipeline_get_delay(self.as_ref().to_glib_none().0)) } } fn get_latency(&self) -> ClockTime { unsafe { - from_glib(gst_sys::gst_pipeline_get_latency( + from_glib(ffi::gst_pipeline_get_latency( self.as_ref().to_glib_none().0, )) } @@ -108,7 +102,7 @@ impl> PipelineExt for O { fn get_pipeline_clock(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_pipeline_get_pipeline_clock( + from_glib_full(ffi::gst_pipeline_get_pipeline_clock( self.as_ref().to_glib_none().0, )) } @@ -116,7 +110,7 @@ impl> PipelineExt for O { fn set_auto_flush_bus(&self, auto_flush: bool) { unsafe { - gst_sys::gst_pipeline_set_auto_flush_bus( + ffi::gst_pipeline_set_auto_flush_bus( self.as_ref().to_glib_none().0, auto_flush.to_glib(), ); @@ -125,19 +119,19 @@ impl> PipelineExt for O { fn set_delay(&self, delay: ClockTime) { unsafe { - gst_sys::gst_pipeline_set_delay(self.as_ref().to_glib_none().0, delay.to_glib()); + ffi::gst_pipeline_set_delay(self.as_ref().to_glib_none().0, delay.to_glib()); } } fn set_latency(&self, latency: ClockTime) { unsafe { - gst_sys::gst_pipeline_set_latency(self.as_ref().to_glib_none().0, latency.to_glib()); + ffi::gst_pipeline_set_latency(self.as_ref().to_glib_none().0, latency.to_glib()); } } fn use_clock>(&self, clock: Option<&P>) { unsafe { - gst_sys::gst_pipeline_use_clock( + ffi::gst_pipeline_use_clock( self.as_ref().to_glib_none().0, clock.map(|p| p.as_ref()).to_glib_none().0, ); @@ -152,9 +146,9 @@ impl> PipelineExt for O { P, F: Fn(&P) + Send + Sync + 'static, >( - this: *mut gst_sys::GstPipeline, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstPipeline, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -179,9 +173,9 @@ impl> PipelineExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn notify_delay_trampoline( - this: *mut gst_sys::GstPipeline, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstPipeline, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { @@ -206,9 +200,9 @@ impl> PipelineExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn notify_latency_trampoline( - this: *mut gst_sys::GstPipeline, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstPipeline, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { diff --git a/gstreamer/src/auto/plugin.rs b/gstreamer/src/auto/plugin.rs index 4ffea279f..30eb5fd13 100644 --- a/gstreamer/src/auto/plugin.rs +++ b/gstreamer/src/auto/plugin.rs @@ -2,20 +2,16 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Object; +use crate::PluginDependencyFlags; use glib::translate::*; -use glib::GString; -use gst_sys; -use std; use std::ptr; -use Object; -use PluginDependencyFlags; -glib_wrapper! { - pub struct Plugin(Object) @extends Object; +glib::glib_wrapper! { + pub struct Plugin(Object) @extends Object; match fn { - get_type => || gst_sys::gst_plugin_get_type(), + get_type => || ffi::gst_plugin_get_type(), } } @@ -28,7 +24,7 @@ impl Plugin { flags: PluginDependencyFlags, ) { unsafe { - gst_sys::gst_plugin_add_dependency( + ffi::gst_plugin_add_dependency( self.to_glib_none().0, env_vars.to_glib_none().0, paths.to_glib_none().0, @@ -46,7 +42,7 @@ impl Plugin { flags: PluginDependencyFlags, ) { unsafe { - gst_sys::gst_plugin_add_dependency_simple( + ffi::gst_plugin_add_dependency_simple( self.to_glib_none().0, env_vars.to_glib_none().0, paths.to_glib_none().0, @@ -56,58 +52,58 @@ impl Plugin { } } - pub fn get_description(&self) -> GString { - unsafe { from_glib_none(gst_sys::gst_plugin_get_description(self.to_glib_none().0)) } + pub fn get_description(&self) -> glib::GString { + unsafe { from_glib_none(ffi::gst_plugin_get_description(self.to_glib_none().0)) } } pub fn get_filename(&self) -> Option { - unsafe { from_glib_none(gst_sys::gst_plugin_get_filename(self.to_glib_none().0)) } + unsafe { from_glib_none(ffi::gst_plugin_get_filename(self.to_glib_none().0)) } } - pub fn get_license(&self) -> GString { - unsafe { from_glib_none(gst_sys::gst_plugin_get_license(self.to_glib_none().0)) } + pub fn get_license(&self) -> glib::GString { + unsafe { from_glib_none(ffi::gst_plugin_get_license(self.to_glib_none().0)) } } - pub fn get_origin(&self) -> GString { - unsafe { from_glib_none(gst_sys::gst_plugin_get_origin(self.to_glib_none().0)) } + pub fn get_origin(&self) -> glib::GString { + unsafe { from_glib_none(ffi::gst_plugin_get_origin(self.to_glib_none().0)) } } - pub fn get_package(&self) -> GString { - unsafe { from_glib_none(gst_sys::gst_plugin_get_package(self.to_glib_none().0)) } + pub fn get_package(&self) -> glib::GString { + unsafe { from_glib_none(ffi::gst_plugin_get_package(self.to_glib_none().0)) } } - pub fn get_release_date_string(&self) -> Option { + pub fn get_release_date_string(&self) -> Option { unsafe { - from_glib_none(gst_sys::gst_plugin_get_release_date_string( + from_glib_none(ffi::gst_plugin_get_release_date_string( self.to_glib_none().0, )) } } - pub fn get_source(&self) -> GString { - unsafe { from_glib_none(gst_sys::gst_plugin_get_source(self.to_glib_none().0)) } + pub fn get_source(&self) -> glib::GString { + unsafe { from_glib_none(ffi::gst_plugin_get_source(self.to_glib_none().0)) } } - pub fn get_version(&self) -> GString { - unsafe { from_glib_none(gst_sys::gst_plugin_get_version(self.to_glib_none().0)) } + pub fn get_version(&self) -> glib::GString { + unsafe { from_glib_none(ffi::gst_plugin_get_version(self.to_glib_none().0)) } } pub fn is_loaded(&self) -> bool { - unsafe { from_glib(gst_sys::gst_plugin_is_loaded(self.to_glib_none().0)) } + unsafe { from_glib(ffi::gst_plugin_is_loaded(self.to_glib_none().0)) } } pub fn load(&self) -> Result { unsafe { - Option::<_>::from_glib_full(gst_sys::gst_plugin_load(self.to_glib_none().0)) - .ok_or_else(|| glib_bool_error!("Failed to load plugin")) + Option::<_>::from_glib_full(ffi::gst_plugin_load(self.to_glib_none().0)) + .ok_or_else(|| glib::glib_bool_error!("Failed to load plugin")) } } pub fn load_by_name(name: &str) -> Result { assert_initialized_main_thread!(); unsafe { - Option::<_>::from_glib_full(gst_sys::gst_plugin_load_by_name(name.to_glib_none().0)) - .ok_or_else(|| glib_bool_error!("Failed to load plugin")) + Option::<_>::from_glib_full(ffi::gst_plugin_load_by_name(name.to_glib_none().0)) + .ok_or_else(|| glib::glib_bool_error!("Failed to load plugin")) } } @@ -115,7 +111,7 @@ impl Plugin { assert_initialized_main_thread!(); unsafe { let mut error = ptr::null_mut(); - let ret = gst_sys::gst_plugin_load_file(filename.as_ref().to_glib_none().0, &mut error); + let ret = ffi::gst_plugin_load_file(filename.as_ref().to_glib_none().0, &mut error); if error.is_null() { Ok(from_glib_full(ret)) } else { diff --git a/gstreamer/src/auto/plugin_feature.rs b/gstreamer/src/auto/plugin_feature.rs index 3fb765b3a..303656e65 100644 --- a/gstreamer/src/auto/plugin_feature.rs +++ b/gstreamer/src/auto/plugin_feature.rs @@ -2,19 +2,16 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Object; +use crate::Plugin; use glib::object::IsA; use glib::translate::*; -use glib::GString; -use gst_sys; -use Object; -use Plugin; -glib_wrapper! { - pub struct PluginFeature(Object) @extends Object; +glib::glib_wrapper! { + pub struct PluginFeature(Object) @extends Object; match fn { - get_type => || gst_sys::gst_plugin_feature_get_type(), + get_type => || ffi::gst_plugin_feature_get_type(), } } @@ -28,7 +25,7 @@ pub trait PluginFeatureExt: 'static { fn get_plugin(&self) -> Option; - fn get_plugin_name(&self) -> Option; + fn get_plugin_name(&self) -> Option; fn load(&self) -> Result; } @@ -36,7 +33,7 @@ pub trait PluginFeatureExt: 'static { impl> PluginFeatureExt for O { fn check_version(&self, min_major: u32, min_minor: u32, min_micro: u32) -> bool { unsafe { - from_glib(gst_sys::gst_plugin_feature_check_version( + from_glib(ffi::gst_plugin_feature_check_version( self.as_ref().to_glib_none().0, min_major, min_minor, @@ -47,15 +44,15 @@ impl> PluginFeatureExt for O { fn get_plugin(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_plugin_feature_get_plugin( + from_glib_full(ffi::gst_plugin_feature_get_plugin( self.as_ref().to_glib_none().0, )) } } - fn get_plugin_name(&self) -> Option { + fn get_plugin_name(&self) -> Option { unsafe { - from_glib_none(gst_sys::gst_plugin_feature_get_plugin_name( + from_glib_none(ffi::gst_plugin_feature_get_plugin_name( self.as_ref().to_glib_none().0, )) } @@ -63,10 +60,10 @@ impl> PluginFeatureExt for O { fn load(&self) -> Result { unsafe { - Option::<_>::from_glib_full(gst_sys::gst_plugin_feature_load( + Option::<_>::from_glib_full(ffi::gst_plugin_feature_load( self.as_ref().to_glib_none().0, )) - .ok_or_else(|| glib_bool_error!("Failed to load plugin feature")) + .ok_or_else(|| glib::glib_bool_error!("Failed to load plugin feature")) } } } diff --git a/gstreamer/src/auto/preset.rs b/gstreamer/src/auto/preset.rs index 192560b25..ab5dd181b 100644 --- a/gstreamer/src/auto/preset.rs +++ b/gstreamer/src/auto/preset.rs @@ -2,26 +2,22 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; use glib::object::IsA; use glib::translate::*; -use glib::GString; -use gst_sys; -use std; use std::ptr; -glib_wrapper! { - pub struct Preset(Interface); +glib::glib_wrapper! { + pub struct Preset(Interface); match fn { - get_type => || gst_sys::gst_preset_get_type(), + get_type => || ffi::gst_preset_get_type(), } } impl Preset { pub fn get_app_dir() -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(gst_sys::gst_preset_get_app_dir()) } + unsafe { from_glib_none(ffi::gst_preset_get_app_dir()) } } pub fn set_app_dir>( @@ -29,8 +25,8 @@ impl Preset { ) -> Result<(), glib::error::BoolError> { assert_initialized_main_thread!(); unsafe { - glib_result_from_gboolean!( - gst_sys::gst_preset_set_app_dir(app_dir.as_ref().to_glib_none().0), + glib::glib_result_from_gboolean!( + ffi::gst_preset_set_app_dir(app_dir.as_ref().to_glib_none().0), "Failed to set app preset directory" ) } @@ -45,11 +41,11 @@ pub const NONE_PRESET: Option<&Preset> = None; pub trait PresetExt: 'static { fn delete_preset(&self, name: &str) -> Result<(), glib::error::BoolError>; - fn get_meta(&self, name: &str, tag: &str) -> Option; + fn get_meta(&self, name: &str, tag: &str) -> Option; - fn get_preset_names(&self) -> Vec; + fn get_preset_names(&self) -> Vec; - fn get_property_names(&self) -> Vec; + fn get_property_names(&self) -> Vec; fn is_editable(&self) -> bool; @@ -70,8 +66,8 @@ pub trait PresetExt: 'static { impl> PresetExt for O { fn delete_preset(&self, name: &str) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_preset_delete_preset( + glib::glib_result_from_gboolean!( + ffi::gst_preset_delete_preset( self.as_ref().to_glib_none().0, name.to_glib_none().0 ), @@ -80,10 +76,10 @@ impl> PresetExt for O { } } - fn get_meta(&self, name: &str, tag: &str) -> Option { + fn get_meta(&self, name: &str, tag: &str) -> Option { unsafe { let mut value = ptr::null_mut(); - let ret = from_glib(gst_sys::gst_preset_get_meta( + let ret = from_glib(ffi::gst_preset_get_meta( self.as_ref().to_glib_none().0, name.to_glib_none().0, tag.to_glib_none().0, @@ -97,37 +93,30 @@ impl> PresetExt for O { } } - fn get_preset_names(&self) -> Vec { + fn get_preset_names(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_preset_get_preset_names( + FromGlibPtrContainer::from_glib_full(ffi::gst_preset_get_preset_names( self.as_ref().to_glib_none().0, )) } } - fn get_property_names(&self) -> Vec { + fn get_property_names(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_preset_get_property_names( + FromGlibPtrContainer::from_glib_full(ffi::gst_preset_get_property_names( self.as_ref().to_glib_none().0, )) } } fn is_editable(&self) -> bool { - unsafe { - from_glib(gst_sys::gst_preset_is_editable( - self.as_ref().to_glib_none().0, - )) - } + unsafe { from_glib(ffi::gst_preset_is_editable(self.as_ref().to_glib_none().0)) } } fn load_preset(&self, name: &str) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_preset_load_preset( - self.as_ref().to_glib_none().0, - name.to_glib_none().0 - ), + glib::glib_result_from_gboolean!( + ffi::gst_preset_load_preset(self.as_ref().to_glib_none().0, name.to_glib_none().0), "Failed to load preset" ) } @@ -135,8 +124,8 @@ impl> PresetExt for O { fn rename_preset(&self, old_name: &str, new_name: &str) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_preset_rename_preset( + glib::glib_result_from_gboolean!( + ffi::gst_preset_rename_preset( self.as_ref().to_glib_none().0, old_name.to_glib_none().0, new_name.to_glib_none().0 @@ -148,11 +137,8 @@ impl> PresetExt for O { fn save_preset(&self, name: &str) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_preset_save_preset( - self.as_ref().to_glib_none().0, - name.to_glib_none().0 - ), + glib::glib_result_from_gboolean!( + ffi::gst_preset_save_preset(self.as_ref().to_glib_none().0, name.to_glib_none().0), "Failed to save preset" ) } @@ -165,8 +151,8 @@ impl> PresetExt for O { value: Option<&str>, ) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_preset_set_meta( + glib::glib_result_from_gboolean!( + ffi::gst_preset_set_meta( self.as_ref().to_glib_none().0, name.to_glib_none().0, tag.to_glib_none().0, diff --git a/gstreamer/src/auto/proxy_pad.rs b/gstreamer/src/auto/proxy_pad.rs index 4684a10b1..66fe85425 100644 --- a/gstreamer/src/auto/proxy_pad.rs +++ b/gstreamer/src/auto/proxy_pad.rs @@ -2,23 +2,22 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use crate::Object; +use crate::Pad; use glib::object::IsA; use glib::translate::*; -use gst_sys; -use Object; -use Pad; -glib_wrapper! { - pub struct ProxyPad(Object) @extends Pad, Object; +glib::glib_wrapper! { + pub struct ProxyPad(Object) @extends Pad, Object; match fn { - get_type => || gst_sys::gst_proxy_pad_get_type(), + get_type => || ffi::gst_proxy_pad_get_type(), } } impl ProxyPad { //pub fn iterate_internal_links_default, Q: IsA>(pad: &P, parent: Option<&Q>) -> /*Ignored*/Option { - // unsafe { TODO: call gst_sys:gst_proxy_pad_iterate_internal_links_default() } + // unsafe { TODO: call ffi:gst_proxy_pad_iterate_internal_links_default() } //} } @@ -34,7 +33,7 @@ pub trait ProxyPadExt: 'static { impl> ProxyPadExt for O { fn get_internal(&self) -> Option { unsafe { - from_glib_full(gst_sys::gst_proxy_pad_get_internal( + from_glib_full(ffi::gst_proxy_pad_get_internal( self.as_ref().to_glib_none().0, )) } diff --git a/gstreamer/src/auto/registry.rs b/gstreamer/src/auto/registry.rs index 1600471dc..7526ea98e 100644 --- a/gstreamer/src/auto/registry.rs +++ b/gstreamer/src/auto/registry.rs @@ -2,26 +2,22 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::Object; +use crate::Plugin; +use crate::PluginFeature; use glib::object::IsA; use glib::object::ObjectType as ObjectType_; use glib::signal::connect_raw; use glib::signal::SignalHandlerId; use glib::translate::*; -use glib_sys; -use gst_sys; -use std; use std::boxed::Box as Box_; use std::mem::transmute; -use Object; -use Plugin; -use PluginFeature; -glib_wrapper! { - pub struct Registry(Object) @extends Object; +glib::glib_wrapper! { + pub struct Registry(Object) @extends Object; match fn { - get_type => || gst_sys::gst_registry_get_type(), + get_type => || ffi::gst_registry_get_type(), } } @@ -31,8 +27,8 @@ impl Registry { feature: &P, ) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_registry_add_feature( + glib::glib_result_from_gboolean!( + ffi::gst_registry_add_feature( self.to_glib_none().0, feature.as_ref().to_glib_none().0 ), @@ -43,8 +39,8 @@ impl Registry { pub fn add_plugin(&self, plugin: &Plugin) -> Result<(), glib::error::BoolError> { unsafe { - glib_result_from_gboolean!( - gst_sys::gst_registry_add_plugin(self.to_glib_none().0, plugin.to_glib_none().0), + glib::glib_result_from_gboolean!( + ffi::gst_registry_add_plugin(self.to_glib_none().0, plugin.to_glib_none().0), "Failed to add plugin" ) } @@ -58,7 +54,7 @@ impl Registry { min_micro: u32, ) -> bool { unsafe { - from_glib(gst_sys::gst_registry_check_feature_version( + from_glib(ffi::gst_registry_check_feature_version( self.to_glib_none().0, feature_name.to_glib_none().0, min_major, @@ -75,9 +71,9 @@ impl Registry { ) -> Vec { let filter_data: P = filter; unsafe extern "C" fn filter_func bool>( - feature: *mut gst_sys::GstPluginFeature, - user_data: glib_sys::gpointer, - ) -> glib_sys::gboolean { + feature: *mut ffi::GstPluginFeature, + user_data: glib::ffi::gpointer, + ) -> glib::ffi::gboolean { let feature = from_glib_borrow(feature); let callback: *mut P = user_data as *const _ as usize as *mut P; let res = (*callback)(&feature); @@ -86,7 +82,7 @@ impl Registry { let filter = Some(filter_func::

as _); let super_callback0: &P = &filter_data; unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_registry_feature_filter( + FromGlibPtrContainer::from_glib_full(ffi::gst_registry_feature_filter( self.to_glib_none().0, filter, first.to_glib(), @@ -97,7 +93,7 @@ impl Registry { pub fn find_feature(&self, name: &str, type_: glib::types::Type) -> Option { unsafe { - from_glib_full(gst_sys::gst_registry_find_feature( + from_glib_full(ffi::gst_registry_find_feature( self.to_glib_none().0, name.to_glib_none().0, type_.to_glib(), @@ -107,7 +103,7 @@ impl Registry { pub fn find_plugin(&self, name: &str) -> Option { unsafe { - from_glib_full(gst_sys::gst_registry_find_plugin( + from_glib_full(ffi::gst_registry_find_plugin( self.to_glib_none().0, name.to_glib_none().0, )) @@ -116,7 +112,7 @@ impl Registry { pub fn get_feature_list(&self, type_: glib::types::Type) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_registry_get_feature_list( + FromGlibPtrContainer::from_glib_full(ffi::gst_registry_get_feature_list( self.to_glib_none().0, type_.to_glib(), )) @@ -125,7 +121,7 @@ impl Registry { pub fn get_feature_list_by_plugin(&self, name: &str) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_registry_get_feature_list_by_plugin( + FromGlibPtrContainer::from_glib_full(ffi::gst_registry_get_feature_list_by_plugin( self.to_glib_none().0, name.to_glib_none().0, )) @@ -133,12 +129,12 @@ impl Registry { } pub fn get_feature_list_cookie(&self) -> u32 { - unsafe { gst_sys::gst_registry_get_feature_list_cookie(self.to_glib_none().0) } + unsafe { ffi::gst_registry_get_feature_list_cookie(self.to_glib_none().0) } } pub fn get_plugin_list(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_registry_get_plugin_list( + FromGlibPtrContainer::from_glib_full(ffi::gst_registry_get_plugin_list( self.to_glib_none().0, )) } @@ -146,7 +142,7 @@ impl Registry { pub fn lookup(&self, filename: &str) -> Option { unsafe { - from_glib_full(gst_sys::gst_registry_lookup( + from_glib_full(ffi::gst_registry_lookup( self.to_glib_none().0, filename.to_glib_none().0, )) @@ -155,7 +151,7 @@ impl Registry { pub fn lookup_feature(&self, name: &str) -> Option { unsafe { - from_glib_full(gst_sys::gst_registry_lookup_feature( + from_glib_full(ffi::gst_registry_lookup_feature( self.to_glib_none().0, name.to_glib_none().0, )) @@ -165,9 +161,9 @@ impl Registry { pub fn plugin_filter bool>(&self, filter: P, first: bool) -> Vec { let filter_data: P = filter; unsafe extern "C" fn filter_func bool>( - plugin: *mut gst_sys::GstPlugin, - user_data: glib_sys::gpointer, - ) -> glib_sys::gboolean { + plugin: *mut ffi::GstPlugin, + user_data: glib::ffi::gpointer, + ) -> glib::ffi::gboolean { let plugin = from_glib_borrow(plugin); let callback: *mut P = user_data as *const _ as usize as *mut P; let res = (*callback)(&plugin); @@ -176,7 +172,7 @@ impl Registry { let filter = Some(filter_func::

as _); let super_callback0: &P = &filter_data; unsafe { - FromGlibPtrContainer::from_glib_full(gst_sys::gst_registry_plugin_filter( + FromGlibPtrContainer::from_glib_full(ffi::gst_registry_plugin_filter( self.to_glib_none().0, filter, first.to_glib(), @@ -187,7 +183,7 @@ impl Registry { pub fn remove_feature>(&self, feature: &P) { unsafe { - gst_sys::gst_registry_remove_feature( + ffi::gst_registry_remove_feature( self.to_glib_none().0, feature.as_ref().to_glib_none().0, ); @@ -196,13 +192,13 @@ impl Registry { pub fn remove_plugin(&self, plugin: &Plugin) { unsafe { - gst_sys::gst_registry_remove_plugin(self.to_glib_none().0, plugin.to_glib_none().0); + ffi::gst_registry_remove_plugin(self.to_glib_none().0, plugin.to_glib_none().0); } } pub fn scan_path>(&self, path: P) -> bool { unsafe { - from_glib(gst_sys::gst_registry_scan_path( + from_glib(ffi::gst_registry_scan_path( self.to_glib_none().0, path.as_ref().to_glib_none().0, )) @@ -211,7 +207,7 @@ impl Registry { pub fn get() -> Registry { assert_initialized_main_thread!(); - unsafe { from_glib_none(gst_sys::gst_registry_get()) } + unsafe { from_glib_none(ffi::gst_registry_get()) } } pub fn connect_feature_added( @@ -221,9 +217,9 @@ impl Registry { unsafe extern "C" fn feature_added_trampoline< F: Fn(&Registry, &PluginFeature) + Send + Sync + 'static, >( - this: *mut gst_sys::GstRegistry, - feature: *mut gst_sys::GstPluginFeature, - f: glib_sys::gpointer, + this: *mut ffi::GstRegistry, + feature: *mut ffi::GstPluginFeature, + f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f(&from_glib_borrow(this), &from_glib_borrow(feature)) @@ -248,9 +244,9 @@ impl Registry { unsafe extern "C" fn plugin_added_trampoline< F: Fn(&Registry, &Plugin) + Send + Sync + 'static, >( - this: *mut gst_sys::GstRegistry, - plugin: *mut gst_sys::GstPlugin, - f: glib_sys::gpointer, + this: *mut ffi::GstRegistry, + plugin: *mut ffi::GstPlugin, + f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f(&from_glib_borrow(this), &from_glib_borrow(plugin)) diff --git a/gstreamer/src/auto/stream.rs b/gstreamer/src/auto/stream.rs index 5b189d091..1f9cfb4dc 100644 --- a/gstreamer/src/auto/stream.rs +++ b/gstreamer/src/auto/stream.rs @@ -2,6 +2,19 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +#[cfg(any(feature = "v1_10", feature = "dox"))] +#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] +use crate::Caps; +use crate::Object; +#[cfg(any(feature = "v1_10", feature = "dox"))] +#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] +use crate::StreamFlags; +#[cfg(any(feature = "v1_10", feature = "dox"))] +#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] +use crate::StreamType; +#[cfg(any(feature = "v1_10", feature = "dox"))] +#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] +use crate::TagList; #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] use glib::object::ObjectType as ObjectType_; @@ -14,36 +27,16 @@ use glib::signal::SignalHandlerId; use glib::translate::*; #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] -use glib::GString; -#[cfg(any(feature = "v1_10", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] -use glib_sys; -use gst_sys; -#[cfg(any(feature = "v1_10", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] use std::boxed::Box as Box_; #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] use std::mem::transmute; -#[cfg(any(feature = "v1_10", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] -use Caps; -use Object; -#[cfg(any(feature = "v1_10", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] -use StreamFlags; -#[cfg(any(feature = "v1_10", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] -use StreamType; -#[cfg(any(feature = "v1_10", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] -use TagList; -glib_wrapper! { - pub struct Stream(Object) @extends Object; +glib::glib_wrapper! { + pub struct Stream(Object) @extends Object; match fn { - get_type => || gst_sys::gst_stream_get_type(), + get_type => || ffi::gst_stream_get_type(), } } @@ -51,38 +44,38 @@ impl Stream { #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] pub fn get_caps(&self) -> Option { - unsafe { from_glib_full(gst_sys::gst_stream_get_caps(self.to_glib_none().0)) } + unsafe { from_glib_full(ffi::gst_stream_get_caps(self.to_glib_none().0)) } } #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] pub fn get_stream_flags(&self) -> StreamFlags { - unsafe { from_glib(gst_sys::gst_stream_get_stream_flags(self.to_glib_none().0)) } + unsafe { from_glib(ffi::gst_stream_get_stream_flags(self.to_glib_none().0)) } } #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] - pub fn get_stream_id(&self) -> Option { - unsafe { from_glib_none(gst_sys::gst_stream_get_stream_id(self.to_glib_none().0)) } + pub fn get_stream_id(&self) -> Option { + unsafe { from_glib_none(ffi::gst_stream_get_stream_id(self.to_glib_none().0)) } } #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] pub fn get_stream_type(&self) -> StreamType { - unsafe { from_glib(gst_sys::gst_stream_get_stream_type(self.to_glib_none().0)) } + unsafe { from_glib(ffi::gst_stream_get_stream_type(self.to_glib_none().0)) } } #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] pub fn get_tags(&self) -> Option { - unsafe { from_glib_full(gst_sys::gst_stream_get_tags(self.to_glib_none().0)) } + unsafe { from_glib_full(ffi::gst_stream_get_tags(self.to_glib_none().0)) } } #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] pub fn set_caps(&self, caps: Option<&Caps>) { unsafe { - gst_sys::gst_stream_set_caps(self.to_glib_none().0, caps.to_glib_none().0); + ffi::gst_stream_set_caps(self.to_glib_none().0, caps.to_glib_none().0); } } @@ -90,7 +83,7 @@ impl Stream { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] pub fn set_stream_flags(&self, flags: StreamFlags) { unsafe { - gst_sys::gst_stream_set_stream_flags(self.to_glib_none().0, flags.to_glib()); + ffi::gst_stream_set_stream_flags(self.to_glib_none().0, flags.to_glib()); } } @@ -98,7 +91,7 @@ impl Stream { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] pub fn set_stream_type(&self, stream_type: StreamType) { unsafe { - gst_sys::gst_stream_set_stream_type(self.to_glib_none().0, stream_type.to_glib()); + ffi::gst_stream_set_stream_type(self.to_glib_none().0, stream_type.to_glib()); } } @@ -106,7 +99,7 @@ impl Stream { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] pub fn set_tags(&self, tags: Option<&TagList>) { unsafe { - gst_sys::gst_stream_set_tags(self.to_glib_none().0, tags.to_glib_none().0); + ffi::gst_stream_set_tags(self.to_glib_none().0, tags.to_glib_none().0); } } @@ -117,9 +110,9 @@ impl Stream { f: F, ) -> SignalHandlerId { unsafe extern "C" fn notify_caps_trampoline( - this: *mut gst_sys::GstStream, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstStream, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f(&from_glib_borrow(this)) @@ -146,9 +139,9 @@ impl Stream { unsafe extern "C" fn notify_stream_flags_trampoline< F: Fn(&Stream) + Send + Sync + 'static, >( - this: *mut gst_sys::GstStream, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstStream, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f(&from_glib_borrow(this)) @@ -175,9 +168,9 @@ impl Stream { unsafe extern "C" fn notify_stream_type_trampoline< F: Fn(&Stream) + Send + Sync + 'static, >( - this: *mut gst_sys::GstStream, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstStream, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f(&from_glib_borrow(this)) @@ -202,9 +195,9 @@ impl Stream { f: F, ) -> SignalHandlerId { unsafe extern "C" fn notify_tags_trampoline( - this: *mut gst_sys::GstStream, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstStream, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f(&from_glib_borrow(this)) diff --git a/gstreamer/src/auto/stream_collection.rs b/gstreamer/src/auto/stream_collection.rs index 93c82737a..7c6b2bbf3 100644 --- a/gstreamer/src/auto/stream_collection.rs +++ b/gstreamer/src/auto/stream_collection.rs @@ -2,21 +2,17 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use crate::Object; +#[cfg(any(feature = "v1_10", feature = "dox"))] +#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] +use crate::Stream; use glib::translate::*; -#[cfg(any(feature = "v1_10", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] -use glib::GString; -use gst_sys; -use Object; -#[cfg(any(feature = "v1_10", feature = "dox"))] -#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] -use Stream; -glib_wrapper! { - pub struct StreamCollection(Object) @extends Object; +glib::glib_wrapper! { + pub struct StreamCollection(Object) @extends Object; match fn { - get_type => || gst_sys::gst_stream_collection_get_type(), + get_type => || ffi::gst_stream_collection_get_type(), } } @@ -24,14 +20,14 @@ impl StreamCollection { #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] pub fn get_size(&self) -> u32 { - unsafe { gst_sys::gst_stream_collection_get_size(self.to_glib_none().0) } + unsafe { ffi::gst_stream_collection_get_size(self.to_glib_none().0) } } #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] pub fn get_stream(&self, index: u32) -> Option { unsafe { - from_glib_none(gst_sys::gst_stream_collection_get_stream( + from_glib_none(ffi::gst_stream_collection_get_stream( self.to_glib_none().0, index, )) @@ -40,9 +36,9 @@ impl StreamCollection { #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] - pub fn get_upstream_id(&self) -> Option { + pub fn get_upstream_id(&self) -> Option { unsafe { - from_glib_none(gst_sys::gst_stream_collection_get_upstream_id( + from_glib_none(ffi::gst_stream_collection_get_upstream_id( self.to_glib_none().0, )) } diff --git a/gstreamer/src/auto/system_clock.rs b/gstreamer/src/auto/system_clock.rs index 320ee01da..42cf4ddbe 100644 --- a/gstreamer/src/auto/system_clock.rs +++ b/gstreamer/src/auto/system_clock.rs @@ -2,6 +2,9 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use crate::Clock; +use crate::ClockType; +use crate::Object; use glib::object::Cast; use glib::object::IsA; use glib::signal::connect_raw; @@ -9,33 +12,27 @@ use glib::signal::SignalHandlerId; use glib::translate::*; use glib::StaticType; use glib::Value; -use glib_sys; -use gobject_sys; -use gst_sys; use std::boxed::Box as Box_; use std::mem::transmute; -use Clock; -use ClockType; -use Object; -glib_wrapper! { - pub struct SystemClock(Object) @extends Clock, Object; +glib::glib_wrapper! { + pub struct SystemClock(Object) @extends Clock, Object; match fn { - get_type => || gst_sys::gst_system_clock_get_type(), + get_type => || ffi::gst_system_clock_get_type(), } } impl SystemClock { pub fn obtain() -> Clock { assert_initialized_main_thread!(); - unsafe { from_glib_full(gst_sys::gst_system_clock_obtain()) } + unsafe { from_glib_full(ffi::gst_system_clock_obtain()) } } pub fn set_default>(new_clock: Option<&P>) { assert_initialized_main_thread!(); unsafe { - gst_sys::gst_system_clock_set_default(new_clock.map(|p| p.as_ref()).to_glib_none().0); + ffi::gst_system_clock_set_default(new_clock.map(|p| p.as_ref()).to_glib_none().0); } } } @@ -60,8 +57,8 @@ impl> SystemClockExt for O { fn get_property_clock_type(&self) -> ClockType { unsafe { let mut value = Value::from_type(::static_type()); - gobject_sys::g_object_get_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_get_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"clock-type\0".as_ptr() as *const _, value.to_glib_none_mut().0, ); @@ -74,8 +71,8 @@ impl> SystemClockExt for O { fn set_property_clock_type(&self, clock_type: ClockType) { unsafe { - gobject_sys::g_object_set_property( - self.to_glib_none().0 as *mut gobject_sys::GObject, + glib::gobject_ffi::g_object_set_property( + self.to_glib_none().0 as *mut glib::gobject_ffi::GObject, b"clock-type\0".as_ptr() as *const _, Value::from(&clock_type).to_glib_none().0, ); @@ -87,9 +84,9 @@ impl> SystemClockExt for O { f: F, ) -> SignalHandlerId { unsafe extern "C" fn notify_clock_type_trampoline( - this: *mut gst_sys::GstSystemClock, - _param_spec: glib_sys::gpointer, - f: glib_sys::gpointer, + this: *mut ffi::GstSystemClock, + _param_spec: glib::ffi::gpointer, + f: glib::ffi::gpointer, ) where P: IsA, { diff --git a/gstreamer/src/auto/tag_setter.rs b/gstreamer/src/auto/tag_setter.rs index 104089d94..4f6158fbc 100644 --- a/gstreamer/src/auto/tag_setter.rs +++ b/gstreamer/src/auto/tag_setter.rs @@ -2,19 +2,18 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use crate::Element; +use crate::Object; +use crate::TagList; +use crate::TagMergeMode; use glib::object::IsA; use glib::translate::*; -use gst_sys; -use Element; -use Object; -use TagList; -use TagMergeMode; -glib_wrapper! { - pub struct TagSetter(Interface) @requires Element, Object; +glib::glib_wrapper! { + pub struct TagSetter(Interface) @requires Element, Object; match fn { - get_type => || gst_sys::gst_tag_setter_get_type(), + get_type => || ffi::gst_tag_setter_get_type(), } } @@ -45,24 +44,24 @@ pub trait TagSetterExt: 'static { impl> TagSetterExt for O { //fn add_tag_valist(&self, mode: TagMergeMode, tag: &str, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported) { - // unsafe { TODO: call gst_sys:gst_tag_setter_add_tag_valist() } + // unsafe { TODO: call ffi:gst_tag_setter_add_tag_valist() } //} //fn add_tag_valist_values(&self, mode: TagMergeMode, tag: &str, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported) { - // unsafe { TODO: call gst_sys:gst_tag_setter_add_tag_valist_values() } + // unsafe { TODO: call ffi:gst_tag_setter_add_tag_valist_values() } //} //fn add_tag_values(&self, mode: TagMergeMode, tag: &str, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) { - // unsafe { TODO: call gst_sys:gst_tag_setter_add_tag_values() } + // unsafe { TODO: call ffi:gst_tag_setter_add_tag_values() } //} //fn add_tags(&self, mode: TagMergeMode, tag: &str, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) { - // unsafe { TODO: call gst_sys:gst_tag_setter_add_tags() } + // unsafe { TODO: call ffi:gst_tag_setter_add_tags() } //} fn get_tag_list(&self) -> Option { unsafe { - from_glib_none(gst_sys::gst_tag_setter_get_tag_list( + from_glib_none(ffi::gst_tag_setter_get_tag_list( self.as_ref().to_glib_none().0, )) } @@ -70,7 +69,7 @@ impl> TagSetterExt for O { fn get_tag_merge_mode(&self) -> TagMergeMode { unsafe { - from_glib(gst_sys::gst_tag_setter_get_tag_merge_mode( + from_glib(ffi::gst_tag_setter_get_tag_merge_mode( self.as_ref().to_glib_none().0, )) } @@ -78,7 +77,7 @@ impl> TagSetterExt for O { fn merge_tags(&self, list: &TagList, mode: TagMergeMode) { unsafe { - gst_sys::gst_tag_setter_merge_tags( + ffi::gst_tag_setter_merge_tags( self.as_ref().to_glib_none().0, list.to_glib_none().0, mode.to_glib(), @@ -88,16 +87,13 @@ impl> TagSetterExt for O { fn reset_tags(&self) { unsafe { - gst_sys::gst_tag_setter_reset_tags(self.as_ref().to_glib_none().0); + ffi::gst_tag_setter_reset_tags(self.as_ref().to_glib_none().0); } } fn set_tag_merge_mode(&self, mode: TagMergeMode) { unsafe { - gst_sys::gst_tag_setter_set_tag_merge_mode( - self.as_ref().to_glib_none().0, - mode.to_glib(), - ); + ffi::gst_tag_setter_set_tag_merge_mode(self.as_ref().to_glib_none().0, mode.to_glib()); } } } diff --git a/gstreamer/src/auto/toc_setter.rs b/gstreamer/src/auto/toc_setter.rs index 5fca13c4b..7fb8bf13c 100644 --- a/gstreamer/src/auto/toc_setter.rs +++ b/gstreamer/src/auto/toc_setter.rs @@ -2,18 +2,17 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use crate::Element; +use crate::Object; +use crate::Toc; use glib::object::IsA; use glib::translate::*; -use gst_sys; -use Element; -use Object; -use Toc; -glib_wrapper! { - pub struct TocSetter(Interface) @requires Element, Object; +glib::glib_wrapper! { + pub struct TocSetter(Interface) @requires Element, Object; match fn { - get_type => || gst_sys::gst_toc_setter_get_type(), + get_type => || ffi::gst_toc_setter_get_type(), } } @@ -32,22 +31,18 @@ pub trait TocSetterExt: 'static { impl> TocSetterExt for O { fn get_toc(&self) -> Option { - unsafe { - from_glib_full(gst_sys::gst_toc_setter_get_toc( - self.as_ref().to_glib_none().0, - )) - } + unsafe { from_glib_full(ffi::gst_toc_setter_get_toc(self.as_ref().to_glib_none().0)) } } fn reset(&self) { unsafe { - gst_sys::gst_toc_setter_reset(self.as_ref().to_glib_none().0); + ffi::gst_toc_setter_reset(self.as_ref().to_glib_none().0); } } fn set_toc(&self, toc: Option<&Toc>) { unsafe { - gst_sys::gst_toc_setter_set_toc(self.as_ref().to_glib_none().0, toc.to_glib_none().0); + ffi::gst_toc_setter_set_toc(self.as_ref().to_glib_none().0, toc.to_glib_none().0); } } } diff --git a/gstreamer/src/auto/type_find_factory.rs b/gstreamer/src/auto/type_find_factory.rs index 760362c13..eac82fe6a 100644 --- a/gstreamer/src/auto/type_find_factory.rs +++ b/gstreamer/src/auto/type_find_factory.rs @@ -2,37 +2,31 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT +use crate::Caps; +use crate::Object; +use crate::PluginFeature; use glib::translate::*; -use glib::GString; -use gst_sys; -use Caps; -use Object; -use PluginFeature; -glib_wrapper! { - pub struct TypeFindFactory(Object) @extends PluginFeature, Object; +glib::glib_wrapper! { + pub struct TypeFindFactory(Object) @extends PluginFeature, Object; match fn { - get_type => || gst_sys::gst_type_find_factory_get_type(), + get_type => || ffi::gst_type_find_factory_get_type(), } } impl TypeFindFactory { //pub fn call_function(&self, find: /*Ignored*/&mut TypeFind) { - // unsafe { TODO: call gst_sys:gst_type_find_factory_call_function() } + // unsafe { TODO: call ffi:gst_type_find_factory_call_function() } //} pub fn get_caps(&self) -> Option { - unsafe { - from_glib_none(gst_sys::gst_type_find_factory_get_caps( - self.to_glib_none().0, - )) - } + unsafe { from_glib_none(ffi::gst_type_find_factory_get_caps(self.to_glib_none().0)) } } - pub fn get_extensions(&self) -> Vec { + pub fn get_extensions(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_none(gst_sys::gst_type_find_factory_get_extensions( + FromGlibPtrContainer::from_glib_none(ffi::gst_type_find_factory_get_extensions( self.to_glib_none().0, )) } @@ -40,7 +34,7 @@ impl TypeFindFactory { pub fn has_function(&self) -> bool { unsafe { - from_glib(gst_sys::gst_type_find_factory_has_function( + from_glib(ffi::gst_type_find_factory_has_function( self.to_glib_none().0, )) } @@ -48,7 +42,7 @@ impl TypeFindFactory { pub fn get_list() -> Vec { assert_initialized_main_thread!(); - unsafe { FromGlibPtrContainer::from_glib_full(gst_sys::gst_type_find_factory_get_list()) } + unsafe { FromGlibPtrContainer::from_glib_full(ffi::gst_type_find_factory_get_list()) } } } diff --git a/gstreamer/src/auto/uri_handler.rs b/gstreamer/src/auto/uri_handler.rs index 960bfcf89..e604d7533 100644 --- a/gstreamer/src/auto/uri_handler.rs +++ b/gstreamer/src/auto/uri_handler.rs @@ -2,19 +2,16 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -use glib; +use crate::URIType; use glib::object::IsA; use glib::translate::*; -use glib::GString; -use gst_sys; use std::ptr; -use URIType; -glib_wrapper! { - pub struct URIHandler(Interface); +glib::glib_wrapper! { + pub struct URIHandler(Interface); match fn { - get_type => || gst_sys::gst_uri_handler_get_type(), + get_type => || ffi::gst_uri_handler_get_type(), } } @@ -24,9 +21,9 @@ unsafe impl Sync for URIHandler {} pub const NONE_URI_HANDLER: Option<&URIHandler> = None; pub trait URIHandlerExt: 'static { - fn get_protocols(&self) -> Vec; + fn get_protocols(&self) -> Vec; - fn get_uri(&self) -> Option; + fn get_uri(&self) -> Option; fn get_uri_type(&self) -> URIType; @@ -34,25 +31,21 @@ pub trait URIHandlerExt: 'static { } impl> URIHandlerExt for O { - fn get_protocols(&self) -> Vec { + fn get_protocols(&self) -> Vec { unsafe { - FromGlibPtrContainer::from_glib_none(gst_sys::gst_uri_handler_get_protocols( + FromGlibPtrContainer::from_glib_none(ffi::gst_uri_handler_get_protocols( self.as_ref().to_glib_none().0, )) } } - fn get_uri(&self) -> Option { - unsafe { - from_glib_full(gst_sys::gst_uri_handler_get_uri( - self.as_ref().to_glib_none().0, - )) - } + fn get_uri(&self) -> Option { + unsafe { from_glib_full(ffi::gst_uri_handler_get_uri(self.as_ref().to_glib_none().0)) } } fn get_uri_type(&self) -> URIType { unsafe { - from_glib(gst_sys::gst_uri_handler_get_uri_type( + from_glib(ffi::gst_uri_handler_get_uri_type( self.as_ref().to_glib_none().0, )) } @@ -61,7 +54,7 @@ impl> URIHandlerExt for O { fn set_uri(&self, uri: &str) -> Result<(), glib::Error> { unsafe { let mut error = ptr::null_mut(); - let _ = gst_sys::gst_uri_handler_set_uri( + let _ = ffi::gst_uri_handler_set_uri( self.as_ref().to_glib_none().0, uri.to_glib_none().0, &mut error, diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt index bdfc6f381..f7a42b211 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 @ 062b3d6) -from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5) +Generated by gir (https://github.com/gtk-rs/gir @ 694b4b8) +from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)