Update everything for glib macro renamings

26 files changed, 31 insertions, 50 deletions

diff --git a/generic/file/src/filesink/imp.rs b/generic/file/src/filesink/imp.rs
index 2521de95c..45422bd74 100644
--- a/generic/file/src/filesink/imp.rs
+++ b/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 {
diff --git a/generic/file/src/filesink/mod.rs b/generic/file/src/filesink/mod.rs
index ac80bd849..442b2fe21 100644
--- a/generic/file/src/filesink/mod.rs
+++ b/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;
 }
 
diff --git a/generic/file/src/filesrc/imp.rs b/generic/file/src/filesrc/imp.rs
index 0eb0aa2e6..7f4fedabb 100644
--- a/generic/file/src/filesrc/imp.rs
+++ b/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 {
diff --git a/generic/file/src/filesrc/mod.rs b/generic/file/src/filesrc/mod.rs
index 5fc15a28f..caad10abf 100644
--- a/generic/file/src/filesrc/mod.rs
+++ b/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;
 }
 
diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs
index 1639b9ee0..4821fb56a 100644
--- a/generic/sodium/src/decrypter/imp.rs
+++ b/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();
diff --git a/generic/sodium/src/decrypter/mod.rs b/generic/sodium/src/decrypter/mod.rs
index 1bf5dbe1e..96f48a09b 100644
--- a/generic/sodium/src/decrypter/mod.rs
+++ b/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;
 }
 
diff --git a/generic/sodium/src/encrypter/imp.rs b/generic/sodium/src/encrypter/imp.rs
index cc30a453d..908e31b95 100644
--- a/generic/sodium/src/encrypter/imp.rs
+++ b/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();
diff --git a/generic/sodium/src/encrypter/mod.rs b/generic/sodium/src/encrypter/mod.rs
index f9eb39ffe..be74c5867 100644
--- a/generic/sodium/src/encrypter/mod.rs
+++ b/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;
 }
 
diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs
index 73c9276f5..8e53fbe04 100644
--- a/generic/threadshare/src/appsrc/imp.rs
+++ b/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(
diff --git a/generic/threadshare/src/appsrc/mod.rs b/generic/threadshare/src/appsrc/mod.rs
index 6f1e17296..ab965eded 100644
--- a/generic/threadshare/src/appsrc/mod.rs
+++ b/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;
 }
 
diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs
index fe861b84e..3b03add30 100644
--- a/generic/threadshare/src/inputselector/imp.rs
+++ b/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(
diff --git a/generic/threadshare/src/inputselector/mod.rs b/generic/threadshare/src/inputselector/mod.rs
index 1b8d9e73d..141a32a29 100644
--- a/generic/threadshare/src/inputselector/mod.rs
+++ b/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;
 }
 
diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs
index e9dbdd6ec..1d312db00 100644
--- a/generic/threadshare/src/jitterbuffer/imp.rs
+++ b/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(
diff --git a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs b/generic/threadshare/src/jitterbuffer/jitterbuffer.rs
index 1a55b85f0..3b59ce45e 100644
--- a/generic/threadshare/src/jitterbuffer/jitterbuffer.rs
+++ b/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 {
diff --git a/generic/threadshare/src/jitterbuffer/mod.rs b/generic/threadshare/src/jitterbuffer/mod.rs
index 0dc7d2806..693d7f4a7 100644
--- a/generic/threadshare/src/jitterbuffer/mod.rs
+++ b/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;
 }
 
diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs
index 84062b6c3..fc8efe20b 100644
--- a/generic/threadshare/src/proxy/imp.rs
+++ b/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(
diff --git a/generic/threadshare/src/proxy/mod.rs b/generic/threadshare/src/proxy/mod.rs
index 2bf3b2dd3..417267a65 100644
--- a/generic/threadshare/src/proxy/mod.rs
+++ b/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;
 }
 
diff --git a/generic/threadshare/src/queue/imp.rs b/generic/threadshare/src/queue/imp.rs
index 9d53b7a59..aba422744 100644
--- a/generic/threadshare/src/queue/imp.rs
+++ b/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(
diff --git a/generic/threadshare/src/queue/mod.rs b/generic/threadshare/src/queue/mod.rs
index 153939f9d..ccf8cb406 100644
--- a/generic/threadshare/src/queue/mod.rs
+++ b/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;
 }
 
diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs
index f3ef2fbfb..17bdb5031 100644
--- a/generic/threadshare/src/tcpclientsrc/imp.rs
+++ b/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(
diff --git a/generic/threadshare/src/tcpclientsrc/mod.rs b/generic/threadshare/src/tcpclientsrc/mod.rs
index c78ba826a..e34cd4e2f 100644
--- a/generic/threadshare/src/tcpclientsrc/mod.rs
+++ b/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;
 }
 
diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs
index eccd1d6fc..4b1e2bbba 100644
--- a/generic/threadshare/src/udpsink/imp.rs
+++ b/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(
diff --git a/generic/threadshare/src/udpsink/mod.rs b/generic/threadshare/src/udpsink/mod.rs
index da0729e93..1776694a5 100644
--- a/generic/threadshare/src/udpsink/mod.rs
+++ b/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;
 }
 
diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs
index 009ce43d6..deab07de9 100644
--- a/generic/threadshare/src/udpsrc/imp.rs
+++ b/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(
diff --git a/generic/threadshare/src/udpsrc/mod.rs b/generic/threadshare/src/udpsrc/mod.rs
index 19ebd2e1d..37ffb0d10 100644
--- a/generic/threadshare/src/udpsrc/mod.rs
+++ b/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;
 }
 
diff --git a/generic/threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs
index 261a4f441..cf0ac384d 100644
--- a/generic/threadshare/tests/pad.rs
+++ b/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 {}