mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-06-08 17:29:22 +00:00
Code Issues Projects Releases Wiki Activity

fallbackswitch: Update for new from_glib_borrow signature

Browse source 
See https://github.com/gtk-rs/glib/pull/605
This commit is contained in:
Sebastian Dröge 2020-04-05 19:00:09 +03:00
parent 0e2635221d
commit 5d992692f0
5 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-plugin-fallbackswitch/src/base/aggregator.rs
View file

@ -91,5 +91,5 @@ unsafe extern "C" fn notify_min_upstream_latency_trampoline<P, F: Fn(&P) + Send
P: IsA<Aggregator>,
{
let f: &F = &*(f as *const F);
f(&Aggregator::from_glib_borrow(this).unsafe_cast())
f(&Aggregator::from_glib_borrow(this).unsafe_cast_ref())
}

4
gst-plugin-fallbackswitch/src/base/auto/aggregator.rs
View file

@ -142,7 +142,7 @@ impl<O: IsA<Aggregator>> AggregatorExt for O {
P: IsA<Aggregator>,
{
let f: &F = &*(f as *const F);
f(&Aggregator::from_glib_borrow(this).unsafe_cast())
f(&Aggregator::from_glib_borrow(this).unsafe_cast_ref())
}
unsafe {
let f: Box_<F> = Box_::new(f);
@ -167,7 +167,7 @@ impl<O: IsA<Aggregator>> AggregatorExt for O {
P: IsA<Aggregator>,
{
let f: &F = &*(f as *const F);
f(&Aggregator::from_glib_borrow(this).unsafe_cast())
f(&Aggregator::from_glib_borrow(this).unsafe_cast_ref())
}
unsafe {
let f: Box_<F> = Box_::new(f);

4
gst-plugin-fallbackswitch/src/base/auto/aggregator_pad.rs
View file

@ -138,7 +138,7 @@ impl<O: IsA<AggregatorPad>> AggregatorPadExt for O {
{
let f: &F = &*(f as *const F);
f(
&AggregatorPad::from_glib_borrow(this).unsafe_cast(),
&AggregatorPad::from_glib_borrow(this).unsafe_cast_ref(),
&from_glib_borrow(object),
)
}
@ -165,7 +165,7 @@ impl<O: IsA<AggregatorPad>> AggregatorPadExt for O {
P: IsA<AggregatorPad>,
{
let f: &F = &*(f as *const F);
f(&AggregatorPad::from_glib_borrow(this).unsafe_cast())
f(&AggregatorPad::from_glib_borrow(this).unsafe_cast_ref())
}
unsafe {
let f: Box_<F> = Box_::new(f);

46
gst-plugin-fallbackswitch/src/base/subclass/aggregator.rs
View file

@ -635,7 +635,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
imp.flush(&wrap).into()
@ -654,7 +654,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
let ret = gst_panic_to_error!(&wrap, &instance.panicked(), None, {
imp.clip(
@ -677,7 +677,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
imp.finish_buffer(&wrap, from_glib_full(buffer)).into()
@ -696,7 +696,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, {
imp.sink_event(
@ -719,7 +719,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, {
imp.sink_event_pre_queue(
@ -742,7 +742,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, {
imp.sink_query(
@ -765,7 +765,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, {
imp.sink_query_pre_queue(
@ -787,7 +787,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, {
imp.src_event(&wrap, from_glib_full(event))
@ -805,7 +805,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, {
imp.src_query(&wrap, gst::QueryRef::from_mut_ptr(query))
@ -824,13 +824,13 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, {
match imp.src_activate(&wrap, from_glib(mode), from_glib(active)) {
Ok(()) => true,
Err(err) => {
err.log_with_object(&wrap);
err.log_with_object(&*wrap);
false
}
}
@ -848,7 +848,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
imp.aggregate(&wrap, from_glib(timeout)).into()
@ -865,7 +865,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, {
match imp.start(&wrap) {
@ -888,7 +888,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, {
match imp.stop(&wrap) {
@ -911,7 +911,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), gst::CLOCK_TIME_NONE, {
imp.get_next_time(&wrap)
@ -931,7 +931,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), None, {
let req_name: Option<String> = from_glib_none(req_name);
@ -950,7 +950,9 @@ where
&wrap,
&from_glib_borrow(templ),
req_name,
Option::<gst::Caps>::from_glib_borrow(caps).as_ref(),
Option::<gst::Caps>::from_glib_borrow(caps)
.as_ref()
.as_ref(),
)
})
.to_glib_full()
@ -967,7 +969,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
*res = ptr::null_mut();
@ -993,7 +995,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), gst::Caps::new_empty(), {
imp.fixate_src_caps(&wrap, from_glib_full(caps))
@ -1011,13 +1013,13 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, {
match imp.negotiated_src_caps(&wrap, &from_glib_borrow(caps)) {
Ok(()) => true,
Err(err) => {
err.log_with_object(&wrap);
err.log_with_object(&*wrap);
false
}
}
@ -1034,7 +1036,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: Aggregator = from_glib_borrow(ptr);
let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
gst_panic_to_error!(&wrap, &instance.panicked(), false, { imp.negotiate(&wrap) }).to_glib()
}

4
gst-plugin-fallbackswitch/src/base/subclass/aggregator_pad.rs
View file

@ -120,7 +120,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: AggregatorPad = from_glib_borrow(ptr);
let wrap: Borrowed<AggregatorPad> = from_glib_borrow(ptr);
let res: gst::FlowReturn = imp.flush(&wrap, &from_glib_borrow(aggregator)).into();
res.to_glib()
@ -136,7 +136,7 @@ where
{
let instance = &*(ptr as *mut T::Instance);
let imp = instance.get_impl();
let wrap: AggregatorPad = from_glib_borrow(ptr);
let wrap: Borrowed<AggregatorPad> = from_glib_borrow(ptr);
imp.skip_buffer(
&wrap,