diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2020-07-26 18:33:14 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2020-07-26 18:46:32 +0300 |
commit | 0eb777cf5acf7c48ade2a83de5f441e96cf61b90 (patch) | |
tree | 8fbe97f7e3876b598fca03c3e5b9a59cb7a9763f /utils | |
parent | 1730de6cea10cb73ff1ab882a8235d540bfa5061 (diff) |
Update for removal of ObjectImpl::get_type_data()
Diffstat (limited to 'utils')
-rw-r--r-- | utils/fallbackswitch/src/base/subclass/aggregator.rs | 113 | ||||
-rw-r--r-- | utils/fallbackswitch/src/base/subclass/aggregator_pad.rs | 24 | ||||
-rw-r--r-- | utils/fallbackswitch/src/fallbacksrc.rs | 4 | ||||
-rw-r--r-- | utils/fallbackswitch/src/fallbackswitch.rs | 2 | ||||
-rw-r--r-- | utils/togglerecord/src/togglerecord.rs | 2 |
5 files changed, 58 insertions, 87 deletions
diff --git a/utils/fallbackswitch/src/base/subclass/aggregator.rs b/utils/fallbackswitch/src/base/subclass/aggregator.rs index 3a1b6864d..7eae60a4e 100644 --- a/utils/fallbackswitch/src/base/subclass/aggregator.rs +++ b/utils/fallbackswitch/src/base/subclass/aggregator.rs @@ -19,7 +19,7 @@ use super::super::Aggregator; use super::super::AggregatorClass; use super::super::AggregatorPad; -pub trait AggregatorImpl: AggregatorImplExt + ElementImpl + Send + Sync + 'static { +pub trait AggregatorImpl: AggregatorImplExt + ElementImpl { fn flush(&self, aggregator: &Aggregator) -> Result<gst::FlowSuccess, gst::FlowError> { self.parent_flush(aggregator) } @@ -98,7 +98,9 @@ pub trait AggregatorImpl: AggregatorImplExt + ElementImpl + Send + Sync + 'stati &self, aggregator: &Aggregator, timeout: bool, - ) -> Result<gst::FlowSuccess, gst::FlowError>; + ) -> Result<gst::FlowSuccess, gst::FlowError> { + self.parent_aggregate(aggregator, timeout) + } fn start(&self, aggregator: &Aggregator) -> Result<(), gst::ErrorMessage> { self.parent_start(aggregator) @@ -239,10 +241,10 @@ pub trait AggregatorImplExt { fn parent_negotiate(&self, aggregator: &Aggregator) -> bool; } -impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { +impl<T: AggregatorImpl> AggregatorImplExt for T { fn parent_flush(&self, aggregator: &Aggregator) -> Result<gst::FlowSuccess, gst::FlowError> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; (*parent_class) @@ -260,7 +262,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { buffer: gst::Buffer, ) -> Option<gst::Buffer> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; match (*parent_class).clip { @@ -280,7 +282,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { buffer: gst::Buffer, ) -> Result<gst::FlowSuccess, gst::FlowError> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; let f = (*parent_class) @@ -298,7 +300,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { event: gst::Event, ) -> bool { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; let f = (*parent_class) @@ -319,7 +321,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { event: gst::Event, ) -> Result<gst::FlowSuccess, gst::FlowError> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; let f = (*parent_class) @@ -341,7 +343,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { query: &mut gst::QueryRef, ) -> bool { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; let f = (*parent_class) @@ -362,7 +364,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { query: &mut gst::QueryRef, ) -> bool { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; let f = (*parent_class) @@ -378,7 +380,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { fn parent_src_event(&self, aggregator: &Aggregator, event: gst::Event) -> bool { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; let f = (*parent_class) @@ -390,7 +392,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { fn parent_src_query(&self, aggregator: &Aggregator, query: &mut gst::QueryRef) -> bool { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; let f = (*parent_class) @@ -407,7 +409,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { active: bool, ) -> Result<(), gst::LoggableError> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; match (*parent_class).src_activate { @@ -431,7 +433,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { timeout: bool, ) -> Result<gst::FlowSuccess, gst::FlowError> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; let f = (*parent_class) @@ -444,7 +446,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { fn parent_start(&self, aggregator: &Aggregator) -> Result<(), gst::ErrorMessage> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; (*parent_class) @@ -465,7 +467,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { fn parent_stop(&self, aggregator: &Aggregator) -> Result<(), gst::ErrorMessage> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; (*parent_class) @@ -486,7 +488,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { fn parent_get_next_time(&self, aggregator: &Aggregator) -> gst::ClockTime { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; (*parent_class) @@ -504,7 +506,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { caps: Option<&gst::Caps>, ) -> Option<AggregatorPad> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; let f = (*parent_class) @@ -525,7 +527,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { caps: &gst::Caps, ) -> Result<gst::Caps, gst::FlowError> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; let f = (*parent_class) @@ -544,7 +546,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { fn parent_fixate_src_caps(&self, aggregator: &Aggregator, caps: gst::Caps) -> gst::Caps { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; @@ -561,7 +563,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { caps: &gst::Caps, ) -> Result<(), gst::LoggableError> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; (*parent_class) @@ -579,7 +581,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { fn parent_negotiate(&self, aggregator: &Aggregator) -> bool { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorClass; (*parent_class) @@ -590,7 +592,7 @@ impl<T: AggregatorImpl + ObjectImpl> AggregatorImplExt for T { } } -unsafe impl<T: ObjectSubclass + AggregatorImpl> IsSubclassable<T> for AggregatorClass +unsafe impl<T: AggregatorImpl> IsSubclassable<T> for AggregatorClass where <T as ObjectSubclass>::Instance: PanicPoison, { @@ -602,9 +604,7 @@ where klass.clip = Some(aggregator_clip::<T>); klass.finish_buffer = Some(aggregator_finish_buffer::<T>); klass.sink_event = Some(aggregator_sink_event::<T>); - klass.sink_event_pre_queue = Some(aggregator_sink_event_pre_queue::<T>); klass.sink_query = Some(aggregator_sink_query::<T>); - klass.sink_query_pre_queue = Some(aggregator_sink_query_pre_queue::<T>); klass.src_event = Some(aggregator_src_event::<T>); klass.src_query = Some(aggregator_src_query::<T>); klass.src_activate = Some(aggregator_src_activate::<T>); @@ -616,16 +616,19 @@ where klass.update_src_caps = Some(aggregator_update_src_caps::<T>); klass.fixate_src_caps = Some(aggregator_fixate_src_caps::<T>); klass.negotiated_src_caps = Some(aggregator_negotiated_src_caps::<T>); - klass.negotiate = Some(aggregator_negotiate::<T>); + { + klass.sink_event_pre_queue = Some(aggregator_sink_event_pre_queue::<T>); + klass.sink_query_pre_queue = Some(aggregator_sink_query_pre_queue::<T>); + klass.negotiate = Some(aggregator_negotiate::<T>); + } } } } -unsafe extern "C" fn aggregator_flush<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_flush<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, ) -> gst_sys::GstFlowReturn where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -638,13 +641,12 @@ where .to_glib() } -unsafe extern "C" fn aggregator_clip<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_clip<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, aggregator_pad: *mut gst_base_sys::GstAggregatorPad, buffer: *mut gst_sys::GstBuffer, ) -> *mut gst_sys::GstBuffer where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -662,12 +664,11 @@ where ret.map(|r| r.into_ptr()).unwrap_or(ptr::null_mut()) } -unsafe extern "C" fn aggregator_finish_buffer<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_finish_buffer<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, buffer: *mut gst_sys::GstBuffer, ) -> gst_sys::GstFlowReturn where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -680,13 +681,12 @@ where .to_glib() } -unsafe extern "C" fn aggregator_sink_event<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_sink_event<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, aggregator_pad: *mut gst_base_sys::GstAggregatorPad, event: *mut gst_sys::GstEvent, ) -> glib_sys::gboolean where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -703,13 +703,12 @@ where .to_glib() } -unsafe extern "C" fn aggregator_sink_event_pre_queue<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_sink_event_pre_queue<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, aggregator_pad: *mut gst_base_sys::GstAggregatorPad, event: *mut gst_sys::GstEvent, ) -> gst_sys::GstFlowReturn where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -727,13 +726,12 @@ where .to_glib() } -unsafe extern "C" fn aggregator_sink_query<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_sink_query<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, aggregator_pad: *mut gst_base_sys::GstAggregatorPad, query: *mut gst_sys::GstQuery, ) -> glib_sys::gboolean where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -750,13 +748,12 @@ where .to_glib() } -unsafe extern "C" fn aggregator_sink_query_pre_queue<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_sink_query_pre_queue<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, aggregator_pad: *mut gst_base_sys::GstAggregatorPad, query: *mut gst_sys::GstQuery, ) -> glib_sys::gboolean where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -773,12 +770,11 @@ where .to_glib() } -unsafe extern "C" fn aggregator_src_event<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_src_event<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, event: *mut gst_sys::GstEvent, ) -> glib_sys::gboolean where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -791,12 +787,11 @@ where .to_glib() } -unsafe extern "C" fn aggregator_src_query<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_src_query<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, query: *mut gst_sys::GstQuery, ) -> glib_sys::gboolean where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -809,13 +804,12 @@ where .to_glib() } -unsafe extern "C" fn aggregator_src_activate<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_src_activate<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, mode: gst_sys::GstPadMode, active: glib_sys::gboolean, ) -> glib_sys::gboolean where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -834,12 +828,11 @@ where .to_glib() } -unsafe extern "C" fn aggregator_aggregate<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_aggregate<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, timeout: glib_sys::gboolean, ) -> gst_sys::GstFlowReturn where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -852,11 +845,10 @@ where .to_glib() } -unsafe extern "C" fn aggregator_start<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_start<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, ) -> glib_sys::gboolean where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -875,11 +867,10 @@ where .to_glib() } -unsafe extern "C" fn aggregator_stop<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_stop<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, ) -> glib_sys::gboolean where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -898,11 +889,10 @@ where .to_glib() } -unsafe extern "C" fn aggregator_get_next_time<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_get_next_time<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, ) -> gst_sys::GstClockTime where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -915,14 +905,13 @@ where .to_glib() } -unsafe extern "C" fn aggregator_create_new_pad<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_create_new_pad<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, templ: *mut gst_sys::GstPadTemplate, req_name: *const libc::c_char, caps: *const gst_sys::GstCaps, ) -> *mut gst_base_sys::GstAggregatorPad where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -944,13 +933,12 @@ where .to_glib_full() } -unsafe extern "C" fn aggregator_update_src_caps<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_update_src_caps<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, caps: *mut gst_sys::GstCaps, res: *mut *mut gst_sys::GstCaps, ) -> gst_sys::GstFlowReturn where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -971,12 +959,11 @@ where .to_glib() } -unsafe extern "C" fn aggregator_fixate_src_caps<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_fixate_src_caps<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, caps: *mut gst_sys::GstCaps, ) -> *mut gst_sys::GstCaps where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -989,12 +976,11 @@ where .into_ptr() } -unsafe extern "C" fn aggregator_negotiated_src_caps<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_negotiated_src_caps<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, caps: *mut gst_sys::GstCaps, ) -> glib_sys::gboolean where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); @@ -1013,11 +999,10 @@ where .to_glib() } -unsafe extern "C" fn aggregator_negotiate<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_negotiate<T: AggregatorImpl>( ptr: *mut gst_base_sys::GstAggregator, ) -> glib_sys::gboolean where - T: AggregatorImpl, T::Instance: PanicPoison, { let instance = &*(ptr as *mut T::Instance); diff --git a/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs b/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs index d7b78e4f9..d09443f67 100644 --- a/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs +++ b/utils/fallbackswitch/src/base/subclass/aggregator_pad.rs @@ -17,7 +17,7 @@ use super::super::Aggregator; use super::super::AggregatorPad; use super::super::AggregatorPadClass; -pub trait AggregatorPadImpl: AggregatorPadImplExt + PadImpl + Send + Sync + 'static { +pub trait AggregatorPadImpl: AggregatorPadImplExt + PadImpl { fn flush( &self, aggregator_pad: &AggregatorPad, @@ -51,14 +51,14 @@ pub trait AggregatorPadImplExt { ) -> bool; } -impl<T: AggregatorPadImpl + ObjectImpl> AggregatorPadImplExt for T { +impl<T: AggregatorPadImpl> AggregatorPadImplExt for T { fn parent_flush( &self, aggregator_pad: &AggregatorPad, aggregator: &Aggregator, ) -> Result<gst::FlowSuccess, gst::FlowError> { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorPadClass; (*parent_class) @@ -81,7 +81,7 @@ impl<T: AggregatorPadImpl + ObjectImpl> AggregatorPadImplExt for T { buffer: &gst::Buffer, ) -> bool { unsafe { - let data = self.get_type_data(); + let data = T::type_data(); let parent_class = data.as_ref().get_parent_class() as *mut gst_base_sys::GstAggregatorPadClass; (*parent_class) @@ -97,7 +97,7 @@ impl<T: AggregatorPadImpl + ObjectImpl> AggregatorPadImplExt for T { } } } -unsafe impl<T: ObjectSubclass + AggregatorPadImpl> IsSubclassable<T> for AggregatorPadClass { +unsafe impl<T: AggregatorPadImpl> IsSubclassable<T> for AggregatorPadClass { fn override_vfuncs(&mut self) { <gst::PadClass as IsSubclassable<T>>::override_vfuncs(self); unsafe { @@ -108,13 +108,10 @@ unsafe impl<T: ObjectSubclass + AggregatorPadImpl> IsSubclassable<T> for Aggrega } } -unsafe extern "C" fn aggregator_pad_flush<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_pad_flush<T: AggregatorPadImpl>( ptr: *mut gst_base_sys::GstAggregatorPad, aggregator: *mut gst_base_sys::GstAggregator, -) -> gst_sys::GstFlowReturn -where - T: AggregatorPadImpl, -{ +) -> gst_sys::GstFlowReturn { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); let wrap: Borrowed<AggregatorPad> = from_glib_borrow(ptr); @@ -123,14 +120,11 @@ where res.to_glib() } -unsafe extern "C" fn aggregator_pad_skip_buffer<T: ObjectSubclass>( +unsafe extern "C" fn aggregator_pad_skip_buffer<T: AggregatorPadImpl>( ptr: *mut gst_base_sys::GstAggregatorPad, aggregator: *mut gst_base_sys::GstAggregator, buffer: *mut gst_sys::GstBuffer, -) -> glib_sys::gboolean -where - T: AggregatorPadImpl, -{ +) -> glib_sys::gboolean { let instance = &*(ptr as *mut T::Instance); let imp = instance.get_impl(); let wrap: Borrowed<AggregatorPad> = from_glib_borrow(ptr); diff --git a/utils/fallbackswitch/src/fallbacksrc.rs b/utils/fallbackswitch/src/fallbacksrc.rs index 450fc6e07..f26171800 100644 --- a/utils/fallbackswitch/src/fallbacksrc.rs +++ b/utils/fallbackswitch/src/fallbacksrc.rs @@ -314,8 +314,6 @@ impl ObjectSubclass for FallbackSrc { } impl ObjectImpl for FallbackSrc { - glib_object_impl!(); - fn set_property(&self, obj: &glib::Object, id: usize, value: &glib::Value) { let prop = &PROPERTIES[id]; let element = obj.downcast_ref::<gst::Bin>().unwrap(); @@ -2235,8 +2233,6 @@ mod custom_source { } impl ObjectImpl for CustomSource { - glib_object_impl!(); - fn set_property(&self, obj: &glib::Object, id: usize, value: &glib::Value) { let prop = &PROPERTIES[id]; let element = obj.downcast_ref::<gst::Bin>().unwrap(); diff --git a/utils/fallbackswitch/src/fallbackswitch.rs b/utils/fallbackswitch/src/fallbackswitch.rs index 6c9c424f4..f06747812 100644 --- a/utils/fallbackswitch/src/fallbackswitch.rs +++ b/utils/fallbackswitch/src/fallbackswitch.rs @@ -477,8 +477,6 @@ impl ObjectSubclass for FallbackSwitch { } impl ObjectImpl for FallbackSwitch { - glib_object_impl!(); - fn constructed(&self, obj: &glib::Object) { self.parent_constructed(obj); diff --git a/utils/togglerecord/src/togglerecord.rs b/utils/togglerecord/src/togglerecord.rs index 16d540518..a7a0c7bfd 100644 --- a/utils/togglerecord/src/togglerecord.rs +++ b/utils/togglerecord/src/togglerecord.rs @@ -1606,8 +1606,6 @@ impl ObjectSubclass for ToggleRecord { } impl ObjectImpl for ToggleRecord { - glib_object_impl!(); - fn set_property(&self, obj: &glib::Object, id: usize, value: &glib::Value) { let prop = &PROPERTIES[id]; let element = obj.downcast_ref::<gst::Element>().unwrap(); |