diff options
author | Bilal Elmoussaoui <bil.elmoussaoui@gmail.com> | 2021-04-27 18:21:54 +0300 |
---|---|---|
committer | Bilal Elmoussaoui <bil.elmoussaoui@gmail.com> | 2021-04-27 21:45:47 +0300 |
commit | 78d9fb521dc98b968648ba416c22b057bd0a44ac (patch) | |
tree | cddc7ccd30e8e56d68753f16087b503c7cab8fb0 /utils | |
parent | 75959e8c631ee0b1f52beb409ad11312c7c1ba2f (diff) |
rename ToGlib into IntoGlib
Diffstat (limited to 'utils')
-rw-r--r-- | utils/fallbackswitch/src/base/auto/aggregator.rs | 4 | ||||
-rw-r--r-- | utils/fallbackswitch/src/base/subclass/aggregator.rs | 38 | ||||
-rw-r--r-- | utils/fallbackswitch/src/base/subclass/aggregator_pad.rs | 4 |
3 files changed, 23 insertions, 23 deletions
diff --git a/utils/fallbackswitch/src/base/auto/aggregator.rs b/utils/fallbackswitch/src/base/auto/aggregator.rs index 5433a2153..8c570ec06 100644 --- a/utils/fallbackswitch/src/base/auto/aggregator.rs +++ b/utils/fallbackswitch/src/base/auto/aggregator.rs @@ -98,8 +98,8 @@ impl<O: IsA<Aggregator>> AggregatorExt for O { unsafe { ffi::gst_aggregator_set_latency( self.as_ref().to_glib_none().0, - min_latency.to_glib(), - max_latency.to_glib(), + min_latency.into_glib(), + max_latency.into_glib(), ); } } diff --git a/utils/fallbackswitch/src/base/subclass/aggregator.rs b/utils/fallbackswitch/src/base/subclass/aggregator.rs index 54ed24436..bf8b522a2 100644 --- a/utils/fallbackswitch/src/base/subclass/aggregator.rs +++ b/utils/fallbackswitch/src/base/subclass/aggregator.rs @@ -421,8 +421,8 @@ impl<T: AggregatorImpl> AggregatorImplExt for T { Some(f) => gst::result_from_gboolean!( f( aggregator.unsafe_cast_ref::<Aggregator>().to_glib_none().0, - mode.to_glib(), - active.to_glib() + mode.into_glib(), + active.into_glib() ), gst::CAT_RUST, "Parent function `src_activate` failed" @@ -444,7 +444,7 @@ impl<T: AggregatorImpl> AggregatorImplExt for T { .expect("Missing parent function `aggregate`"); gst::FlowReturn::from_glib(f( aggregator.unsafe_cast_ref::<Aggregator>().to_glib_none().0, - timeout.to_glib(), + timeout.into_glib(), )) .into_result() } @@ -656,7 +656,7 @@ unsafe extern "C" fn aggregator_flush<T: AggregatorImpl>( gst::panic_to_error!(&wrap, &imp.panicked(), gst::FlowReturn::Error, { imp.flush(wrap.unsafe_cast_ref()).into() }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_clip<T: AggregatorImpl>( @@ -691,7 +691,7 @@ unsafe extern "C" fn aggregator_finish_buffer<T: AggregatorImpl>( imp.finish_buffer(wrap.unsafe_cast_ref(), from_glib_full(buffer)) .into() }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_sink_event<T: AggregatorImpl>( @@ -710,7 +710,7 @@ unsafe extern "C" fn aggregator_sink_event<T: AggregatorImpl>( from_glib_full(event), ) }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_sink_event_pre_queue<T: AggregatorImpl>( @@ -730,7 +730,7 @@ unsafe extern "C" fn aggregator_sink_event_pre_queue<T: AggregatorImpl>( ) .into() }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_sink_query<T: AggregatorImpl>( @@ -749,7 +749,7 @@ unsafe extern "C" fn aggregator_sink_query<T: AggregatorImpl>( gst::QueryRef::from_mut_ptr(query), ) }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_sink_query_pre_queue<T: AggregatorImpl>( @@ -768,7 +768,7 @@ unsafe extern "C" fn aggregator_sink_query_pre_queue<T: AggregatorImpl>( gst::QueryRef::from_mut_ptr(query), ) }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_src_event<T: AggregatorImpl>( @@ -782,7 +782,7 @@ unsafe extern "C" fn aggregator_src_event<T: AggregatorImpl>( gst::panic_to_error!(&wrap, &imp.panicked(), false, { imp.src_event(wrap.unsafe_cast_ref(), from_glib_full(event)) }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_src_query<T: AggregatorImpl>( @@ -796,7 +796,7 @@ unsafe extern "C" fn aggregator_src_query<T: AggregatorImpl>( gst::panic_to_error!(&wrap, &imp.panicked(), false, { imp.src_query(wrap.unsafe_cast_ref(), gst::QueryRef::from_mut_ptr(query)) }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_src_activate<T: AggregatorImpl>( @@ -817,7 +817,7 @@ unsafe extern "C" fn aggregator_src_activate<T: AggregatorImpl>( } } }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_aggregate<T: AggregatorImpl>( @@ -832,7 +832,7 @@ unsafe extern "C" fn aggregator_aggregate<T: AggregatorImpl>( imp.aggregate(wrap.unsafe_cast_ref(), from_glib(timeout)) .into() }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_start<T: AggregatorImpl>( @@ -851,7 +851,7 @@ unsafe extern "C" fn aggregator_start<T: AggregatorImpl>( } } }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_stop<T: AggregatorImpl>( @@ -870,7 +870,7 @@ unsafe extern "C" fn aggregator_stop<T: AggregatorImpl>( } } }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_get_next_time<T: AggregatorImpl>( @@ -883,7 +883,7 @@ unsafe extern "C" fn aggregator_get_next_time<T: AggregatorImpl>( gst::panic_to_error!(&wrap, &imp.panicked(), gst::CLOCK_TIME_NONE, { imp.next_time(wrap.unsafe_cast_ref()) }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_create_new_pad<T: AggregatorImpl>( @@ -931,7 +931,7 @@ unsafe extern "C" fn aggregator_update_src_caps<T: AggregatorImpl>( Err(err) => err.into(), } }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_fixate_src_caps<T: AggregatorImpl>( @@ -965,7 +965,7 @@ unsafe extern "C" fn aggregator_negotiated_src_caps<T: AggregatorImpl>( } } }) - .to_glib() + .into_glib() } unsafe extern "C" fn aggregator_negotiate<T: AggregatorImpl>( @@ -978,5 +978,5 @@ unsafe extern "C" fn aggregator_negotiate<T: AggregatorImpl>( gst::panic_to_error!(&wrap, &imp.panicked(), false, { imp.negotiate(wrap.unsafe_cast_ref()) }) - .to_glib() + .into_glib() } diff --git a/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs b/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs index 7af2547a1..6a8c67bba 100644 --- a/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs +++ b/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs @@ -125,7 +125,7 @@ unsafe extern "C" fn aggregator_pad_flush<T: AggregatorPadImpl>( let res: gst::FlowReturn = imp .flush(wrap.unsafe_cast_ref(), &from_glib_borrow(aggregator)) .into(); - res.to_glib() + res.into_glib() } unsafe extern "C" fn aggregator_pad_skip_buffer<T: AggregatorPadImpl>( @@ -142,5 +142,5 @@ unsafe extern "C" fn aggregator_pad_skip_buffer<T: AggregatorPadImpl>( &from_glib_borrow(aggregator), &from_glib_borrow(buffer), ) - .to_glib() + .into_glib() } |