Update gir and regenerate with simplified trait bounds

Trait bounds moved from `where T: Foo` directly into the type parameter
definition at `<T: Foo>`: https://github.com/gtk-rs/gir/pull/1160.

gir

@@ -1 +1 @@
-Subproject commit 88c650eb2f0d906feb4cd7ea46ea699d5cc17472
+Subproject commit de679ce5e7c26674ad788084227ec52f03f1df59

gstreamer-app/src/auto/app_sink.rs

@@ -187,7 +187,7 @@ impl AppSink {
     }
 
     #[doc(alias = "eos")]
-    pub fn connect_eos<F: Fn(&AppSink) + Send + 'static>(&self, f: F) -> SignalHandlerId {
+    pub fn connect_eos<F: Fn(&Self) + Send + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe extern "C" fn eos_trampoline<F: Fn(&AppSink) + Send + 'static>(
             this: *mut ffi::GstAppSink,
             f: glib::ffi::gpointer,
@@ -210,7 +210,7 @@ impl AppSink {
 
     #[doc(alias = "new-preroll")]
     pub fn connect_new_preroll<
-        F: Fn(&AppSink) -> Result<gst::FlowSuccess, gst::FlowError> + Send + 'static,
+        F: Fn(&Self) -> Result<gst::FlowSuccess, gst::FlowError> + Send + 'static,
     >(
         &self,
         f: F,
@@ -239,7 +239,7 @@ impl AppSink {
 
     #[doc(alias = "new-sample")]
     pub fn connect_new_sample<
-        F: Fn(&AppSink) -> Result<gst::FlowSuccess, gst::FlowError> + Send + 'static,
+        F: Fn(&Self) -> Result<gst::FlowSuccess, gst::FlowError> + Send + 'static,
     >(
         &self,
         f: F,
@@ -267,7 +267,7 @@ impl AppSink {
     }
 
     #[doc(alias = "buffer-list")]
-    pub fn connect_buffer_list_notify<F: Fn(&AppSink) + Send + Sync + 'static>(
+    pub fn connect_buffer_list_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -295,7 +295,7 @@ impl AppSink {
     }
 
     #[doc(alias = "caps")]
-    pub fn connect_caps_notify<F: Fn(&AppSink) + Send + Sync + 'static>(
+    pub fn connect_caps_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -321,7 +321,7 @@ impl AppSink {
     }
 
     #[doc(alias = "drop")]
-    pub fn connect_drop_notify<F: Fn(&AppSink) + Send + Sync + 'static>(
+    pub fn connect_drop_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -347,7 +347,7 @@ impl AppSink {
     }
 
     #[doc(alias = "emit-signals")]
-    pub fn connect_emit_signals_notify<F: Fn(&AppSink) + Send + Sync + 'static>(
+    pub fn connect_emit_signals_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -375,7 +375,7 @@ impl AppSink {
     }
 
     #[doc(alias = "eos")]
-    pub fn connect_eos_notify<F: Fn(&AppSink) + Send + Sync + 'static>(
+    pub fn connect_eos_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -401,7 +401,7 @@ impl AppSink {
     }
 
     #[doc(alias = "max-buffers")]
-    pub fn connect_max_buffers_notify<F: Fn(&AppSink) + Send + Sync + 'static>(
+    pub fn connect_max_buffers_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -429,7 +429,7 @@ impl AppSink {
     }
 
     #[doc(alias = "wait-on-eos")]
-    pub fn connect_wait_on_eos_notify<F: Fn(&AppSink) + Send + Sync + 'static>(
+    pub fn connect_wait_on_eos_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {

gstreamer-app/src/auto/app_src.rs

@@ -313,7 +313,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "enough-data")]
-    pub fn connect_enough_data<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_enough_data<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -338,7 +338,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "need-data")]
-    pub fn connect_need_data<F: Fn(&AppSrc, u32) + Send + Sync + 'static>(
+    pub fn connect_need_data<F: Fn(&Self, u32) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -364,7 +364,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "seek-data")]
-    pub fn connect_seek_data<F: Fn(&AppSrc, u64) -> bool + Send + Sync + 'static>(
+    pub fn connect_seek_data<F: Fn(&Self, u64) -> bool + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -392,7 +392,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "block")]
-    pub fn connect_block_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_block_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -418,7 +418,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "caps")]
-    pub fn connect_caps_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_caps_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -444,7 +444,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "current-level-bytes")]
-    pub fn connect_current_level_bytes_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_current_level_bytes_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -474,7 +474,7 @@ impl AppSrc {
     #[cfg(any(feature = "v1_10", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))]
     #[doc(alias = "duration")]
-    pub fn connect_duration_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_duration_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -500,7 +500,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "emit-signals")]
-    pub fn connect_emit_signals_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_emit_signals_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -528,7 +528,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "format")]
-    pub fn connect_format_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_format_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -556,7 +556,7 @@ impl AppSrc {
     #[cfg(any(feature = "v1_18", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
     #[doc(alias = "handle-segment-change")]
-    pub fn connect_handle_segment_change_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_handle_segment_change_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -584,7 +584,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "is-live")]
-    pub fn connect_is_live_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_is_live_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -610,7 +610,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "max-bytes")]
-    pub fn connect_max_bytes_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_max_bytes_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -636,7 +636,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "max-latency")]
-    pub fn connect_max_latency_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_max_latency_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -664,7 +664,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "min-latency")]
-    pub fn connect_min_latency_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_min_latency_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -692,7 +692,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "min-percent")]
-    pub fn connect_min_percent_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_min_percent_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -720,7 +720,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "size")]
-    pub fn connect_size_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_size_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -746,7 +746,7 @@ impl AppSrc {
     }
 
     #[doc(alias = "stream-type")]
-    pub fn connect_stream_type_notify<F: Fn(&AppSrc) + Send + Sync + 'static>(
+    pub fn connect_stream_type_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {

gstreamer-app/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)

gstreamer-app/sys/build.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-app/sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-app/sys/tests/abi.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-app/sys/tests/constant.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-app/sys/tests/layout.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-audio/src/auto/audio_base_sink.rs

@@ -303,15 +303,13 @@ impl<O: IsA<AudioBaseSink>> AudioBaseSinkExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_alignment_threshold_trampoline<
-            P,
+            P: IsA<AudioBaseSink>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstAudioBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -333,13 +331,14 @@ impl<O: IsA<AudioBaseSink>> AudioBaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_buffer_time_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_buffer_time_trampoline<
+            P: IsA<AudioBaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -362,15 +361,13 @@ impl<O: IsA<AudioBaseSink>> AudioBaseSinkExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_can_activate_pull_trampoline<
-            P,
+            P: IsA<AudioBaseSink>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstAudioBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -392,13 +389,14 @@ impl<O: IsA<AudioBaseSink>> AudioBaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_discont_wait_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_discont_wait_trampoline<
+            P: IsA<AudioBaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -421,15 +419,13 @@ impl<O: IsA<AudioBaseSink>> AudioBaseSinkExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_drift_tolerance_trampoline<
-            P,
+            P: IsA<AudioBaseSink>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstAudioBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -451,13 +447,14 @@ impl<O: IsA<AudioBaseSink>> AudioBaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_latency_time_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_latency_time_trampoline<
+            P: IsA<AudioBaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -479,13 +476,14 @@ impl<O: IsA<AudioBaseSink>> AudioBaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_provide_clock_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_provide_clock_trampoline<
+            P: IsA<AudioBaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -507,13 +505,14 @@ impl<O: IsA<AudioBaseSink>> AudioBaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_slave_method_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_slave_method_trampoline<
+            P: IsA<AudioBaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-audio/src/auto/audio_base_src.rs

@@ -211,15 +211,13 @@ impl<O: IsA<AudioBaseSrc>> AudioBaseSrcExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_actual_buffer_time_trampoline<
-            P,
+            P: IsA<AudioBaseSrc>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstAudioBaseSrc,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSrc>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -242,15 +240,13 @@ impl<O: IsA<AudioBaseSrc>> AudioBaseSrcExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_actual_latency_time_trampoline<
-            P,
+            P: IsA<AudioBaseSrc>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstAudioBaseSrc,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSrc>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -272,13 +268,14 @@ impl<O: IsA<AudioBaseSrc>> AudioBaseSrcExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_buffer_time_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_buffer_time_trampoline<
+            P: IsA<AudioBaseSrc>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioBaseSrc,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSrc>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -300,13 +297,14 @@ impl<O: IsA<AudioBaseSrc>> AudioBaseSrcExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_latency_time_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_latency_time_trampoline<
+            P: IsA<AudioBaseSrc>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioBaseSrc,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSrc>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -328,13 +326,14 @@ impl<O: IsA<AudioBaseSrc>> AudioBaseSrcExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_provide_clock_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_provide_clock_trampoline<
+            P: IsA<AudioBaseSrc>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioBaseSrc,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSrc>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -356,13 +355,14 @@ impl<O: IsA<AudioBaseSrc>> AudioBaseSrcExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_slave_method_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_slave_method_trampoline<
+            P: IsA<AudioBaseSrc>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioBaseSrc,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioBaseSrc>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioBaseSrc::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-audio/src/auto/audio_decoder.rs

@@ -365,13 +365,14 @@ impl<O: IsA<AudioDecoder>> AudioDecoderExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_max_errors_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_max_errors_trampoline<
+            P: IsA<AudioDecoder>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioDecoder,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioDecoder>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioDecoder::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -393,13 +394,14 @@ impl<O: IsA<AudioDecoder>> AudioDecoderExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_min_latency_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_min_latency_trampoline<
+            P: IsA<AudioDecoder>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioDecoder,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioDecoder>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioDecoder::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -418,13 +420,14 @@ impl<O: IsA<AudioDecoder>> AudioDecoderExt for O {
 
     #[doc(alias = "plc")]
     fn connect_plc_notify<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_plc_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_plc_trampoline<
+            P: IsA<AudioDecoder>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioDecoder,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioDecoder>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioDecoder::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -446,13 +449,14 @@ impl<O: IsA<AudioDecoder>> AudioDecoderExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_tolerance_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_tolerance_trampoline<
+            P: IsA<AudioDecoder>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioDecoder,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioDecoder>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioDecoder::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-audio/src/auto/audio_encoder.rs

@@ -361,13 +361,14 @@ impl<O: IsA<AudioEncoder>> AudioEncoderExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_hard_resync_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_hard_resync_trampoline<
+            P: IsA<AudioEncoder>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioEncoder,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioEncoder>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioEncoder::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -389,13 +390,14 @@ impl<O: IsA<AudioEncoder>> AudioEncoderExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_mark_granule_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_mark_granule_trampoline<
+            P: IsA<AudioEncoder>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioEncoder,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioEncoder>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioEncoder::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -418,15 +420,13 @@ impl<O: IsA<AudioEncoder>> AudioEncoderExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_perfect_timestamp_trampoline<
-            P,
+            P: IsA<AudioEncoder>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstAudioEncoder,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioEncoder>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioEncoder::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -448,13 +448,14 @@ impl<O: IsA<AudioEncoder>> AudioEncoderExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_tolerance_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_tolerance_trampoline<
+            P: IsA<AudioEncoder>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAudioEncoder,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AudioEncoder>,
-        {
             let f: &F = &*(f as *const F);
             f(&AudioEncoder::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-audio/src/auto/stream_volume.rs

@@ -88,13 +88,14 @@ impl<O: IsA<StreamVolume>> StreamVolumeExt for O {
 
     #[doc(alias = "mute")]
     fn connect_mute_notify<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_mute_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_mute_trampoline<
+            P: IsA<StreamVolume>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstStreamVolume,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<StreamVolume>,
-        {
             let f: &F = &*(f as *const F);
             f(&StreamVolume::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -113,13 +114,14 @@ impl<O: IsA<StreamVolume>> StreamVolumeExt for O {
 
     #[doc(alias = "volume")]
     fn connect_volume_notify<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_volume_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_volume_trampoline<
+            P: IsA<StreamVolume>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstStreamVolume,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<StreamVolume>,
-        {
             let f: &F = &*(f as *const F);
             f(&StreamVolume::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-audio/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)

gstreamer-audio/sys/build.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-audio/sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-audio/sys/tests/abi.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-audio/sys/tests/constant.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-audio/sys/tests/layout.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-base/src/auto/aggregator.rs

@@ -300,13 +300,14 @@ impl<O: IsA<Aggregator>> AggregatorExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_emit_signals_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_emit_signals_trampoline<
+            P: IsA<Aggregator>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAggregator,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Aggregator>,
-        {
             let f: &F = &*(f as *const F);
             f(&Aggregator::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -330,13 +331,14 @@ impl<O: IsA<Aggregator>> AggregatorExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_latency_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_latency_trampoline<
+            P: IsA<Aggregator>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAggregator,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Aggregator>,
-        {
             let f: &F = &*(f as *const F);
             f(&Aggregator::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -358,13 +360,14 @@ impl<O: IsA<Aggregator>> AggregatorExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_start_time_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_start_time_trampoline<
+            P: IsA<Aggregator>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAggregator,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Aggregator>,
-        {
             let f: &F = &*(f as *const F);
             f(&Aggregator::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -389,15 +392,13 @@ impl<O: IsA<Aggregator>> AggregatorExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_start_time_selection_trampoline<
-            P,
+            P: IsA<Aggregator>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstAggregator,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Aggregator>,
-        {
             let f: &F = &*(f as *const F);
             f(&Aggregator::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-base/src/auto/aggregator_pad.rs

@@ -150,15 +150,13 @@ impl<O: IsA<AggregatorPad>> AggregatorPadExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn buffer_consumed_trampoline<
-            P,
+            P: IsA<AggregatorPad>,
             F: Fn(&P, &gst::Buffer) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstAggregatorPad,
             object: *mut gst::ffi::GstBuffer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AggregatorPad>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &AggregatorPad::from_glib_borrow(this).unsafe_cast_ref(),
@@ -185,13 +183,14 @@ impl<O: IsA<AggregatorPad>> AggregatorPadExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_emit_signals_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_emit_signals_trampoline<
+            P: IsA<AggregatorPad>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstAggregatorPad,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<AggregatorPad>,
-        {
             let f: &F = &*(f as *const F);
             f(&AggregatorPad::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-base/src/auto/base_parse.rs

@@ -206,15 +206,13 @@ impl<O: IsA<BaseParse>> BaseParseExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_disable_passthrough_trampoline<
-            P,
+            P: IsA<BaseParse>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstBaseParse,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseParse>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseParse::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-base/src/auto/base_sink.rs

@@ -545,13 +545,14 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
 
     #[doc(alias = "async")]
     fn connect_async_notify<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_async_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_async_trampoline<
+            P: IsA<BaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -573,13 +574,14 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_blocksize_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_blocksize_trampoline<
+            P: IsA<BaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -602,15 +604,13 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_enable_last_sample_trampoline<
-            P,
+            P: IsA<BaseSink>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -632,13 +632,14 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_last_sample_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_last_sample_trampoline<
+            P: IsA<BaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -660,13 +661,14 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_max_bitrate_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_max_bitrate_trampoline<
+            P: IsA<BaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -688,13 +690,14 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_max_lateness_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_max_lateness_trampoline<
+            P: IsA<BaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -719,15 +722,13 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_processing_deadline_trampoline<
-            P,
+            P: IsA<BaseSink>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -746,13 +747,14 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
 
     #[doc(alias = "qos")]
     fn connect_qos_notify<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_qos_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_qos_trampoline<
+            P: IsA<BaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -774,13 +776,14 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_render_delay_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_render_delay_trampoline<
+            P: IsA<BaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -801,13 +804,14 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
     #[doc(alias = "stats")]
     fn connect_stats_notify<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_stats_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_stats_trampoline<
+            P: IsA<BaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -826,13 +830,14 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
 
     #[doc(alias = "sync")]
     fn connect_sync_notify<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_sync_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_sync_trampoline<
+            P: IsA<BaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -854,13 +859,14 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_throttle_time_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_throttle_time_trampoline<
+            P: IsA<BaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -882,13 +888,14 @@ impl<O: IsA<BaseSink>> BaseSinkExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_ts_offset_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_ts_offset_trampoline<
+            P: IsA<BaseSink>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSink,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSink>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSink::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-base/src/auto/base_src.rs

@@ -307,13 +307,14 @@ impl<O: IsA<BaseSrc>> BaseSrcExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_blocksize_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_blocksize_trampoline<
+            P: IsA<BaseSrc>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSrc,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSrc>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSrc::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -335,13 +336,14 @@ impl<O: IsA<BaseSrc>> BaseSrcExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_do_timestamp_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_do_timestamp_trampoline<
+            P: IsA<BaseSrc>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSrc,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSrc>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSrc::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -363,13 +365,14 @@ impl<O: IsA<BaseSrc>> BaseSrcExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_num_buffers_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_num_buffers_trampoline<
+            P: IsA<BaseSrc>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSrc,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSrc>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSrc::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -391,13 +394,14 @@ impl<O: IsA<BaseSrc>> BaseSrcExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_typefind_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_typefind_trampoline<
+            P: IsA<BaseSrc>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseSrc,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseSrc>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseSrc::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-base/src/auto/base_transform.rs

@@ -235,13 +235,14 @@ impl<O: IsA<BaseTransform>> BaseTransformExt for O {
 
     #[doc(alias = "qos")]
     fn connect_qos_notify<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_qos_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_qos_trampoline<
+            P: IsA<BaseTransform>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstBaseTransform,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<BaseTransform>,
-        {
             let f: &F = &*(f as *const F);
             f(&BaseTransform::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-base/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)

gstreamer-base/sys/build.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-base/sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-base/sys/tests/abi.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-base/sys/tests/constant.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-base/sys/tests/layout.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-check/src/auto/test_clock.rs

@@ -172,7 +172,7 @@ impl TestClock {
     //}
 
     #[doc(alias = "clock-type")]
-    pub fn connect_clock_type_notify<F: Fn(&TestClock) + Send + Sync + 'static>(
+    pub fn connect_clock_type_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {

gstreamer-check/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)

gstreamer-check/sys/build.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-check/sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-check/sys/tests/abi.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-check/sys/tests/constant.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-check/sys/tests/layout.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-controller/src/auto/argb_control_binding.rs

@@ -214,15 +214,13 @@ impl<O: IsA<ARGBControlBinding>> ARGBControlBindingExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_control_source_a_trampoline<
-            P,
+            P: IsA<ARGBControlBinding>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstARGBControlBinding,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<ARGBControlBinding>,
-        {
             let f: &F = &*(f as *const F);
             f(&ARGBControlBinding::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -245,15 +243,13 @@ impl<O: IsA<ARGBControlBinding>> ARGBControlBindingExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_control_source_b_trampoline<
-            P,
+            P: IsA<ARGBControlBinding>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstARGBControlBinding,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<ARGBControlBinding>,
-        {
             let f: &F = &*(f as *const F);
             f(&ARGBControlBinding::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -276,15 +272,13 @@ impl<O: IsA<ARGBControlBinding>> ARGBControlBindingExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_control_source_g_trampoline<
-            P,
+            P: IsA<ARGBControlBinding>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstARGBControlBinding,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<ARGBControlBinding>,
-        {
             let f: &F = &*(f as *const F);
             f(&ARGBControlBinding::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -307,15 +301,13 @@ impl<O: IsA<ARGBControlBinding>> ARGBControlBindingExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_control_source_r_trampoline<
-            P,
+            P: IsA<ARGBControlBinding>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstARGBControlBinding,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<ARGBControlBinding>,
-        {
             let f: &F = &*(f as *const F);
             f(&ARGBControlBinding::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-controller/src/auto/direct_control_binding.rs

@@ -124,15 +124,13 @@ impl<O: IsA<DirectControlBinding>> DirectControlBindingExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_control_source_trampoline<
-            P,
+            P: IsA<DirectControlBinding>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstDirectControlBinding,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<DirectControlBinding>,
-        {
             let f: &F = &*(f as *const F);
             f(&DirectControlBinding::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-controller/src/auto/interpolation_control_source.rs

@@ -82,13 +82,14 @@ impl<O: IsA<InterpolationControlSource>> InterpolationControlSourceExt for O {
 
     #[doc(alias = "mode")]
     fn connect_mode_notify<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_mode_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_mode_trampoline<
+            P: IsA<InterpolationControlSource>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstInterpolationControlSource,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<InterpolationControlSource>,
-        {
             let f: &F = &*(f as *const F);
             f(&InterpolationControlSource::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-controller/src/auto/lfo_control_source.rs

@@ -218,13 +218,14 @@ impl<O: IsA<LFOControlSource>> LFOControlSourceExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_amplitude_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_amplitude_trampoline<
+            P: IsA<LFOControlSource>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstLFOControlSource,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<LFOControlSource>,
-        {
             let f: &F = &*(f as *const F);
             f(&LFOControlSource::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -246,13 +247,14 @@ impl<O: IsA<LFOControlSource>> LFOControlSourceExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_frequency_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_frequency_trampoline<
+            P: IsA<LFOControlSource>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstLFOControlSource,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<LFOControlSource>,
-        {
             let f: &F = &*(f as *const F);
             f(&LFOControlSource::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -271,13 +273,14 @@ impl<O: IsA<LFOControlSource>> LFOControlSourceExt for O {
 
     #[doc(alias = "offset")]
     fn connect_offset_notify<F: Fn(&Self) + Send + Sync + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_offset_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_offset_trampoline<
+            P: IsA<LFOControlSource>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstLFOControlSource,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<LFOControlSource>,
-        {
             let f: &F = &*(f as *const F);
             f(&LFOControlSource::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -299,13 +302,14 @@ impl<O: IsA<LFOControlSource>> LFOControlSourceExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_timeshift_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_timeshift_trampoline<
+            P: IsA<LFOControlSource>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstLFOControlSource,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<LFOControlSource>,
-        {
             let f: &F = &*(f as *const F);
             f(&LFOControlSource::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -327,13 +331,14 @@ impl<O: IsA<LFOControlSource>> LFOControlSourceExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_waveform_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_waveform_trampoline<
+            P: IsA<LFOControlSource>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstLFOControlSource,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<LFOControlSource>,
-        {
             let f: &F = &*(f as *const F);
             f(&LFOControlSource::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-controller/src/auto/timed_value_control_source.rs

@@ -116,15 +116,13 @@ impl<O: IsA<TimedValueControlSource>> TimedValueControlSourceExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn value_added_trampoline<
-            P,
+            P: IsA<TimedValueControlSource>,
             F: Fn(&P, &ControlPoint) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstTimedValueControlSource,
             timed_value: *mut ffi::GstControlPoint,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimedValueControlSource>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &TimedValueControlSource::from_glib_borrow(this).unsafe_cast_ref(),
@@ -150,15 +148,13 @@ impl<O: IsA<TimedValueControlSource>> TimedValueControlSourceExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn value_changed_trampoline<
-            P,
+            P: IsA<TimedValueControlSource>,
             F: Fn(&P, &ControlPoint) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstTimedValueControlSource,
             timed_value: *mut ffi::GstControlPoint,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimedValueControlSource>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &TimedValueControlSource::from_glib_borrow(this).unsafe_cast_ref(),
@@ -184,15 +180,13 @@ impl<O: IsA<TimedValueControlSource>> TimedValueControlSourceExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn value_removed_trampoline<
-            P,
+            P: IsA<TimedValueControlSource>,
             F: Fn(&P, &ControlPoint) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstTimedValueControlSource,
             timed_value: *mut ffi::GstControlPoint,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimedValueControlSource>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &TimedValueControlSource::from_glib_borrow(this).unsafe_cast_ref(),

gstreamer-controller/src/auto/trigger_control_source.rs

@@ -85,13 +85,14 @@ impl<O: IsA<TriggerControlSource>> TriggerControlSourceExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_tolerance_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_tolerance_trampoline<
+            P: IsA<TriggerControlSource>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstTriggerControlSource,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TriggerControlSource>,
-        {
             let f: &F = &*(f as *const F);
             f(&TriggerControlSource::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-controller/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)

gstreamer-controller/sys/build.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-controller/sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-controller/sys/tests/abi.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-controller/sys/tests/constant.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-controller/sys/tests/layout.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-editing-services/src/auto/asset.rs

@@ -235,13 +235,11 @@ impl<O: IsA<Asset>> AssetExt for O {
 
     #[doc(alias = "proxy")]
     fn connect_proxy_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_proxy_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_proxy_trampoline<P: IsA<Asset>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESAsset,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Asset>,
-        {
             let f: &F = &*(f as *const F);
             f(&Asset::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -260,13 +258,11 @@ impl<O: IsA<Asset>> AssetExt for O {
 
     #[doc(alias = "proxy-target")]
     fn connect_proxy_target_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_proxy_target_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_proxy_target_trampoline<P: IsA<Asset>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESAsset,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Asset>,
-        {
             let f: &F = &*(f as *const F);
             f(&Asset::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/clip.rs

@@ -529,13 +529,11 @@ impl<O: IsA<Clip>> ClipExt for O {
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
     #[doc(alias = "duration-limit")]
     fn connect_duration_limit_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_duration_limit_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_duration_limit_trampoline<P: IsA<Clip>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESClip,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Clip>,
-        {
             let f: &F = &*(f as *const F);
             f(&Clip::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -554,13 +552,11 @@ impl<O: IsA<Clip>> ClipExt for O {
 
     #[doc(alias = "layer")]
     fn connect_layer_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_layer_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_layer_trampoline<P: IsA<Clip>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESClip,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Clip>,
-        {
             let f: &F = &*(f as *const F);
             f(&Clip::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -579,13 +575,14 @@ impl<O: IsA<Clip>> ClipExt for O {
 
     #[doc(alias = "supported-formats")]
     fn connect_supported_formats_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_supported_formats_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_supported_formats_trampoline<
+            P: IsA<Clip>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESClip,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Clip>,
-        {
             let f: &F = &*(f as *const F);
             f(&Clip::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/container.rs

@@ -163,13 +163,14 @@ impl<O: IsA<Container>> GESContainerExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn child_added_trampoline<P, F: Fn(&P, &TimelineElement) + 'static>(
+        unsafe extern "C" fn child_added_trampoline<
+            P: IsA<Container>,
+            F: Fn(&P, &TimelineElement) + 'static,
+        >(
             this: *mut ffi::GESContainer,
             element: *mut ffi::GESTimelineElement,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Container>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Container::from_glib_borrow(this).unsafe_cast_ref(),
@@ -194,13 +195,14 @@ impl<O: IsA<Container>> GESContainerExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn child_removed_trampoline<P, F: Fn(&P, &TimelineElement) + 'static>(
+        unsafe extern "C" fn child_removed_trampoline<
+            P: IsA<Container>,
+            F: Fn(&P, &TimelineElement) + 'static,
+        >(
             this: *mut ffi::GESContainer,
             element: *mut ffi::GESTimelineElement,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Container>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Container::from_glib_borrow(this).unsafe_cast_ref(),
@@ -222,13 +224,11 @@ impl<O: IsA<Container>> GESContainerExt for O {
 
     #[doc(alias = "height")]
     fn connect_height_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_height_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_height_trampoline<P: IsA<Container>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESContainer,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Container>,
-        {
             let f: &F = &*(f as *const F);
             f(&Container::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/group.rs

@@ -204,13 +204,11 @@ impl<O: IsA<Group>> GroupExt for O {
 
     #[doc(alias = "duration")]
     fn connect_duration_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_duration_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_duration_trampoline<P: IsA<Group>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESGroup,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Group>,
-        {
             let f: &F = &*(f as *const F);
             f(&Group::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -229,13 +227,11 @@ impl<O: IsA<Group>> GroupExt for O {
 
     #[doc(alias = "in-point")]
     fn connect_in_point_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_in_point_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_in_point_trampoline<P: IsA<Group>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESGroup,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Group>,
-        {
             let f: &F = &*(f as *const F);
             f(&Group::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -254,13 +250,11 @@ impl<O: IsA<Group>> GroupExt for O {
 
     #[doc(alias = "max-duration")]
     fn connect_max_duration_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_max_duration_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_max_duration_trampoline<P: IsA<Group>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESGroup,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Group>,
-        {
             let f: &F = &*(f as *const F);
             f(&Group::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -279,13 +273,11 @@ impl<O: IsA<Group>> GroupExt for O {
 
     #[doc(alias = "priority")]
     fn connect_priority_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_priority_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_priority_trampoline<P: IsA<Group>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESGroup,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Group>,
-        {
             let f: &F = &*(f as *const F);
             f(&Group::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -304,13 +296,11 @@ impl<O: IsA<Group>> GroupExt for O {
 
     #[doc(alias = "start")]
     fn connect_start_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_start_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_start_trampoline<P: IsA<Group>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESGroup,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Group>,
-        {
             let f: &F = &*(f as *const F);
             f(&Group::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/layer.rs

@@ -338,13 +338,11 @@ impl<O: IsA<Layer>> LayerExt for O {
 
     #[doc(alias = "clip-added")]
     fn connect_clip_added<F: Fn(&Self, &Clip) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn clip_added_trampoline<P, F: Fn(&P, &Clip) + 'static>(
+        unsafe extern "C" fn clip_added_trampoline<P: IsA<Layer>, F: Fn(&P, &Clip) + 'static>(
             this: *mut ffi::GESLayer,
             clip: *mut ffi::GESClip,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Layer>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Layer::from_glib_borrow(this).unsafe_cast_ref(),
@@ -366,13 +364,11 @@ impl<O: IsA<Layer>> LayerExt for O {
 
     #[doc(alias = "clip-removed")]
     fn connect_clip_removed<F: Fn(&Self, &Clip) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn clip_removed_trampoline<P, F: Fn(&P, &Clip) + 'static>(
+        unsafe extern "C" fn clip_removed_trampoline<P: IsA<Layer>, F: Fn(&P, &Clip) + 'static>(
             this: *mut ffi::GESLayer,
             clip: *mut ffi::GESClip,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Layer>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Layer::from_glib_borrow(this).unsafe_cast_ref(),
@@ -394,13 +390,14 @@ impl<O: IsA<Layer>> LayerExt for O {
 
     #[doc(alias = "auto-transition")]
     fn connect_auto_transition_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_auto_transition_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_auto_transition_trampoline<
+            P: IsA<Layer>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESLayer,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Layer>,
-        {
             let f: &F = &*(f as *const F);
             f(&Layer::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -419,13 +416,11 @@ impl<O: IsA<Layer>> LayerExt for O {
 
     #[doc(alias = "priority")]
     fn connect_priority_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_priority_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_priority_trampoline<P: IsA<Layer>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESLayer,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Layer>,
-        {
             let f: &F = &*(f as *const F);
             f(&Layer::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/pipeline.rs

@@ -365,13 +365,14 @@ impl<O: IsA<Pipeline>> GESPipelineExt for O {
 
     #[doc(alias = "audio-filter")]
     fn connect_audio_filter_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_audio_filter_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_audio_filter_trampoline<
+            P: IsA<Pipeline>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESPipeline,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Pipeline>,
-        {
             let f: &F = &*(f as *const F);
             f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -390,13 +391,11 @@ impl<O: IsA<Pipeline>> GESPipelineExt for O {
 
     #[doc(alias = "audio-sink")]
     fn connect_audio_sink_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_audio_sink_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_audio_sink_trampoline<P: IsA<Pipeline>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESPipeline,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Pipeline>,
-        {
             let f: &F = &*(f as *const F);
             f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -415,13 +414,11 @@ impl<O: IsA<Pipeline>> GESPipelineExt for O {
 
     #[doc(alias = "mode")]
     fn connect_mode_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_mode_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_mode_trampoline<P: IsA<Pipeline>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESPipeline,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Pipeline>,
-        {
             let f: &F = &*(f as *const F);
             f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -440,13 +437,11 @@ impl<O: IsA<Pipeline>> GESPipelineExt for O {
 
     #[doc(alias = "timeline")]
     fn connect_timeline_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_timeline_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_timeline_trampoline<P: IsA<Pipeline>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESPipeline,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Pipeline>,
-        {
             let f: &F = &*(f as *const F);
             f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -465,13 +460,14 @@ impl<O: IsA<Pipeline>> GESPipelineExt for O {
 
     #[doc(alias = "video-filter")]
     fn connect_video_filter_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_video_filter_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_video_filter_trampoline<
+            P: IsA<Pipeline>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESPipeline,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Pipeline>,
-        {
             let f: &F = &*(f as *const F);
             f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -490,13 +486,11 @@ impl<O: IsA<Pipeline>> GESPipelineExt for O {
 
     #[doc(alias = "video-sink")]
     fn connect_video_sink_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_video_sink_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_video_sink_trampoline<P: IsA<Pipeline>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESPipeline,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Pipeline>,
-        {
             let f: &F = &*(f as *const F);
             f(&Pipeline::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/project.rs

@@ -284,13 +284,14 @@ impl<O: IsA<Project>> ProjectExt for O {
 
     #[doc(alias = "asset-added")]
     fn connect_asset_added<F: Fn(&Self, &Asset) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn asset_added_trampoline<P, F: Fn(&P, &Asset) + 'static>(
+        unsafe extern "C" fn asset_added_trampoline<
+            P: IsA<Project>,
+            F: Fn(&P, &Asset) + 'static,
+        >(
             this: *mut ffi::GESProject,
             asset: *mut ffi::GESAsset,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Project>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Project::from_glib_borrow(this).unsafe_cast_ref(),
@@ -312,13 +313,14 @@ impl<O: IsA<Project>> ProjectExt for O {
 
     #[doc(alias = "asset-loading")]
     fn connect_asset_loading<F: Fn(&Self, &Asset) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn asset_loading_trampoline<P, F: Fn(&P, &Asset) + 'static>(
+        unsafe extern "C" fn asset_loading_trampoline<
+            P: IsA<Project>,
+            F: Fn(&P, &Asset) + 'static,
+        >(
             this: *mut ffi::GESProject,
             asset: *mut ffi::GESAsset,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Project>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Project::from_glib_borrow(this).unsafe_cast_ref(),
@@ -340,13 +342,14 @@ impl<O: IsA<Project>> ProjectExt for O {
 
     #[doc(alias = "asset-removed")]
     fn connect_asset_removed<F: Fn(&Self, &Asset) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn asset_removed_trampoline<P, F: Fn(&P, &Asset) + 'static>(
+        unsafe extern "C" fn asset_removed_trampoline<
+            P: IsA<Project>,
+            F: Fn(&P, &Asset) + 'static,
+        >(
             this: *mut ffi::GESProject,
             asset: *mut ffi::GESAsset,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Project>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Project::from_glib_borrow(this).unsafe_cast_ref(),
@@ -374,16 +377,14 @@ impl<O: IsA<Project>> ProjectExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn error_loading_trampoline<
-            P,
+            P: IsA<Project>,
             F: Fn(&P, &Timeline, &glib::Error) + 'static,
         >(
             this: *mut ffi::GESProject,
             timeline: *mut ffi::GESTimeline,
             error: *mut glib::ffi::GError,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Project>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Project::from_glib_borrow(this).unsafe_cast_ref(),
@@ -412,7 +413,7 @@ impl<O: IsA<Project>> ProjectExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn error_loading_asset_trampoline<
-            P,
+            P: IsA<Project>,
             F: Fn(&P, &glib::Error, &str, glib::types::Type) + 'static,
         >(
             this: *mut ffi::GESProject,
@@ -420,9 +421,7 @@ impl<O: IsA<Project>> ProjectExt for O {
             id: *mut libc::c_char,
             extractable_type: glib::ffi::GType,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Project>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Project::from_glib_borrow(this).unsafe_cast_ref(),
@@ -446,13 +445,11 @@ impl<O: IsA<Project>> ProjectExt for O {
 
     #[doc(alias = "loaded")]
     fn connect_loaded<F: Fn(&Self, &Timeline) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn loaded_trampoline<P, F: Fn(&P, &Timeline) + 'static>(
+        unsafe extern "C" fn loaded_trampoline<P: IsA<Project>, F: Fn(&P, &Timeline) + 'static>(
             this: *mut ffi::GESProject,
             timeline: *mut ffi::GESTimeline,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Project>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Project::from_glib_borrow(this).unsafe_cast_ref(),
@@ -476,13 +473,11 @@ impl<O: IsA<Project>> ProjectExt for O {
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
     #[doc(alias = "loading")]
     fn connect_loading<F: Fn(&Self, &Timeline) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn loading_trampoline<P, F: Fn(&P, &Timeline) + 'static>(
+        unsafe extern "C" fn loading_trampoline<P: IsA<Project>, F: Fn(&P, &Timeline) + 'static>(
             this: *mut ffi::GESProject,
             timeline: *mut ffi::GESTimeline,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Project>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Project::from_glib_borrow(this).unsafe_cast_ref(),
@@ -510,17 +505,14 @@ impl<O: IsA<Project>> ProjectExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn missing_uri_trampoline<
-            P,
+            P: IsA<Project>,
             F: Fn(&P, &glib::Error, &Asset) -> Option<glib::GString> + 'static,
         >(
             this: *mut ffi::GESProject,
             error: *mut glib::ffi::GError,
             wrong_asset: *mut ffi::GESAsset,
             f: glib::ffi::gpointer,
-        ) -> *mut libc::c_char
+        ) -> *mut libc::c_char {
-        where
-            P: IsA<Project>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Project::from_glib_borrow(this).unsafe_cast_ref(),

gstreamer-editing-services/src/auto/timeline.rs

@@ -506,12 +506,10 @@ impl<O: IsA<Timeline>> TimelineExt for O {
 
     #[doc(alias = "commited")]
     fn connect_commited<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn commited_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn commited_trampoline<P: IsA<Timeline>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESTimeline,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(&Timeline::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -530,13 +528,14 @@ impl<O: IsA<Timeline>> TimelineExt for O {
 
     #[doc(alias = "group-added")]
     fn connect_group_added<F: Fn(&Self, &Group) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn group_added_trampoline<P, F: Fn(&P, &Group) + 'static>(
+        unsafe extern "C" fn group_added_trampoline<
+            P: IsA<Timeline>,
+            F: Fn(&P, &Group) + 'static,
+        >(
             this: *mut ffi::GESTimeline,
             group: *mut ffi::GESGroup,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Timeline::from_glib_borrow(this).unsafe_cast_ref(),
@@ -563,13 +562,14 @@ impl<O: IsA<Timeline>> TimelineExt for O {
 
     #[doc(alias = "layer-added")]
     fn connect_layer_added<F: Fn(&Self, &Layer) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn layer_added_trampoline<P, F: Fn(&P, &Layer) + 'static>(
+        unsafe extern "C" fn layer_added_trampoline<
+            P: IsA<Timeline>,
+            F: Fn(&P, &Layer) + 'static,
+        >(
             this: *mut ffi::GESTimeline,
             layer: *mut ffi::GESLayer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Timeline::from_glib_borrow(this).unsafe_cast_ref(),
@@ -591,13 +591,14 @@ impl<O: IsA<Timeline>> TimelineExt for O {
 
     #[doc(alias = "layer-removed")]
     fn connect_layer_removed<F: Fn(&Self, &Layer) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn layer_removed_trampoline<P, F: Fn(&P, &Layer) + 'static>(
+        unsafe extern "C" fn layer_removed_trampoline<
+            P: IsA<Timeline>,
+            F: Fn(&P, &Layer) + 'static,
+        >(
             this: *mut ffi::GESTimeline,
             layer: *mut ffi::GESLayer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Timeline::from_glib_borrow(this).unsafe_cast_ref(),
@@ -625,17 +626,14 @@ impl<O: IsA<Timeline>> TimelineExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn select_element_track_trampoline<
-            P,
+            P: IsA<Timeline>,
             F: Fn(&P, &Clip, &TrackElement) -> Track + 'static,
         >(
             this: *mut ffi::GESTimeline,
             clip: *mut ffi::GESClip,
             track_element: *mut ffi::GESTrackElement,
             f: glib::ffi::gpointer,
-        ) -> *mut ffi::GESTrack
+        ) -> *mut ffi::GESTrack {
-        where
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Timeline::from_glib_borrow(this).unsafe_cast_ref(),
@@ -668,7 +666,7 @@ impl<O: IsA<Timeline>> TimelineExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn snapping_ended_trampoline<
-            P,
+            P: IsA<Timeline>,
             F: Fn(&P, &TrackElement, &TrackElement, u64) + 'static,
         >(
             this: *mut ffi::GESTimeline,
@@ -676,9 +674,7 @@ impl<O: IsA<Timeline>> TimelineExt for O {
             obj2: *mut ffi::GESTrackElement,
             position: u64,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Timeline::from_glib_borrow(this).unsafe_cast_ref(),
@@ -706,7 +702,7 @@ impl<O: IsA<Timeline>> TimelineExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn snapping_started_trampoline<
-            P,
+            P: IsA<Timeline>,
             F: Fn(&P, &TrackElement, &TrackElement, u64) + 'static,
         >(
             this: *mut ffi::GESTimeline,
@@ -714,9 +710,7 @@ impl<O: IsA<Timeline>> TimelineExt for O {
             obj2: *mut ffi::GESTrackElement,
             position: u64,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Timeline::from_glib_borrow(this).unsafe_cast_ref(),
@@ -740,13 +734,14 @@ impl<O: IsA<Timeline>> TimelineExt for O {
 
     #[doc(alias = "track-added")]
     fn connect_track_added<F: Fn(&Self, &Track) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn track_added_trampoline<P, F: Fn(&P, &Track) + 'static>(
+        unsafe extern "C" fn track_added_trampoline<
+            P: IsA<Timeline>,
+            F: Fn(&P, &Track) + 'static,
+        >(
             this: *mut ffi::GESTimeline,
             track: *mut ffi::GESTrack,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Timeline::from_glib_borrow(this).unsafe_cast_ref(),
@@ -768,13 +763,14 @@ impl<O: IsA<Timeline>> TimelineExt for O {
 
     #[doc(alias = "track-removed")]
     fn connect_track_removed<F: Fn(&Self, &Track) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn track_removed_trampoline<P, F: Fn(&P, &Track) + 'static>(
+        unsafe extern "C" fn track_removed_trampoline<
+            P: IsA<Timeline>,
+            F: Fn(&P, &Track) + 'static,
+        >(
             this: *mut ffi::GESTimeline,
             track: *mut ffi::GESTrack,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Timeline::from_glib_borrow(this).unsafe_cast_ref(),
@@ -796,13 +792,14 @@ impl<O: IsA<Timeline>> TimelineExt for O {
 
     #[doc(alias = "auto-transition")]
     fn connect_auto_transition_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_auto_transition_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_auto_transition_trampoline<
+            P: IsA<Timeline>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTimeline,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(&Timeline::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -821,13 +818,11 @@ impl<O: IsA<Timeline>> TimelineExt for O {
 
     #[doc(alias = "duration")]
     fn connect_duration_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_duration_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_duration_trampoline<P: IsA<Timeline>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESTimeline,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(&Timeline::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -846,13 +841,14 @@ impl<O: IsA<Timeline>> TimelineExt for O {
 
     #[doc(alias = "snapping-distance")]
     fn connect_snapping_distance_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_snapping_distance_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_snapping_distance_trampoline<
+            P: IsA<Timeline>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTimeline,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Timeline>,
-        {
             let f: &F = &*(f as *const F);
             f(&Timeline::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/timeline_element.rs

@@ -692,13 +692,14 @@ impl<O: IsA<TimelineElement>> TimelineElementExt for O {
 
     #[doc(alias = "duration")]
     fn connect_duration_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_duration_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_duration_trampoline<
+            P: IsA<TimelineElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTimelineElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimelineElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -717,13 +718,14 @@ impl<O: IsA<TimelineElement>> TimelineElementExt for O {
 
     #[doc(alias = "in-point")]
     fn connect_in_point_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_in_point_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_in_point_trampoline<
+            P: IsA<TimelineElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTimelineElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimelineElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -742,13 +744,14 @@ impl<O: IsA<TimelineElement>> TimelineElementExt for O {
 
     #[doc(alias = "max-duration")]
     fn connect_max_duration_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_max_duration_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_max_duration_trampoline<
+            P: IsA<TimelineElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTimelineElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimelineElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -767,13 +770,14 @@ impl<O: IsA<TimelineElement>> TimelineElementExt for O {
 
     #[doc(alias = "name")]
     fn connect_name_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_name_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_name_trampoline<
+            P: IsA<TimelineElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTimelineElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimelineElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -792,13 +796,14 @@ impl<O: IsA<TimelineElement>> TimelineElementExt for O {
 
     #[doc(alias = "parent")]
     fn connect_parent_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_parent_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_parent_trampoline<
+            P: IsA<TimelineElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTimelineElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimelineElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -817,13 +822,14 @@ impl<O: IsA<TimelineElement>> TimelineElementExt for O {
 
     #[doc(alias = "priority")]
     fn connect_priority_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_priority_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_priority_trampoline<
+            P: IsA<TimelineElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTimelineElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimelineElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -842,13 +848,14 @@ impl<O: IsA<TimelineElement>> TimelineElementExt for O {
 
     #[doc(alias = "serialize")]
     fn connect_serialize_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_serialize_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_serialize_trampoline<
+            P: IsA<TimelineElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTimelineElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimelineElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -867,13 +874,14 @@ impl<O: IsA<TimelineElement>> TimelineElementExt for O {
 
     #[doc(alias = "start")]
     fn connect_start_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_start_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_start_trampoline<
+            P: IsA<TimelineElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTimelineElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimelineElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -892,13 +900,14 @@ impl<O: IsA<TimelineElement>> TimelineElementExt for O {
 
     #[doc(alias = "timeline")]
     fn connect_timeline_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_timeline_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_timeline_trampoline<
+            P: IsA<TimelineElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTimelineElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TimelineElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TimelineElement::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/track.rs

@@ -350,12 +350,10 @@ impl<O: IsA<Track>> GESTrackExt for O {
 
     #[doc(alias = "commited")]
     fn connect_commited<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn commited_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn commited_trampoline<P: IsA<Track>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESTrack,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Track>,
-        {
             let f: &F = &*(f as *const F);
             f(&Track::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -377,13 +375,14 @@ impl<O: IsA<Track>> GESTrackExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn track_element_added_trampoline<P, F: Fn(&P, &TrackElement) + 'static>(
+        unsafe extern "C" fn track_element_added_trampoline<
+            P: IsA<Track>,
+            F: Fn(&P, &TrackElement) + 'static,
+        >(
             this: *mut ffi::GESTrack,
             effect: *mut ffi::GESTrackElement,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Track>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Track::from_glib_borrow(this).unsafe_cast_ref(),
@@ -409,15 +408,13 @@ impl<O: IsA<Track>> GESTrackExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn track_element_removed_trampoline<
-            P,
+            P: IsA<Track>,
             F: Fn(&P, &TrackElement) + 'static,
         >(
             this: *mut ffi::GESTrack,
             effect: *mut ffi::GESTrackElement,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Track>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &Track::from_glib_borrow(this).unsafe_cast_ref(),
@@ -439,13 +436,11 @@ impl<O: IsA<Track>> GESTrackExt for O {
 
     #[doc(alias = "duration")]
     fn connect_duration_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_duration_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_duration_trampoline<P: IsA<Track>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESTrack,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Track>,
-        {
             let f: &F = &*(f as *const F);
             f(&Track::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -466,13 +461,11 @@ impl<O: IsA<Track>> GESTrackExt for O {
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
     #[doc(alias = "id")]
     fn connect_id_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_id_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_id_trampoline<P: IsA<Track>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESTrack,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Track>,
-        {
             let f: &F = &*(f as *const F);
             f(&Track::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -491,13 +484,11 @@ impl<O: IsA<Track>> GESTrackExt for O {
 
     #[doc(alias = "mixing")]
     fn connect_mixing_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_mixing_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_mixing_trampoline<P: IsA<Track>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESTrack,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Track>,
-        {
             let f: &F = &*(f as *const F);
             f(&Track::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -516,13 +507,14 @@ impl<O: IsA<Track>> GESTrackExt for O {
 
     #[doc(alias = "restriction-caps")]
     fn connect_restriction_caps_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_restriction_caps_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_restriction_caps_trampoline<
+            P: IsA<Track>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTrack,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<Track>,
-        {
             let f: &F = &*(f as *const F);
             f(&Track::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/track_element.rs

@@ -363,13 +363,11 @@ impl<O: IsA<TrackElement>> TrackElementExt for O {
 
     #[doc(alias = "active")]
     fn connect_active_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_active_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_active_trampoline<P: IsA<TrackElement>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESTrackElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TrackElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TrackElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -393,13 +391,14 @@ impl<O: IsA<TrackElement>> TrackElementExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_auto_clamp_control_sources_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_auto_clamp_control_sources_trampoline<
+            P: IsA<TrackElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTrackElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TrackElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TrackElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -420,13 +419,14 @@ impl<O: IsA<TrackElement>> TrackElementExt for O {
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
     #[doc(alias = "has-internal-source")]
     fn connect_has_internal_source_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_has_internal_source_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_has_internal_source_trampoline<
+            P: IsA<TrackElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTrackElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TrackElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TrackElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -445,13 +445,11 @@ impl<O: IsA<TrackElement>> TrackElementExt for O {
 
     #[doc(alias = "track")]
     fn connect_track_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_track_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_track_trampoline<P: IsA<TrackElement>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESTrackElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TrackElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TrackElement::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -470,13 +468,14 @@ impl<O: IsA<TrackElement>> TrackElementExt for O {
 
     #[doc(alias = "track-type")]
     fn connect_track_type_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_track_type_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_track_type_trampoline<
+            P: IsA<TrackElement>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTrackElement,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TrackElement>,
-        {
             let f: &F = &*(f as *const F);
             f(&TrackElement::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/transition_clip.rs

@@ -82,13 +82,14 @@ impl<O: IsA<TransitionClip>> TransitionClipExt for O {
 
     #[doc(alias = "vtype")]
     fn connect_vtype_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_vtype_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_vtype_trampoline<
+            P: IsA<TransitionClip>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESTransitionClip,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<TransitionClip>,
-        {
             let f: &F = &*(f as *const F);
             f(&TransitionClip::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/uri_clip.rs

@@ -90,13 +90,11 @@ impl<O: IsA<UriClip>> UriClipExt for O {
 
     #[doc(alias = "is-image")]
     fn connect_is_image_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_is_image_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_is_image_trampoline<P: IsA<UriClip>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESUriClip,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<UriClip>,
-        {
             let f: &F = &*(f as *const F);
             f(&UriClip::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -115,13 +113,11 @@ impl<O: IsA<UriClip>> UriClipExt for O {
 
     #[doc(alias = "mute")]
     fn connect_mute_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_mute_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_mute_trampoline<P: IsA<UriClip>, F: Fn(&P) + 'static>(
             this: *mut ffi::GESUriClip,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<UriClip>,
-        {
             let f: &F = &*(f as *const F);
             f(&UriClip::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -140,13 +136,14 @@ impl<O: IsA<UriClip>> UriClipExt for O {
 
     #[doc(alias = "supported-formats")]
     fn connect_supported_formats_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_supported_formats_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_supported_formats_trampoline<
+            P: IsA<UriClip>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESUriClip,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<UriClip>,
-        {
             let f: &F = &*(f as *const F);
             f(&UriClip::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/uri_clip_asset.rs

@@ -169,13 +169,14 @@ impl<O: IsA<UriClipAsset>> UriClipAssetExt for O {
 
     #[doc(alias = "duration")]
     fn connect_duration_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_duration_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_duration_trampoline<
+            P: IsA<UriClipAsset>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESUriClipAsset,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<UriClipAsset>,
-        {
             let f: &F = &*(f as *const F);
             f(&UriClipAsset::from_glib_borrow(this).unsafe_cast_ref())
         }
@@ -196,13 +197,14 @@ impl<O: IsA<UriClipAsset>> UriClipAssetExt for O {
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
     #[doc(alias = "is-nested-timeline")]
     fn connect_is_nested_timeline_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_is_nested_timeline_trampoline<P, F: Fn(&P) + 'static>(
+        unsafe extern "C" fn notify_is_nested_timeline_trampoline<
+            P: IsA<UriClipAsset>,
+            F: Fn(&P) + 'static,
+        >(
             this: *mut ffi::GESUriClipAsset,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<UriClipAsset>,
-        {
             let f: &F = &*(f as *const F);
             f(&UriClipAsset::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-editing-services/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)

gstreamer-editing-services/sys/build.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-editing-services/sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-editing-services/sys/tests/abi.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-editing-services/sys/tests/constant.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-editing-services/sys/tests/layout.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/egl/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)

gstreamer-gl/egl/sys/build.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/egl/sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/egl/sys/tests/abi.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/egl/sys/tests/constant.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/egl/sys/tests/layout.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/src/auto/gl_base_filter.rs

@@ -85,13 +85,14 @@ impl<O: IsA<GLBaseFilter>> GLBaseFilterExt for O {
         &self,
         f: F,
     ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_context_trampoline<P, F: Fn(&P) + Send + Sync + 'static>(
+        unsafe extern "C" fn notify_context_trampoline<
+            P: IsA<GLBaseFilter>,
+            F: Fn(&P) + Send + Sync + 'static,
+        >(
             this: *mut ffi::GstGLBaseFilter,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<GLBaseFilter>,
-        {
             let f: &F = &*(f as *const F);
             f(&GLBaseFilter::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-gl/src/auto/gl_base_src.rs

@@ -71,15 +71,13 @@ impl<O: IsA<GLBaseSrc>> GLBaseSrcExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn notify_timestamp_offset_trampoline<
-            P,
+            P: IsA<GLBaseSrc>,
             F: Fn(&P) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstGLBaseSrc,
             _param_spec: glib::ffi::gpointer,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<GLBaseSrc>,
-        {
             let f: &F = &*(f as *const F);
             f(&GLBaseSrc::from_glib_borrow(this).unsafe_cast_ref())
         }

gstreamer-gl/src/auto/gl_display.rs

@@ -199,16 +199,13 @@ impl<O: IsA<GLDisplay>> GLDisplayExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn create_context_trampoline<
-            P,
+            P: IsA<GLDisplay>,
             F: Fn(&P, &GLContext) -> GLContext + Send + Sync + 'static,
         >(
             this: *mut ffi::GstGLDisplay,
             context: *mut ffi::GstGLContext,
             f: glib::ffi::gpointer,
-        ) -> *mut ffi::GstGLContext
+        ) -> *mut ffi::GstGLContext {
-        where
-            P: IsA<GLDisplay>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &GLDisplay::from_glib_borrow(this).unsafe_cast_ref(),

gstreamer-gl/src/auto/gl_overlay_compositor.rs

@@ -102,7 +102,7 @@ impl GLOverlayCompositor {
     #[cfg(any(feature = "v1_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))]
     #[doc(alias = "yinvert")]
-    pub fn connect_yinvert_notify<F: Fn(&GLOverlayCompositor) + Send + Sync + 'static>(
+    pub fn connect_yinvert_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {

gstreamer-gl/src/auto/gl_shader.rs

@@ -428,7 +428,7 @@ impl GLShader {
     }
 
     #[doc(alias = "linked")]
-    pub fn connect_linked_notify<F: Fn(&GLShader) + Send + Sync + 'static>(
+    pub fn connect_linked_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {

gstreamer-gl/src/auto/gl_view_convert.rs

@@ -231,7 +231,7 @@ impl GLViewConvert {
     }
 
     #[doc(alias = "downmix-mode")]
-    pub fn connect_downmix_mode_notify<F: Fn(&GLViewConvert) + Send + Sync + 'static>(
+    pub fn connect_downmix_mode_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -259,7 +259,7 @@ impl GLViewConvert {
     }
 
     #[doc(alias = "input-flags-override")]
-    pub fn connect_input_flags_override_notify<F: Fn(&GLViewConvert) + Send + Sync + 'static>(
+    pub fn connect_input_flags_override_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -287,7 +287,7 @@ impl GLViewConvert {
     }
 
     #[doc(alias = "input-mode-override")]
-    pub fn connect_input_mode_override_notify<F: Fn(&GLViewConvert) + Send + Sync + 'static>(
+    pub fn connect_input_mode_override_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -315,7 +315,7 @@ impl GLViewConvert {
     }
 
     #[doc(alias = "output-flags-override")]
-    pub fn connect_output_flags_override_notify<F: Fn(&GLViewConvert) + Send + Sync + 'static>(
+    pub fn connect_output_flags_override_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
@@ -343,7 +343,7 @@ impl GLViewConvert {
     }
 
     #[doc(alias = "output-mode-override")]
-    pub fn connect_output_mode_override_notify<F: Fn(&GLViewConvert) + Send + Sync + 'static>(
+    pub fn connect_output_mode_override_notify<F: Fn(&Self) + Send + Sync + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {

gstreamer-gl/src/auto/gl_window.rs

@@ -277,16 +277,14 @@ impl<O: IsA<GLWindow>> GLWindowExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn key_event_trampoline<
-            P,
+            P: IsA<GLWindow>,
             F: Fn(&P, &str, &str) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstGLWindow,
             id: *mut libc::c_char,
             key: *mut libc::c_char,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<GLWindow>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &GLWindow::from_glib_borrow(this).unsafe_cast_ref(),
@@ -313,7 +311,7 @@ impl<O: IsA<GLWindow>> GLWindowExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn mouse_event_trampoline<
-            P,
+            P: IsA<GLWindow>,
             F: Fn(&P, &str, i32, f64, f64) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstGLWindow,
@@ -322,9 +320,7 @@ impl<O: IsA<GLWindow>> GLWindowExt for O {
             x: libc::c_double,
             y: libc::c_double,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<GLWindow>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &GLWindow::from_glib_borrow(this).unsafe_cast_ref(),
@@ -355,7 +351,7 @@ impl<O: IsA<GLWindow>> GLWindowExt for O {
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn scroll_event_trampoline<
-            P,
+            P: IsA<GLWindow>,
             F: Fn(&P, f64, f64, f64, f64) + Send + Sync + 'static,
         >(
             this: *mut ffi::GstGLWindow,
@@ -364,9 +360,7 @@ impl<O: IsA<GLWindow>> GLWindowExt for O {
             delta_x: libc::c_double,
             delta_y: libc::c_double,
             f: glib::ffi::gpointer,
-        ) where
+        ) {
-            P: IsA<GLWindow>,
-        {
             let f: &F = &*(f as *const F);
             f(
                 &GLWindow::from_glib_borrow(this).unsafe_cast_ref(),

gstreamer-gl/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)

gstreamer-gl/sys/build.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/sys/tests/abi.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/sys/tests/constant.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/sys/tests/layout.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/wayland/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)

gstreamer-gl/wayland/sys/build.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/wayland/sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/wayland/sys/tests/abi.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/wayland/sys/tests/constant.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/wayland/sys/tests/layout.c

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/x11/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)

gstreamer-gl/x11/sys/build.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/x11/sys/src/lib.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT

gstreamer-gl/x11/sys/tests/abi.rs

@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 88c650e)
+// Generated by gir (https://github.com/gtk-rs/gir @ de679ce)
 // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a)
 // DO NOT EDIT