Update everything for glib macro renamings

audio/audiofx/src/audioecho/imp.rs

@@ -138,7 +138,7 @@ impl ObjectSubclass for AudioEcho {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

audio/audiofx/src/audioecho/mod.rs

@@ -11,7 +11,7 @@ use glib::prelude::*;
 mod imp;
 mod ring_buffer;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct AudioEcho(ObjectSubclass<imp::AudioEcho>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 

audio/audiofx/src/audioloudnorm/imp.rs

@@ -1755,7 +1755,7 @@ impl ObjectSubclass for AudioLoudNorm {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

audio/audiofx/src/audioloudnorm/mod.rs

@@ -22,7 +22,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct AudioLoudNorm(ObjectSubclass<imp::AudioLoudNorm>) @extends gst::Element, gst::Object;
 }
 

audio/audiofx/src/audiornnoise/imp.rs

@@ -196,7 +196,7 @@ impl ObjectSubclass for AudioRNNoise {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

audio/audiofx/src/audiornnoise/mod.rs

@@ -11,7 +11,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct AudioRNNoise(ObjectSubclass<imp::AudioRNNoise>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 

audio/claxon/src/claxondec/imp.rs

@@ -37,7 +37,7 @@ impl ObjectSubclass for ClaxonDec {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

audio/claxon/src/claxondec/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct ClaxonDec(ObjectSubclass<imp::ClaxonDec>) @extends gst_audio::AudioDecoder, gst::Element, gst::Object;
 }
 

audio/csound/src/filter/imp.rs

@@ -15,7 +15,6 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_object_subclass;
 use glib::subclass;
 use glib::subclass::prelude::*;
 use gst::prelude::*;
@@ -366,7 +365,7 @@ impl ObjectSubclass for CsoundFilter {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         let csound = Csound::new();

audio/csound/src/filter/mod.rs

@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct CsoundFilter(ObjectSubclass<imp::CsoundFilter>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 

audio/lewton/src/lewtondec/imp.rs

@@ -50,7 +50,7 @@ impl ObjectSubclass for LewtonDec {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

audio/lewton/src/lewtondec/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct LewtonDec(ObjectSubclass<imp::LewtonDec>) @extends gst_audio::AudioDecoder, gst::Element, gst::Object;
 }
 

generic/file/src/filesink/imp.rs

@@ -123,7 +123,7 @@ impl ObjectSubclass for FileSink {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

generic/file/src/filesink/mod.rs

@@ -12,7 +12,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct FileSink(ObjectSubclass<imp::FileSink>) @extends gst_base::BaseSink, gst::Element, gst::Object, @implements gst::URIHandler;
 }
 

generic/file/src/filesrc/imp.rs

@@ -137,7 +137,7 @@ impl ObjectSubclass for FileSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

generic/file/src/filesrc/mod.rs

@@ -11,7 +11,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct FileSrc(ObjectSubclass<imp::FileSrc>) @extends gst_base::BaseSrc, gst::Element, gst::Object, @implements gst::URIHandler;
 }
 

generic/sodium/src/decrypter/imp.rs

@@ -568,7 +568,7 @@ impl ObjectSubclass for Decrypter {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

generic/sodium/src/decrypter/mod.rs

@@ -26,7 +26,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Decrypter(ObjectSubclass<imp::Decrypter>) @extends gst::Element, gst::Object;
 }
 

generic/sodium/src/encrypter/imp.rs

@@ -395,7 +395,7 @@ impl ObjectSubclass for Encrypter {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

generic/sodium/src/encrypter/mod.rs

@@ -26,7 +26,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Encrypter(ObjectSubclass<imp::Encrypter>) @extends gst::Element, gst::Object;
 }
 

generic/threadshare/src/appsrc/imp.rs

@@ -21,7 +21,6 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -564,7 +563,7 @@ impl ObjectSubclass for AppSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(

generic/threadshare/src/appsrc/mod.rs

@@ -16,12 +16,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct AppSrc(ObjectSubclass<imp::AppSrc>) @extends gst::Element, gst::Object;
 }
 

generic/threadshare/src/inputselector/imp.rs

@@ -19,7 +19,6 @@ use futures::future::BoxFuture;
 use futures::future::{abortable, AbortHandle};
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -433,7 +432,7 @@ impl ObjectSubclass for InputSelector {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(

generic/threadshare/src/inputselector/mod.rs

@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct InputSelector(ObjectSubclass<imp::InputSelector>) @extends gst::Element, gst::Object;
 }
 

generic/threadshare/src/jitterbuffer/imp.rs

@@ -19,7 +19,6 @@ use futures::future::BoxFuture;
 use futures::future::{abortable, AbortHandle, Aborted};
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -1417,7 +1416,7 @@ impl ObjectSubclass for JitterBuffer {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(

generic/threadshare/src/jitterbuffer/jitterbuffer.rs

@@ -19,13 +19,12 @@ use super::ffi;
 
 use std::ptr;
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 use glib::translate::*;
 
 use std::mem;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct RTPJitterBuffer(Object<ffi::RTPJitterBuffer>);
 
     match fn {

generic/threadshare/src/jitterbuffer/mod.rs

@@ -22,9 +22,7 @@ mod imp;
 #[allow(clippy::module_inception)]
 pub mod jitterbuffer;
 
-use glib::glib_wrapper;
-
-glib_wrapper! {
+glib::wrapper! {
     pub struct JitterBuffer(ObjectSubclass<imp::JitterBuffer>) @extends gst::Element, gst::Object;
 }
 

generic/threadshare/src/proxy/imp.rs

@@ -19,7 +19,6 @@ use futures::channel::oneshot;
 use futures::future::BoxFuture;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -655,7 +654,7 @@ impl ObjectSubclass for ProxySink {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(
@@ -1170,7 +1169,7 @@ impl ObjectSubclass for ProxySrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(

generic/threadshare/src/proxy/mod.rs

@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct ProxySink(ObjectSubclass<imp::ProxySink>) @extends gst::Element, gst::Object;
 }
 
@@ -29,7 +28,7 @@ glib_wrapper! {
 unsafe impl Send for ProxySink {}
 unsafe impl Sync for ProxySink {}
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct ProxySrc(ObjectSubclass<imp::ProxySrc>) @extends gst::Element, gst::Object;
 }
 

generic/threadshare/src/queue/imp.rs

@@ -19,7 +19,6 @@ use futures::channel::oneshot;
 use futures::future::BoxFuture;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -756,7 +755,7 @@ impl ObjectSubclass for Queue {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(

generic/threadshare/src/queue/mod.rs

@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct Queue(ObjectSubclass<imp::Queue>) @extends gst::Element, gst::Object;
 }
 

generic/threadshare/src/tcpclientsrc/imp.rs

@@ -20,7 +20,6 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -616,7 +615,7 @@ impl ObjectSubclass for TcpClientSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(

generic/threadshare/src/tcpclientsrc/mod.rs

@@ -16,12 +16,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct TcpClientSrc(ObjectSubclass<imp::TcpClientSrc>) @extends gst::Element, gst::Object;
 }
 

generic/threadshare/src/udpsink/imp.rs

@@ -20,7 +20,6 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -1132,7 +1131,7 @@ impl ObjectSubclass for UdpSink {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(

generic/threadshare/src/udpsink/mod.rs

@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct UdpSink(ObjectSubclass<imp::UdpSink>) @extends gst::Element, gst::Object;
 }
 

generic/threadshare/src/udpsrc/imp.rs

@@ -19,7 +19,6 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
-use glib::glib_object_subclass;
 use glib::prelude::*;
 use glib::subclass;
 use glib::subclass::prelude::*;
@@ -793,7 +792,7 @@ impl ObjectSubclass for UdpSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn class_init(klass: &mut Self::Class) {
         klass.set_metadata(

generic/threadshare/src/udpsrc/mod.rs

@@ -15,12 +15,11 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::glib_wrapper;
 use glib::prelude::*;
 
 mod imp;
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct UdpSrc(ObjectSubclass<imp::UdpSrc>) @extends gst::Element, gst::Object;
 }
 

generic/threadshare/tests/pad.rs

@@ -22,7 +22,6 @@ use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
 use glib::GBoxed;
-use glib::{glib_object_subclass, glib_wrapper};
 
 use gst::prelude::*;
 use gst::subclass::prelude::*;
@@ -320,7 +319,7 @@ mod imp_src {
         type Instance = gst::subclass::ElementInstanceStruct<Self>;
         type Class = glib::subclass::simple::ClassStruct<Self>;
 
-        glib_object_subclass!();
+        glib::object_subclass!();
 
         fn class_init(klass: &mut Self::Class) {
             klass.set_metadata(
@@ -442,7 +441,7 @@ mod imp_src {
     }
 }
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct ElementSrcTest(ObjectSubclass<imp_src::ElementSrcTest>) @extends gst::Element, gst::Object;
 }
 unsafe impl Send for ElementSrcTest {}
@@ -638,7 +637,7 @@ mod imp_sink {
         type Instance = gst::subclass::ElementInstanceStruct<Self>;
         type Class = glib::subclass::simple::ClassStruct<Self>;
 
-        glib_object_subclass!();
+        glib::object_subclass!();
 
         fn class_init(klass: &mut Self::Class) {
             klass.set_metadata(
@@ -720,7 +719,7 @@ mod imp_sink {
     }
 }
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct ElementSinkTest(ObjectSubclass<imp_sink::ElementSinkTest>) @extends gst::Element, gst::Object;
 }
 unsafe impl Send for ElementSinkTest {}

net/reqwest/src/reqwesthttpsrc/imp.rs

@@ -1101,7 +1101,7 @@ impl ObjectSubclass for ReqwestHttpSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

net/reqwest/src/reqwesthttpsrc/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct ReqwestHttpSrc(ObjectSubclass<imp::ReqwestHttpSrc>) @extends gst_base::PushSrc, gst_base::BaseSrc, gst::Element, gst::Object, @implements gst::URIHandler;
 }
 

net/rusoto/src/aws_transcriber/imp.rs

@@ -1001,7 +1001,7 @@ impl ObjectSubclass for Transcriber {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

net/rusoto/src/aws_transcriber/mod.rs

@@ -20,7 +20,7 @@ use glib::prelude::*;
 mod imp;
 mod packet;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Transcriber(ObjectSubclass<imp::Transcriber>) @extends gst::Element, gst::Object;
 }
 

net/rusoto/src/s3sink/imp.rs

@@ -389,7 +389,7 @@ impl ObjectSubclass for S3Sink {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

net/rusoto/src/s3sink/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct S3Sink(ObjectSubclass<imp::S3Sink>) @extends gst_base::BaseSink, gst::Element, gst::Object;
 }
 

net/rusoto/src/s3src/imp.rs

@@ -213,7 +213,7 @@ impl ObjectSubclass for S3Src {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

net/rusoto/src/s3src/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct S3Src(ObjectSubclass<imp::S3Src>) @extends gst_base::BaseSrc, gst::Element, gst::Object;
 }
 

text/wrap/src/gsttextwrap/imp.rs

@@ -262,7 +262,7 @@ impl ObjectSubclass for TextWrap {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

text/wrap/src/gsttextwrap/mod.rs

@@ -19,7 +19,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct TextWrap(ObjectSubclass<imp::TextWrap>) @extends gst::Element, gst::Object;
 }
 

tutorial/src/identity/imp.rs

@@ -122,7 +122,7 @@ impl ObjectSubclass for Identity {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here and also get the class struct passed in case it's needed

tutorial/src/identity/mod.rs

@@ -11,7 +11,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Identity(ObjectSubclass<imp::Identity>) @extends gst::Element, gst::Object;
 }
 

tutorial/src/progressbin/imp.rs

@@ -64,7 +64,7 @@ impl ObjectSubclass for ProgressBin {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here and also get the class struct passed in case it's needed

tutorial/src/progressbin/mod.rs

@@ -30,7 +30,7 @@ pub enum ProgressBinOutput {
 }
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct ProgressBin(ObjectSubclass<imp::ProgressBin>) @extends gst::Bin, gst::Element, gst::Object;
 }
 

tutorial/src/rgb2gray/imp.rs

@@ -122,7 +122,7 @@ impl ObjectSubclass for Rgb2Gray {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here.

tutorial/src/rgb2gray/mod.rs

@@ -11,7 +11,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 

tutorial/src/sinesrc/imp.rs

@@ -207,7 +207,7 @@ impl ObjectSubclass for SineSrc {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here.

tutorial/src/sinesrc/mod.rs

@@ -11,7 +11,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct SineSrc(ObjectSubclass<imp::SineSrc>) @extends gst_base::BaseSrc, gst::Element, gst::Object;
 }
 

tutorial/tutorial-1.md

@@ -175,7 +175,7 @@ impl ObjectSubclass for Rgb2Gray {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {}
@@ -198,7 +198,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 
@@ -290,7 +290,7 @@ impl ObjectSubclass for Rgb2Gray {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 }
 
 impl ObjectImpl for Rgb2Gray {}
@@ -305,7 +305,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Rgb2Gray(ObjectSubclass<imp::Rgb2Gray>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 

tutorial/tutorial-2.md

@@ -154,7 +154,7 @@ impl ObjectSubclass for SineSrc {
     type Class = subclass::simple::ClassStruct<Self>;
 
     // This macro provides some boilerplate.
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     // Called when a new instance is to be created. We need to return an instance
     // of our struct here.
@@ -380,7 +380,7 @@ use glib::prelude::*;
 mod imp;
 
 // The public Rust wrapper type for our element
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct SineSrc(ObjectSubclass<imp::SineSrc>) @extends gst_base::BaseSrc, gst::Element, gst::Object;
 }
 

utils/fallbackswitch/src/base/auto/aggregator.rs

@@ -13,7 +13,7 @@ use glib::Value;
 use std::boxed::Box as Box_;
 use std::mem::transmute;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Aggregator(Object<ffi::GstAggregator, ffi::GstAggregatorClass>) @extends gst::Element, gst::Object;
 
     match fn {

utils/fallbackswitch/src/base/auto/aggregator_pad.rs

@@ -13,7 +13,7 @@ use glib::Value;
 use std::boxed::Box as Box_;
 use std::mem::transmute;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct AggregatorPad(Object<ffi::GstAggregatorPad, ffi::GstAggregatorPadClass>) @extends gst::Pad, gst::Object;
 
     match fn {

utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs

@@ -70,7 +70,7 @@ impl ObjectSubclass for CustomSource {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

utils/fallbackswitch/src/fallbacksrc/custom_source/mod.rs

@@ -17,7 +17,7 @@
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct CustomSource(ObjectSubclass<imp::CustomSource>) @extends gst::Bin, gst::Element, gst::Object;
 }
 

utils/fallbackswitch/src/fallbacksrc/imp.rs

@@ -311,7 +311,7 @@ impl ObjectSubclass for FallbackSrc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

utils/fallbackswitch/src/fallbacksrc/mod.rs

@@ -42,7 +42,7 @@ enum Status {
     Running,
 }
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct FallbackSrc(ObjectSubclass<imp::FallbackSrc>) @extends gst::Bin, gst::Element, gst::Object;
 }
 

utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs

@@ -92,7 +92,7 @@ impl ObjectSubclass for VideoFallbackSource {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("src").unwrap();

utils/fallbackswitch/src/fallbacksrc/video_fallback/mod.rs

@@ -18,7 +18,7 @@
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct VideoFallbackSource(ObjectSubclass<imp::VideoFallbackSource>) @extends gst::Bin, gst::Element, gst::Object;
 }
 

utils/fallbackswitch/src/fallbackswitch/imp.rs

@@ -698,7 +698,7 @@ impl ObjectSubclass for FallbackSwitch {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

utils/fallbackswitch/src/fallbackswitch/mod.rs

@@ -22,7 +22,7 @@ use crate::gst_base_compat as gst_base;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct FallbackSwitch(ObjectSubclass<imp::FallbackSwitch>) @extends gst_base::Aggregator, gst::Element, gst::Object;
 }
 

utils/togglerecord/src/togglerecord/imp.rs

@@ -1559,7 +1559,7 @@ impl ObjectSubclass for ToggleRecord {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

utils/togglerecord/src/togglerecord/mod.rs

@@ -19,7 +19,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct ToggleRecord(ObjectSubclass<imp::ToggleRecord>) @extends gst::Element, gst::Object;
 }
 

video/cdg/src/cdgdec/imp.rs

@@ -35,7 +35,7 @@ impl ObjectSubclass for CdgDec {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

video/cdg/src/cdgdec/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct CdgDec(ObjectSubclass<imp::CdgDec>) @extends gst_video::VideoDecoder, gst::Element, gst::Object;
 }
 

video/cdg/src/cdgparse/imp.rs

@@ -42,7 +42,7 @@ impl ObjectSubclass for CdgParse {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self

video/cdg/src/cdgparse/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct CdgParse(ObjectSubclass<imp::CdgParse>) @extends gst_base::BaseParse, gst::Element, gst::Object;
 }
 

video/closedcaption/src/ccdetect/imp.rs

@@ -390,7 +390,7 @@ impl ObjectSubclass for CCDetect {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

video/closedcaption/src/ccdetect/mod.rs

@@ -19,7 +19,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct CCDetect(ObjectSubclass<imp::CCDetect>) @extends gst_base::BaseTransform, gst::Element, gst::Object;
 }
 

video/closedcaption/src/cea608overlay/imp.rs

@@ -391,7 +391,7 @@ impl ObjectSubclass for Cea608Overlay {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

video/closedcaption/src/cea608overlay/mod.rs

@@ -25,7 +25,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Cea608Overlay(ObjectSubclass<imp::Cea608Overlay>) @extends gst::Element, gst::Object;
 }
 

video/closedcaption/src/cea608tott/imp.rs

@@ -378,7 +378,7 @@ impl ObjectSubclass for Cea608ToTt {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

video/closedcaption/src/cea608tott/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Cea608ToTt(ObjectSubclass<imp::Cea608ToTt>) @extends gst::Element, gst::Object;
 }
 

video/closedcaption/src/mcc_enc/imp.rs

@@ -473,7 +473,7 @@ impl ObjectSubclass for MccEnc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

video/closedcaption/src/mcc_enc/mod.rs

@@ -20,7 +20,7 @@ use glib::prelude::*;
 mod headers;
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct MccEnc(ObjectSubclass<imp::MccEnc>) @extends gst::Element, gst::Object;
 }
 

video/closedcaption/src/mcc_parse/imp.rs

@@ -1134,7 +1134,7 @@ impl ObjectSubclass for MccParse {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

video/closedcaption/src/mcc_parse/mod.rs

@@ -20,7 +20,7 @@ use glib::prelude::*;
 mod imp;
 mod parser;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct MccParse(ObjectSubclass<imp::MccParse>) @extends gst::Element, gst::Object;
 }
 

video/closedcaption/src/scc_enc/imp.rs

@@ -340,7 +340,7 @@ impl ObjectSubclass for SccEnc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

video/closedcaption/src/scc_enc/mod.rs

@@ -20,7 +20,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct SccEnc(ObjectSubclass<imp::SccEnc>) @extends gst::Element, gst::Object;
 }
 

video/closedcaption/src/scc_parse/imp.rs

@@ -1003,7 +1003,7 @@ impl ObjectSubclass for SccParse {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

video/closedcaption/src/scc_parse/mod.rs

@@ -21,7 +21,7 @@ use glib::prelude::*;
 mod imp;
 mod parser;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct SccParse(ObjectSubclass<imp::SccParse>) @extends gst::Element, gst::Object;
 }
 

video/closedcaption/src/tttocea608/imp.rs

@@ -790,7 +790,7 @@ impl ObjectSubclass for TtToCea608 {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

video/closedcaption/src/tttocea608/mod.rs

@@ -29,7 +29,7 @@ enum Mode {
     RollUp4,
 }
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct TtToCea608(ObjectSubclass<imp::TtToCea608>) @extends gst::Element, gst::Object;
 }
 

video/dav1d/src/dav1ddec/imp.rs

@@ -352,7 +352,7 @@ impl ObjectSubclass for Dav1dDec {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

video/dav1d/src/dav1ddec/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Dav1dDec(ObjectSubclass<imp::Dav1dDec>) @extends gst_video::VideoDecoder, gst::Element, gst::Object;
 }
 

video/flavors/src/flvdemux/imp.rs

@@ -129,7 +129,7 @@ impl ObjectSubclass for FlvDemux {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.get_pad_template("sink").unwrap();

video/flavors/src/flvdemux/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct FlvDemux(ObjectSubclass<imp::FlvDemux>) @extends gst::Element, gst::Object;
 }
 

video/gif/src/gifenc/imp.rs

@@ -149,7 +149,7 @@ impl ObjectSubclass for GifEnc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

video/gif/src/gifenc/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct GifEnc(ObjectSubclass<imp::GifEnc>) @extends gst_video::VideoEncoder, gst::Element, gst::Object;
 }
 

video/rav1e/src/rav1enc/imp.rs

@@ -303,7 +303,7 @@ impl ObjectSubclass for Rav1Enc {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib::glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

video/rav1e/src/rav1enc/mod.rs

@@ -10,7 +10,7 @@ use glib::prelude::*;
 
 mod imp;
 
-glib::glib_wrapper! {
+glib::wrapper! {
     pub struct Rav1Enc(ObjectSubclass<imp::Rav1Enc>) @extends gst_video::VideoEncoder, gst::Element, gst::Object;
 }
 

video/rspng/src/pngenc/imp.rs

@@ -8,7 +8,6 @@
 
 use std::{io, io::Write, sync::Arc};
 
-use glib::glib_object_subclass;
 use glib::subclass;
 use glib::subclass::prelude::*;
 
@@ -196,7 +195,7 @@ impl ObjectSubclass for PngEncoder {
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
 
-    glib_object_subclass!();
+    glib::object_subclass!();
 
     fn new() -> Self {
         Self {

video/rspng/src/pngenc/mod.rs

@@ -7,7 +7,7 @@
 // except according to those terms.
 
 use glib::prelude::*;
-use glib::{glib_wrapper, GEnum};
+use glib::GEnum;
 
 mod imp;
 
@@ -79,7 +79,7 @@ impl From<FilterType> for png::FilterType {
     }
 }
 
-glib_wrapper! {
+glib::wrapper! {
     pub struct PngEncoder(ObjectSubclass<imp::PngEncoder>) @extends gst_video::VideoEncoder, gst::Element, gst::Object;
 }