Commit b792f4b5 authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

Regenerate with latest gir and configure default concurrency to send+sync

parent e41fb76d
......@@ -18,7 +18,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "glib"
version = "0.1.3"
source = "git+https://github.com/gtk-rs/glib#46658ce0f51fa8f46468720cb3f2d03cef4e4b93"
source = "git+https://github.com/gtk-rs/glib#d3aed89e92d6162f385b699ccd546ee799612c93"
dependencies = [
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)",
......@@ -51,7 +51,7 @@ dependencies = [
[[package]]
name = "gstreamer-sys"
version = "0.1.1"
source = "git+https://github.com/sdroege/gstreamer-sys#01d79cc53ccdb1b06b09656fde04f3868c9dc246"
source = "git+https://github.com/sdroege/gstreamer-sys#0d5b1c60a6d74150a55de4b5f980e09dd67014f2"
dependencies = [
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)",
......
......@@ -5,6 +5,7 @@ version = "1.0"
min_cfg_version = "1.0"
target_path = "gstreamer"
work_mode = "normal"
concurrency = "send+sync"
external_libraries = [
"GLib",
......
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
pub type ClockTime = u64;
......
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
use Element;
......@@ -35,6 +35,9 @@ impl Bin {
}
}
unsafe impl Send for Bin {}
unsafe impl Sync for Bin {}
pub trait BinExt {
fn add<P: IsA<Element>>(&self, element: &P) -> Result<(), glib::error::BoolError>;
......@@ -84,16 +87,16 @@ pub trait BinExt {
fn set_property_message_forward(&self, message_forward: bool);
#[cfg(feature = "v1_10")]
fn connect_deep_element_added<F: Fn(&Self, &Bin, &Element) + 'static>(&self, f: F) -> u64;
fn connect_deep_element_added<F: Fn(&Self, &Bin, &Element) + Send + Sync + 'static>(&self, f: F) -> u64;
#[cfg(feature = "v1_10")]
fn connect_deep_element_removed<F: Fn(&Self, &Bin, &Element) + 'static>(&self, f: F) -> u64;
fn connect_deep_element_removed<F: Fn(&Self, &Bin, &Element) + Send + Sync + 'static>(&self, f: F) -> u64;
fn connect_do_latency<F: Fn(&Self) -> bool + 'static>(&self, f: F) -> u64;
fn connect_do_latency<F: Fn(&Self) -> bool + Send + Sync + 'static>(&self, f: F) -> u64;
fn connect_element_added<F: Fn(&Self, &Element) + 'static>(&self, f: F) -> u64;
fn connect_element_added<F: Fn(&Self, &Element) + Send + Sync + 'static>(&self, f: F) -> u64;
fn connect_element_removed<F: Fn(&Self, &Element) + 'static>(&self, f: F) -> u64;
fn connect_element_removed<F: Fn(&Self, &Element) + Send + Sync + 'static>(&self, f: F) -> u64;
}
impl<O: IsA<Bin> + IsA<glib::object::Object>> BinExt for O {
......@@ -217,42 +220,42 @@ impl<O: IsA<Bin> + IsA<glib::object::Object>> BinExt for O {
}
#[cfg(feature = "v1_10")]
fn connect_deep_element_added<F: Fn(&Self, &Bin, &Element) + 'static>(&self, f: F) -> u64 {
fn connect_deep_element_added<F: Fn(&Self, &Bin, &Element) + Send + Sync + 'static>(&self, f: F) -> u64 {
unsafe {
let f: Box_<Box_<Fn(&Self, &Bin, &Element) + 'static>> = Box_::new(Box_::new(f));
let f: Box_<Box_<Fn(&Self, &Bin, &Element) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
connect(self.to_glib_none().0, "deep-element-added",
transmute(deep_element_added_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
}
}
#[cfg(feature = "v1_10")]
fn connect_deep_element_removed<F: Fn(&Self, &Bin, &Element) + 'static>(&self, f: F) -> u64 {
fn connect_deep_element_removed<F: Fn(&Self, &Bin, &Element) + Send + Sync + 'static>(&self, f: F) -> u64 {
unsafe {
let f: Box_<Box_<Fn(&Self, &Bin, &Element) + 'static>> = Box_::new(Box_::new(f));
let f: Box_<Box_<Fn(&Self, &Bin, &Element) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
connect(self.to_glib_none().0, "deep-element-removed",
transmute(deep_element_removed_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
}
}
fn connect_do_latency<F: Fn(&Self) -> bool + 'static>(&self, f: F) -> u64 {
fn connect_do_latency<F: Fn(&Self) -> bool + Send + Sync + 'static>(&self, f: F) -> u64 {
unsafe {
let f: Box_<Box_<Fn(&Self) -> bool + 'static>> = Box_::new(Box_::new(f));
let f: Box_<Box_<Fn(&Self) -> bool + Send + Sync + 'static>> = Box_::new(Box_::new(f));
connect(self.to_glib_none().0, "do-latency",
transmute(do_latency_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
}
}
fn connect_element_added<F: Fn(&Self, &Element) + 'static>(&self, f: F) -> u64 {
fn connect_element_added<F: Fn(&Self, &Element) + Send + Sync + 'static>(&self, f: F) -> u64 {
unsafe {
let f: Box_<Box_<Fn(&Self, &Element) + 'static>> = Box_::new(Box_::new(f));
let f: Box_<Box_<Fn(&Self, &Element) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
connect(self.to_glib_none().0, "element-added",
transmute(element_added_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
}
}
fn connect_element_removed<F: Fn(&Self, &Element) + 'static>(&self, f: F) -> u64 {
fn connect_element_removed<F: Fn(&Self, &Element) + Send + Sync + 'static>(&self, f: F) -> u64 {
unsafe {
let f: Box_<Box_<Fn(&Self, &Element) + 'static>> = Box_::new(Box_::new(f));
let f: Box_<Box_<Fn(&Self, &Element) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
connect(self.to_glib_none().0, "element-removed",
transmute(element_removed_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
}
......@@ -263,7 +266,7 @@ impl<O: IsA<Bin> + IsA<glib::object::Object>> BinExt for O {
unsafe extern "C" fn deep_element_added_trampoline<P>(this: *mut ffi::GstBin, sub_bin: *mut ffi::GstBin, element: *mut ffi::GstElement, f: glib_ffi::gpointer)
where P: IsA<Bin> {
callback_guard!();
let f: &Box_<Fn(&P, &Bin, &Element) + 'static> = transmute(f);
let f: &Box_<Fn(&P, &Bin, &Element) + Send + Sync + 'static> = transmute(f);
f(&Bin::from_glib_none(this).downcast_unchecked(), &from_glib_none(sub_bin), &from_glib_none(element))
}
......@@ -271,27 +274,27 @@ where P: IsA<Bin> {
unsafe extern "C" fn deep_element_removed_trampoline<P>(this: *mut ffi::GstBin, sub_bin: *mut ffi::GstBin, element: *mut ffi::GstElement, f: glib_ffi::gpointer)
where P: IsA<Bin> {
callback_guard!();
let f: &Box_<Fn(&P, &Bin, &Element) + 'static> = transmute(f);
let f: &Box_<Fn(&P, &Bin, &Element) + Send + Sync + 'static> = transmute(f);
f(&Bin::from_glib_none(this).downcast_unchecked(), &from_glib_none(sub_bin), &from_glib_none(element))
}
unsafe extern "C" fn do_latency_trampoline<P>(this: *mut ffi::GstBin, f: glib_ffi::gpointer) -> glib_ffi::gboolean
where P: IsA<Bin> {
callback_guard!();
let f: &Box_<Fn(&P) -> bool + 'static> = transmute(f);
let f: &Box_<Fn(&P) -> bool + Send + Sync + 'static> = transmute(f);
f(&Bin::from_glib_none(this).downcast_unchecked()).to_glib()
}
unsafe extern "C" fn element_added_trampoline<P>(this: *mut ffi::GstBin, element: *mut ffi::GstElement, f: glib_ffi::gpointer)
where P: IsA<Bin> {
callback_guard!();
let f: &Box_<Fn(&P, &Element) + 'static> = transmute(f);
let f: &Box_<Fn(&P, &Element) + Send + Sync + 'static> = transmute(f);
f(&Bin::from_glib_none(this).downcast_unchecked(), &from_glib_none(element))
}
unsafe extern "C" fn element_removed_trampoline<P>(this: *mut ffi::GstBin, element: *mut ffi::GstElement, f: glib_ffi::gpointer)
where P: IsA<Bin> {
callback_guard!();
let f: &Box_<Fn(&P, &Element) + 'static> = transmute(f);
let f: &Box_<Fn(&P, &Element) + Send + Sync + 'static> = transmute(f);
f(&Bin::from_glib_none(this).downcast_unchecked(), &from_glib_none(element))
}
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
use Object;
......@@ -22,6 +22,9 @@ impl Bus {
}
}
unsafe impl Send for Bus {}
unsafe impl Sync for Bus {}
pub trait BusExt {
fn add_signal_watch(&self);
......
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
use ClockTime;
......@@ -60,6 +60,9 @@ impl Clock {
//}
}
unsafe impl Send for Clock {}
unsafe impl Sync for Clock {}
pub trait ClockExt {
fn add_observation(&self, slave: ClockTime, master: ClockTime) -> Option<f64>;
......@@ -122,7 +125,7 @@ pub trait ClockExt {
fn set_property_window_threshold(&self, window_threshold: i32);
#[cfg(feature = "v1_6")]
fn connect_synced<F: Fn(&Self, bool) + 'static>(&self, f: F) -> u64;
fn connect_synced<F: Fn(&Self, bool) + Send + Sync + 'static>(&self, f: F) -> u64;
}
impl<O: IsA<Clock> + IsA<glib::object::Object>> ClockExt for O {
......@@ -306,9 +309,9 @@ impl<O: IsA<Clock> + IsA<glib::object::Object>> ClockExt for O {
}
#[cfg(feature = "v1_6")]
fn connect_synced<F: Fn(&Self, bool) + 'static>(&self, f: F) -> u64 {
fn connect_synced<F: Fn(&Self, bool) + Send + Sync + 'static>(&self, f: F) -> u64 {
unsafe {
let f: Box_<Box_<Fn(&Self, bool) + 'static>> = Box_::new(Box_::new(f));
let f: Box_<Box_<Fn(&Self, bool) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
connect(self.to_glib_none().0, "synced",
transmute(synced_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
}
......@@ -319,6 +322,6 @@ impl<O: IsA<Clock> + IsA<glib::object::Object>> ClockExt for O {
unsafe extern "C" fn synced_trampoline<P>(this: *mut ffi::GstClock, synced: glib_ffi::gboolean, f: glib_ffi::gpointer)
where P: IsA<Clock> {
callback_guard!();
let f: &Box_<Fn(&P, bool) + 'static> = transmute(f);
let f: &Box_<Fn(&P, bool) + Send + Sync + 'static> = transmute(f);
f(&Clock::from_glib_none(this).downcast_unchecked(), from_glib(synced))
}
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
use Bus;
......@@ -66,6 +66,9 @@ impl Element {
}
}
unsafe impl Send for Element {}
unsafe impl Sync for Element {}
pub trait ElementExt {
fn abort_state(&self);
......@@ -193,11 +196,11 @@ pub trait ElementExt {
fn unlink_pads<P: IsA<Element>>(&self, srcpadname: &str, dest: &P, destpadname: &str);
fn connect_no_more_pads<F: Fn(&Self) + 'static>(&self, f: F) -> u64;
fn connect_no_more_pads<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> u64;
fn connect_pad_added<F: Fn(&Self, &Pad) + 'static>(&self, f: F) -> u64;
fn connect_pad_added<F: Fn(&Self, &Pad) + Send + Sync + 'static>(&self, f: F) -> u64;
fn connect_pad_removed<F: Fn(&Self, &Pad) + 'static>(&self, f: F) -> u64;
fn connect_pad_removed<F: Fn(&Self, &Pad) + Send + Sync + 'static>(&self, f: F) -> u64;
}
impl<O: IsA<Element> + IsA<glib::object::Object>> ElementExt for O {
......@@ -540,25 +543,25 @@ impl<O: IsA<Element> + IsA<glib::object::Object>> ElementExt for O {
}
}
fn connect_no_more_pads<F: Fn(&Self) + 'static>(&self, f: F) -> u64 {
fn connect_no_more_pads<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> u64 {
unsafe {
let f: Box_<Box_<Fn(&Self) + 'static>> = Box_::new(Box_::new(f));
let f: Box_<Box_<Fn(&Self) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
connect(self.to_glib_none().0, "no-more-pads",
transmute(no_more_pads_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
}
}
fn connect_pad_added<F: Fn(&Self, &Pad) + 'static>(&self, f: F) -> u64 {
fn connect_pad_added<F: Fn(&Self, &Pad) + Send + Sync + 'static>(&self, f: F) -> u64 {
unsafe {
let f: Box_<Box_<Fn(&Self, &Pad) + 'static>> = Box_::new(Box_::new(f));
let f: Box_<Box_<Fn(&Self, &Pad) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
connect(self.to_glib_none().0, "pad-added",
transmute(pad_added_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
}
}
fn connect_pad_removed<F: Fn(&Self, &Pad) + 'static>(&self, f: F) -> u64 {
fn connect_pad_removed<F: Fn(&Self, &Pad) + Send + Sync + 'static>(&self, f: F) -> u64 {
unsafe {
let f: Box_<Box_<Fn(&Self, &Pad) + 'static>> = Box_::new(Box_::new(f));
let f: Box_<Box_<Fn(&Self, &Pad) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
connect(self.to_glib_none().0, "pad-removed",
transmute(pad_removed_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
}
......@@ -568,20 +571,20 @@ impl<O: IsA<Element> + IsA<glib::object::Object>> ElementExt for O {
unsafe extern "C" fn no_more_pads_trampoline<P>(this: *mut ffi::GstElement, f: glib_ffi::gpointer)
where P: IsA<Element> {
callback_guard!();
let f: &Box_<Fn(&P) + 'static> = transmute(f);
let f: &Box_<Fn(&P) + Send + Sync + 'static> = transmute(f);
f(&Element::from_glib_none(this).downcast_unchecked())
}
unsafe extern "C" fn pad_added_trampoline<P>(this: *mut ffi::GstElement, new_pad: *mut ffi::GstPad, f: glib_ffi::gpointer)
where P: IsA<Element> {
callback_guard!();
let f: &Box_<Fn(&P, &Pad) + 'static> = transmute(f);
let f: &Box_<Fn(&P, &Pad) + Send + Sync + 'static> = transmute(f);
f(&Element::from_glib_none(this).downcast_unchecked(), &from_glib_none(new_pad))
}
unsafe extern "C" fn pad_removed_trampoline<P>(this: *mut ffi::GstElement, old_pad: *mut ffi::GstPad, f: glib_ffi::gpointer)
where P: IsA<Element> {
callback_guard!();
let f: &Box_<Fn(&P, &Pad) + 'static> = transmute(f);
let f: &Box_<Fn(&P, &Pad) + Send + Sync + 'static> = transmute(f);
f(&Element::from_glib_none(this).downcast_unchecked(), &from_glib_none(old_pad))
}
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
use Element;
......
This diff is collapsed.
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
use ffi;
......
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
mod bin;
......
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
use ClockTime;
......@@ -36,6 +36,9 @@ impl Object {
//}
}
unsafe impl Send for Object {}
unsafe impl Sync for Object {}
pub trait ObjectExt {
//fn add_control_binding(&self, binding: /*Ignored*/&ControlBinding) -> bool;
......
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
use Element;
......@@ -57,6 +57,9 @@ impl Pad {
//}
}
unsafe impl Send for Pad {}
unsafe impl Sync for Pad {}
pub trait PadExt {
//fn activate_mode(&self, mode: /*Ignored*/PadMode, active: bool) -> bool;
......@@ -234,9 +237,9 @@ pub trait PadExt {
fn set_property_template(&self, template: Option<&PadTemplate>);
fn connect_linked<F: Fn(&Self, &Pad) + 'static>(&self, f: F) -> u64;
fn connect_linked<F: Fn(&Self, &Pad) + Send + Sync + 'static>(&self, f: F) -> u64;
fn connect_unlinked<F: Fn(&Self, &Pad) + 'static>(&self, f: F) -> u64;
fn connect_unlinked<F: Fn(&Self, &Pad) + Send + Sync + 'static>(&self, f: F) -> u64;
}
impl<O: IsA<Pad> + IsA<glib::object::Object>> PadExt for O {
......@@ -670,17 +673,17 @@ impl<O: IsA<Pad> + IsA<glib::object::Object>> PadExt for O {
}
}
fn connect_linked<F: Fn(&Self, &Pad) + 'static>(&self, f: F) -> u64 {
fn connect_linked<F: Fn(&Self, &Pad) + Send + Sync + 'static>(&self, f: F) -> u64 {
unsafe {
let f: Box_<Box_<Fn(&Self, &Pad) + 'static>> = Box_::new(Box_::new(f));
let f: Box_<Box_<Fn(&Self, &Pad) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
connect(self.to_glib_none().0, "linked",
transmute(linked_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
}
}
fn connect_unlinked<F: Fn(&Self, &Pad) + 'static>(&self, f: F) -> u64 {
fn connect_unlinked<F: Fn(&Self, &Pad) + Send + Sync + 'static>(&self, f: F) -> u64 {
unsafe {
let f: Box_<Box_<Fn(&Self, &Pad) + 'static>> = Box_::new(Box_::new(f));
let f: Box_<Box_<Fn(&Self, &Pad) + Send + Sync + 'static>> = Box_::new(Box_::new(f));
connect(self.to_glib_none().0, "unlinked",
transmute(unlinked_trampoline::<Self> as usize), Box_::into_raw(f) as *mut _)
}
......@@ -690,13 +693,13 @@ impl<O: IsA<Pad> + IsA<glib::object::Object>> PadExt for O {
unsafe extern "C" fn linked_trampoline<P>(this: *mut ffi::GstPad, peer: *mut ffi::GstPad, f: glib_ffi::gpointer)
where P: IsA<Pad> {
callback_guard!();
let f: &Box_<Fn(&P, &Pad) + 'static> = transmute(f);
let f: &Box_<Fn(&P, &Pad) + Send + Sync + 'static> = transmute(f);
f(&Pad::from_glib_none(this).downcast_unchecked(), &from_glib_none(peer))
}
unsafe extern "C" fn unlinked_trampoline<P>(this: *mut ffi::GstPad, peer: *mut ffi::GstPad, f: glib_ffi::gpointer)
where P: IsA<Pad> {
callback_guard!();
let f: &Box_<Fn(&P, &Pad) + 'static> = transmute(f);
let f: &Box_<Fn(&P, &Pad) + Send + Sync + 'static> = transmute(f);
f(&Pad::from_glib_none(this).downcast_unchecked(), &from_glib_none(peer))
}
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
use Object;
......
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
use Bin;
......
// This file was generated by gir (b155303) from gir-files (???)
// This file was generated by gir (531f8d9) from gir-files (???)
// DO NOT EDIT
use Error;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment