Update and regenerate everything with latest gir

This commit is contained in:
Sebastian Dröge 2019-10-05 00:03:57 +03:00
parent d2930aed0b
commit 991f2e1576
23 changed files with 75 additions and 38 deletions

2
gir

@ -1 +1 @@
Subproject commit 11e59a0b62e276ae4378343ffd84bf6aafa20a3d Subproject commit 7cca8164f3166ba73ce74f02400cb151b963e2d2

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -2,7 +2,7 @@
// from gir-files (https://github.com/gtk-rs/gir-files) // from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT // DO NOT EDIT
#[cfg(feature = "futures")] #[cfg(any(feature = "futures", feature = "dox"))]
use futures::future; use futures::future;
use ges_sys; use ges_sys;
use gio; use gio;
@ -13,6 +13,7 @@ use glib::object::IsA;
use glib::signal::connect_raw; use glib::signal::connect_raw;
use glib::signal::SignalHandlerId; use glib::signal::SignalHandlerId;
use glib::translate::*; use glib::translate::*;
use glib::value::SetValueOptional;
use glib::GString; use glib::GString;
use glib::Value; use glib::Value;
use glib_sys; use glib_sys;
@ -72,7 +73,7 @@ impl Asset {
callback: Q, callback: Q,
) { ) {
assert_initialized_main_thread!(); assert_initialized_main_thread!();
let user_data: Box<Q> = Box::new(callback); let user_data: Box_<Q> = Box_::new(callback);
unsafe extern "C" fn request_async_trampoline< unsafe extern "C" fn request_async_trampoline<
Q: FnOnce(Result<Asset, Error>) + Send + 'static, Q: FnOnce(Result<Asset, Error>) + Send + 'static,
>( >(
@ -87,7 +88,7 @@ impl Asset {
} else { } else {
Err(from_glib_full(error)) Err(from_glib_full(error))
}; };
let callback: Box<Q> = Box::from_raw(user_data as *mut _); let callback: Box_<Q> = Box_::from_raw(user_data as *mut _);
callback(result); callback(result);
} }
let callback = request_async_trampoline::<Q>; let callback = request_async_trampoline::<Q>;
@ -97,12 +98,12 @@ impl Asset {
id.to_glib_none().0, id.to_glib_none().0,
cancellable.map(|p| p.as_ref()).to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0,
Some(callback), Some(callback),
Box::into_raw(user_data) as *mut _, Box_::into_raw(user_data) as *mut _,
); );
} }
} }
#[cfg(feature = "futures")] #[cfg(any(feature = "futures", feature = "dox"))]
pub fn request_async_future( pub fn request_async_future(
extractable_type: glib::types::Type, extractable_type: glib::types::Type,
id: &str, id: &str,
@ -144,7 +145,7 @@ pub trait AssetExt: 'static {
fn unproxy<P: IsA<Asset>>(&self, proxy: &P) -> Result<(), glib::error::BoolError>; fn unproxy<P: IsA<Asset>>(&self, proxy: &P) -> Result<(), glib::error::BoolError>;
fn set_property_proxy_target(&self, proxy_target: Option<&Asset>); fn set_property_proxy_target<P: IsA<Asset> + SetValueOptional>(&self, proxy_target: Option<&P>);
fn connect_property_proxy_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId; fn connect_property_proxy_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
@ -225,7 +226,10 @@ impl<O: IsA<Asset>> AssetExt for O {
} }
} }
fn set_property_proxy_target(&self, proxy_target: Option<&Asset>) { fn set_property_proxy_target<P: IsA<Asset> + SetValueOptional>(
&self,
proxy_target: Option<&P>,
) {
unsafe { unsafe {
gobject_sys::g_object_set_property( gobject_sys::g_object_set_property(
self.to_glib_none().0 as *mut gobject_sys::GObject, self.to_glib_none().0 as *mut gobject_sys::GObject,

View file

@ -9,6 +9,7 @@ use glib::object::IsA;
use glib::signal::connect_raw; use glib::signal::connect_raw;
use glib::signal::SignalHandlerId; use glib::signal::SignalHandlerId;
use glib::translate::*; use glib::translate::*;
use glib::value::SetValueOptional;
use glib::StaticType; use glib::StaticType;
use glib::Value; use glib::Value;
use glib_sys; use glib_sys;
@ -80,21 +81,33 @@ pub trait GESPipelineExt: 'static {
fn get_property_audio_filter(&self) -> Option<gst::Element>; fn get_property_audio_filter(&self) -> Option<gst::Element>;
fn set_property_audio_filter(&self, audio_filter: Option<&gst::Element>); fn set_property_audio_filter<P: IsA<gst::Element> + SetValueOptional>(
&self,
audio_filter: Option<&P>,
);
fn get_property_audio_sink(&self) -> Option<gst::Element>; fn get_property_audio_sink(&self) -> Option<gst::Element>;
fn set_property_audio_sink(&self, audio_sink: Option<&gst::Element>); fn set_property_audio_sink<P: IsA<gst::Element> + SetValueOptional>(
&self,
audio_sink: Option<&P>,
);
fn get_property_timeline(&self) -> Option<Timeline>; fn get_property_timeline(&self) -> Option<Timeline>;
fn get_property_video_filter(&self) -> Option<gst::Element>; fn get_property_video_filter(&self) -> Option<gst::Element>;
fn set_property_video_filter(&self, video_filter: Option<&gst::Element>); fn set_property_video_filter<P: IsA<gst::Element> + SetValueOptional>(
&self,
video_filter: Option<&P>,
);
fn get_property_video_sink(&self) -> Option<gst::Element>; fn get_property_video_sink(&self) -> Option<gst::Element>;
fn set_property_video_sink(&self, video_sink: Option<&gst::Element>); fn set_property_video_sink<P: IsA<gst::Element> + SetValueOptional>(
&self,
video_sink: Option<&P>,
);
fn connect_property_audio_filter_notify<F: Fn(&Self) + 'static>(&self, f: F) fn connect_property_audio_filter_notify<F: Fn(&Self) + 'static>(&self, f: F)
-> SignalHandlerId; -> SignalHandlerId;
@ -250,7 +263,10 @@ impl<O: IsA<Pipeline>> GESPipelineExt for O {
} }
} }
fn set_property_audio_filter(&self, audio_filter: Option<&gst::Element>) { fn set_property_audio_filter<P: IsA<gst::Element> + SetValueOptional>(
&self,
audio_filter: Option<&P>,
) {
unsafe { unsafe {
gobject_sys::g_object_set_property( gobject_sys::g_object_set_property(
self.to_glib_none().0 as *mut gobject_sys::GObject, self.to_glib_none().0 as *mut gobject_sys::GObject,
@ -274,7 +290,10 @@ impl<O: IsA<Pipeline>> GESPipelineExt for O {
} }
} }
fn set_property_audio_sink(&self, audio_sink: Option<&gst::Element>) { fn set_property_audio_sink<P: IsA<gst::Element> + SetValueOptional>(
&self,
audio_sink: Option<&P>,
) {
unsafe { unsafe {
gobject_sys::g_object_set_property( gobject_sys::g_object_set_property(
self.to_glib_none().0 as *mut gobject_sys::GObject, self.to_glib_none().0 as *mut gobject_sys::GObject,
@ -312,7 +331,10 @@ impl<O: IsA<Pipeline>> GESPipelineExt for O {
} }
} }
fn set_property_video_filter(&self, video_filter: Option<&gst::Element>) { fn set_property_video_filter<P: IsA<gst::Element> + SetValueOptional>(
&self,
video_filter: Option<&P>,
) {
unsafe { unsafe {
gobject_sys::g_object_set_property( gobject_sys::g_object_set_property(
self.to_glib_none().0 as *mut gobject_sys::GObject, self.to_glib_none().0 as *mut gobject_sys::GObject,
@ -336,7 +358,10 @@ impl<O: IsA<Pipeline>> GESPipelineExt for O {
} }
} }
fn set_property_video_sink(&self, video_sink: Option<&gst::Element>) { fn set_property_video_sink<P: IsA<gst::Element> + SetValueOptional>(
&self,
video_sink: Option<&P>,
) {
unsafe { unsafe {
gobject_sys::g_object_set_property( gobject_sys::g_object_set_property(
self.to_glib_none().0 as *mut gobject_sys::GObject, self.to_glib_none().0 as *mut gobject_sys::GObject,

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -2,10 +2,12 @@
// from gir-files (https://github.com/gtk-rs/gir-files) // from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT // DO NOT EDIT
use glib::object::IsA;
use glib::object::ObjectType as ObjectType_; use glib::object::ObjectType as ObjectType_;
use glib::signal::connect_raw; use glib::signal::connect_raw;
use glib::signal::SignalHandlerId; use glib::signal::SignalHandlerId;
use glib::translate::*; use glib::translate::*;
use glib::value::SetValueOptional;
use glib::GString; use glib::GString;
use glib::StaticType; use glib::StaticType;
use glib::Value; use glib::Value;
@ -76,7 +78,7 @@ impl NetClientClock {
} }
} }
pub fn set_property_bus(&self, bus: Option<&gst::Bus>) { pub fn set_property_bus<P: IsA<gst::Bus> + SetValueOptional>(&self, bus: Option<&P>) {
unsafe { unsafe {
gobject_sys::g_object_set_property( gobject_sys::g_object_set_property(
self.as_ptr() as *mut gobject_sys::GObject, self.as_ptr() as *mut gobject_sys::GObject,

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -2,10 +2,12 @@
// from gir-files (https://github.com/gtk-rs/gir-files) // from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT // DO NOT EDIT
use glib::object::IsA;
use glib::object::ObjectType as ObjectType_; use glib::object::ObjectType as ObjectType_;
use glib::signal::connect_raw; use glib::signal::connect_raw;
use glib::signal::SignalHandlerId; use glib::signal::SignalHandlerId;
use glib::translate::*; use glib::translate::*;
use glib::value::SetValueOptional;
use glib::StaticType; use glib::StaticType;
use glib::Value; use glib::Value;
use glib_sys; use glib_sys;
@ -87,7 +89,10 @@ impl PlayerVideoOverlayVideoRenderer {
} }
} }
pub fn set_property_video_sink(&self, video_sink: Option<&gst::Element>) { pub fn set_property_video_sink<P: IsA<gst::Element> + SetValueOptional>(
&self,
video_sink: Option<&P>,
) {
unsafe { unsafe {
gobject_sys::g_object_set_property( gobject_sys::g_object_set_property(
self.as_ptr() as *mut gobject_sys::GObject, self.as_ptr() as *mut gobject_sys::GObject,

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -15,6 +15,7 @@ use glib_sys;
#[cfg(any(feature = "v1_12", feature = "dox"))] #[cfg(any(feature = "v1_12", feature = "dox"))]
use gst_rtsp; use gst_rtsp;
use gst_rtsp_server_sys; use gst_rtsp_server_sys;
#[cfg(any(feature = "v1_16", feature = "dox"))]
use std; use std;
use std::boxed::Box as Box_; use std::boxed::Box as Box_;
use std::mem::transmute; use std::mem::transmute;

View file

@ -178,7 +178,7 @@ impl<O: IsA<RTSPStreamTransport>> RTSPStreamTransportExt for O {
//} //}
fn set_keepalive<P: Fn() + 'static>(&self, keep_alive: P) { fn set_keepalive<P: Fn() + 'static>(&self, keep_alive: P) {
let keep_alive_data: Box_<P> = Box::new(keep_alive); let keep_alive_data: Box_<P> = Box_::new(keep_alive);
unsafe extern "C" fn keep_alive_func<P: Fn() + 'static>(user_data: glib_sys::gpointer) { unsafe extern "C" fn keep_alive_func<P: Fn() + 'static>(user_data: glib_sys::gpointer) {
let callback: &P = &*(user_data as *mut _); let callback: &P = &*(user_data as *mut _);
(*callback)(); (*callback)();
@ -193,7 +193,7 @@ impl<O: IsA<RTSPStreamTransport>> RTSPStreamTransportExt for O {
gst_rtsp_server_sys::gst_rtsp_stream_transport_set_keepalive( gst_rtsp_server_sys::gst_rtsp_stream_transport_set_keepalive(
self.as_ref().to_glib_none().0, self.as_ref().to_glib_none().0,
keep_alive, keep_alive,
Box::into_raw(super_callback0) as *mut _, Box_::into_raw(super_callback0) as *mut _,
destroy_call3, destroy_call3,
); );
} }
@ -205,7 +205,7 @@ impl<O: IsA<RTSPStreamTransport>> RTSPStreamTransportExt for O {
//} //}
fn set_message_sent<P: Fn() + 'static>(&self, message_sent: P) { fn set_message_sent<P: Fn() + 'static>(&self, message_sent: P) {
let message_sent_data: Box_<P> = Box::new(message_sent); let message_sent_data: Box_<P> = Box_::new(message_sent);
unsafe extern "C" fn message_sent_func<P: Fn() + 'static>(user_data: glib_sys::gpointer) { unsafe extern "C" fn message_sent_func<P: Fn() + 'static>(user_data: glib_sys::gpointer) {
let callback: &P = &*(user_data as *mut _); let callback: &P = &*(user_data as *mut _);
(*callback)(); (*callback)();
@ -220,7 +220,7 @@ impl<O: IsA<RTSPStreamTransport>> RTSPStreamTransportExt for O {
gst_rtsp_server_sys::gst_rtsp_stream_transport_set_message_sent( gst_rtsp_server_sys::gst_rtsp_stream_transport_set_message_sent(
self.as_ref().to_glib_none().0, self.as_ref().to_glib_none().0,
message_sent, message_sent,
Box::into_raw(super_callback0) as *mut _, Box_::into_raw(super_callback0) as *mut _,
destroy_call3, destroy_call3,
); );
} }

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)

View file

@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 11e59a0) Generated by gir (https://github.com/gtk-rs/gir @ 7cca816)
from gir-files (https://github.com/gtk-rs/gir-files @ ???) from gir-files (https://github.com/gtk-rs/gir-files @ ???)