Update for macro renames

8 files changed, 51 insertions, 50 deletions

diff --git a/utils/fallbackswitch/src/base/subclass/aggregator.rs b/utils/fallbackswitch/src/base/subclass/aggregator.rs
index e7ed167e..823c8a6e 100644
--- a/utils/fallbackswitch/src/base/subclass/aggregator.rs
+++ b/utils/fallbackswitch/src/base/subclass/aggregator.rs
@@ -13,7 +13,6 @@ use glib::subclass::prelude::*;
 use glib::translate::*;
 
 use gst::subclass::prelude::*;
-use gst::{gst_error_msg, gst_panic_to_error, gst_result_from_gboolean};
 
 use std::ptr;
 
@@ -419,7 +418,7 @@ impl<T: AggregatorImpl> AggregatorImplExt for T {
             let parent_class = data.as_ref().get_parent_class() as *mut ffi::GstAggregatorClass;
             match (*parent_class).src_activate {
                 None => Ok(()),
-                Some(f) => gst_result_from_gboolean!(
+                Some(f) => gst::result_from_gboolean!(
                     f(
                         aggregator.unsafe_cast_ref::<Aggregator>().to_glib_none().0,
                         mode.to_glib(),
@@ -465,7 +464,7 @@ impl<T: AggregatorImpl> AggregatorImplExt for T {
                     {
                         Ok(())
                     } else {
-                        Err(gst_error_msg!(
+                        Err(gst::error_msg!(
                             gst::CoreError::Failed,
                             ["Parent function `start` failed"]
                         ))
@@ -489,7 +488,7 @@ impl<T: AggregatorImpl> AggregatorImplExt for T {
                     {
                         Ok(())
                     } else {
-                        Err(gst_error_msg!(
+                        Err(gst::error_msg!(
                             gst::CoreError::Failed,
                             ["Parent function `stop` failed"]
                         ))
@@ -585,7 +584,7 @@ impl<T: AggregatorImpl> AggregatorImplExt for T {
             (*parent_class)
                 .negotiated_src_caps
                 .map(|f| {
-                    gst_result_from_gboolean!(
+                    gst::result_from_gboolean!(
                         f(
                             aggregator.unsafe_cast_ref::<Aggregator>().to_glib_none().0,
                             caps.to_glib_none().0
@@ -656,7 +655,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
         imp.flush(wrap.unsafe_cast_ref()).into()
     })
     .to_glib()
@@ -674,7 +673,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    let ret = gst_panic_to_error!(&wrap, &instance.panicked(), None, {
+    let ret = gst::panic_to_error!(&wrap, &instance.panicked(), None, {
         imp.clip(
             wrap.unsafe_cast_ref(),
             &from_glib_borrow(aggregator_pad),
@@ -696,7 +695,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
         imp.finish_buffer(wrap.unsafe_cast_ref(), from_glib_full(buffer))
             .into()
     })
@@ -715,7 +714,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(wrap, &instance.panicked(), false, {
+    gst::panic_to_error!(wrap, &instance.panicked(), false, {
         imp.sink_event(
             wrap.unsafe_cast_ref(),
             &from_glib_borrow(aggregator_pad),
@@ -737,7 +736,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
         imp.sink_event_pre_queue(
             wrap.unsafe_cast_ref(),
             &from_glib_borrow(aggregator_pad),
@@ -760,7 +759,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), false, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), false, {
         imp.sink_query(
             wrap.unsafe_cast_ref(),
             &from_glib_borrow(aggregator_pad),
@@ -782,7 +781,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), false, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), false, {
         imp.sink_query_pre_queue(
             wrap.unsafe_cast_ref(),
             &from_glib_borrow(aggregator_pad),
@@ -803,7 +802,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), false, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), false, {
         imp.src_event(wrap.unsafe_cast_ref(), from_glib_full(event))
     })
     .to_glib()
@@ -820,7 +819,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), false, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), false, {
         imp.src_query(wrap.unsafe_cast_ref(), gst::QueryRef::from_mut_ptr(query))
     })
     .to_glib()
@@ -838,7 +837,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), false, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), false, {
         match imp.src_activate(wrap.unsafe_cast_ref(), from_glib(mode), from_glib(active)) {
             Ok(()) => true,
             Err(err) => {
@@ -861,7 +860,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
         imp.aggregate(wrap.unsafe_cast_ref(), from_glib(timeout))
             .into()
     })
@@ -878,7 +877,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), false, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), false, {
         match imp.start(wrap.unsafe_cast_ref()) {
             Ok(()) => true,
             Err(err) => {
@@ -900,7 +899,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), false, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), false, {
         match imp.stop(wrap.unsafe_cast_ref()) {
             Ok(()) => true,
             Err(err) => {
@@ -922,7 +921,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), gst::CLOCK_TIME_NONE, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), gst::CLOCK_TIME_NONE, {
         imp.get_next_time(wrap.unsafe_cast_ref())
     })
     .to_glib()
@@ -941,7 +940,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), None, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), None, {
         let req_name: Borrowed<Option<glib::GString>> = from_glib_borrow(req_name);
 
         imp.create_new_pad(
@@ -970,7 +969,7 @@ where
 
     *res = ptr::null_mut();
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), gst::FlowReturn::Error, {
         match imp.update_src_caps(wrap.unsafe_cast_ref(), &from_glib_borrow(caps)) {
             Ok(res_caps) => {
                 *res = res_caps.into_ptr();
@@ -993,7 +992,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), gst::Caps::new_empty(), {
+    gst::panic_to_error!(&wrap, &instance.panicked(), gst::Caps::new_empty(), {
         imp.fixate_src_caps(wrap.unsafe_cast_ref(), from_glib_full(caps))
     })
     .into_ptr()
@@ -1010,7 +1009,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), false, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), false, {
         match imp.negotiated_src_caps(wrap.unsafe_cast_ref(), &from_glib_borrow(caps)) {
             Ok(()) => true,
             Err(err) => {
@@ -1032,7 +1031,7 @@ where
     let imp = instance.get_impl();
     let wrap: Borrowed<Aggregator> = from_glib_borrow(ptr);
 
-    gst_panic_to_error!(&wrap, &instance.panicked(), false, {
+    gst::panic_to_error!(&wrap, &instance.panicked(), false, {
         imp.negotiate(wrap.unsafe_cast_ref())
     })
     .to_glib()
diff --git a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs b/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs
index 03c2e82a..edca3ed7 100644
--- a/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs
+++ b/utils/fallbackswitch/src/fallbacksrc/custom_source/imp.rs
@@ -20,7 +20,7 @@ use glib::subclass;
 use glib::subclass::prelude::*;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
-use gst::{gst_debug, gst_element_error, gst_error, gst_error_msg};
+use gst::{gst_debug, gst_error};
 
 use std::{mem, sync::Mutex};
 
@@ -189,7 +189,7 @@ impl CustomSource {
             .any(|templ| templ.get_property_presence() == gst::PadPresence::Request)
         {
             gst_error!(CAT, obj: element, "Request pads not supported");
-            gst_element_error!(
+            gst::element_error!(
                 element,
                 gst::LibraryError::Settings,
                 ["Request pads not supported"]
@@ -286,7 +286,7 @@ impl CustomSource {
                 caps if !caps.is_any() && !caps.is_empty() => caps,
                 _ => {
                     gst_error!(CAT, obj: element, "Pad {} had no caps", pad.get_name());
-                    return Err(gst_error_msg!(
+                    return Err(gst::error_msg!(
                         gst::CoreError::Negotiation,
                         ["Pad had no caps"]
                     ));
diff --git a/utils/fallbackswitch/src/fallbacksrc/imp.rs b/utils/fallbackswitch/src/fallbacksrc/imp.rs
index b425b939..89eccc49 100644
--- a/utils/fallbackswitch/src/fallbacksrc/imp.rs
+++ b/utils/fallbackswitch/src/fallbacksrc/imp.rs
@@ -20,7 +20,7 @@ use glib::subclass;
 use glib::subclass::prelude::*;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
-use gst::{gst_debug, gst_element_error, gst_error, gst_error_msg, gst_info, gst_warning};
+use gst::{gst_debug, gst_error, gst_info, gst_warning};
 
 use std::mem;
 use std::sync::Mutex;
@@ -896,7 +896,7 @@ impl FallbackSrc {
             Some(source) => source,
             None => {
                 gst_error!(CAT, obj: element, "No URI or source element configured");
-                gst_element_error!(
+                gst::element_error!(
                     element,
                     gst::LibraryError::Settings,
                     ["No URI or source element configured"]
@@ -1179,7 +1179,7 @@ impl FallbackSrc {
                 "Failed to link source pad to clocksync: {}",
                 err
             );
-            gst_error_msg!(
+            gst::error_msg!(
                 gst::CoreError::Negotiation,
                 ["Failed to link source pad to clocksync: {}", err]
             )
@@ -1382,7 +1382,7 @@ impl FallbackSrc {
         };
         let segment = segment.downcast_ref::<gst::ClockTime>().ok_or_else(|| {
             gst_error!(CAT, obj: element, "Have no time segment");
-            gst_error_msg!(gst::CoreError::Clock, ["Have no time segment"])
+            gst::error_msg!(gst::CoreError::Clock, ["Have no time segment"])
         })?;
 
         let running_time = if pts < segment.get_start() {
diff --git a/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs b/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs
index 2bf79e51..02892a35 100644
--- a/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs
+++ b/utils/fallbackswitch/src/fallbacksrc/video_fallback/imp.rs
@@ -21,7 +21,7 @@ use glib::subclass;
 use glib::subclass::prelude::*;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
-use gst::{gst_debug, gst_element_error, gst_element_warning, gst_error, gst_info, gst_warning};
+use gst::{gst_debug, gst_error, gst_info, gst_warning};
 
 use std::sync::{atomic::AtomicBool, atomic::Ordering, Mutex};
 
@@ -341,7 +341,7 @@ impl VideoFallbackSource {
                         obj: element,
                         "imagefreeze does not support live mode, this will probably misbehave"
                     );
-                    gst_element_warning!(
+                    gst::element_warning!(
                         element,
                         gst::LibraryError::Settings,
                         ["imagefreeze does not support live mode, this will probably misbehave"]
@@ -382,7 +382,7 @@ impl VideoFallbackSource {
                                 .expect("pngdec not found");
                         } else {
                             gst_error!(CAT, obj: &element, "Unsupported caps {}", caps);
-                            gst_element_error!(
+                            gst::element_error!(
                                 element,
                                 gst::StreamError::Format,
                                 ["Unsupported caps {}", caps]
@@ -396,7 +396,7 @@ impl VideoFallbackSource {
                             gst::Element::link_many(&[&typefind, &decoder, &videoconvert])
                         {
                             gst_error!(CAT, obj: &element, "Can't link fallback image decoder");
-                            gst_element_error!(
+                            gst::element_error!(
                                 element,
                                 gst::StreamError::Format,
                                 ["Can't link fallback image decoder"]
diff --git a/utils/fallbackswitch/src/fallbackswitch/imp.rs b/utils/fallbackswitch/src/fallbackswitch/imp.rs
index f6e6a227..082a8269 100644
--- a/utils/fallbackswitch/src/fallbackswitch/imp.rs
+++ b/utils/fallbackswitch/src/fallbackswitch/imp.rs
@@ -28,7 +28,9 @@ use gst_base::prelude::*;
 use gst_base::subclass::prelude::*;
 
 use glib::subclass;
+#[cfg(not(feature = "v1_18"))]
 use glib::subclass::prelude::*;
+#[cfg(not(feature = "v1_18"))]
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_info, gst_log, gst_warning};
 
diff --git a/utils/fallbackswitch/src/lib.rs b/utils/fallbackswitch/src/lib.rs
index e332de69..aefe6853 100644
--- a/utils/fallbackswitch/src/lib.rs
+++ b/utils/fallbackswitch/src/lib.rs
@@ -28,7 +28,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
     Ok(())
 }
 
-gst::gst_plugin_define!(
+gst::plugin_define!(
     fallbackswitch,
     env!("CARGO_PKG_DESCRIPTION"),
     plugin_init,
diff --git a/utils/togglerecord/src/lib.rs b/utils/togglerecord/src/lib.rs
index a69ed8e8..05bb34c1 100644
--- a/utils/togglerecord/src/lib.rs
+++ b/utils/togglerecord/src/lib.rs
@@ -21,7 +21,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
     togglerecord::register(plugin)
 }
 
-gst::gst_plugin_define!(
+gst::plugin_define!(
     togglerecord,
     env!("CARGO_PKG_DESCRIPTION"),
     plugin_init,
diff --git a/utils/togglerecord/src/togglerecord/imp.rs b/utils/togglerecord/src/togglerecord/imp.rs
index d7aabaf7..f9fce4d4 100644
--- a/utils/togglerecord/src/togglerecord/imp.rs
+++ b/utils/togglerecord/src/togglerecord/imp.rs
@@ -20,7 +20,7 @@ use glib::subclass;
 use glib::subclass::prelude::*;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
-use gst::{gst_debug, gst_element_error, gst_log, gst_trace, gst_warning};
+use gst::{gst_debug, gst_log, gst_trace, gst_warning};
 
 use more_asserts::{assert_ge, assert_le, assert_lt};
 
@@ -382,7 +382,7 @@ impl ToggleRecord {
         let duration = data.get_duration(&state);
 
         if !dts_or_pts.is_some() {
-            gst_element_error!(
+            gst::element_error!(
                 element,
                 gst::StreamError::Format,
                 ["Buffer without DTS or PTS"]
@@ -632,13 +632,13 @@ impl ToggleRecord {
         let duration = data.get_duration(&state);
 
         if pts.is_none() {
-            gst_element_error!(element, gst::StreamError::Format, ["Buffer without PTS"]);
+            gst::element_error!(element, gst::StreamError::Format, ["Buffer without PTS"]);
             return Err(gst::FlowError::Error);
         }
 
         let dts = data.get_dts();
         if dts.is_some() && pts.is_some() && dts != pts {
-            gst_element_error!(
+            gst::element_error!(
                 element,
                 gst::StreamError::Format,
                 ["DTS != PTS not supported for secondary streams"]
@@ -647,7 +647,7 @@ impl ToggleRecord {
         }
 
         if !data.is_keyframe() {
-            gst_element_error!(
+            gst::element_error!(
                 element,
                 gst::StreamError::Format,
                 ["Delta-units not supported for secondary streams"]
@@ -1042,7 +1042,7 @@ impl ToggleRecord {
         buffer: gst::Buffer,
     ) -> Result<gst::FlowSuccess, gst::FlowError> {
         let stream = self.pads.lock().get(pad).cloned().ok_or_else(|| {
-            gst_element_error!(
+            gst::element_error!(
                 element,
                 gst::CoreError::Pad,
                 ["Unknown pad {:?}", pad.get_name()]
@@ -1157,7 +1157,7 @@ impl ToggleRecord {
 
         let stream = match self.pads.lock().get(pad) {
             None => {
-                gst_element_error!(
+                gst::element_error!(
                     element,
                     gst::CoreError::Pad,
                     ["Unknown pad {:?}", pad.get_name()]
@@ -1216,7 +1216,7 @@ impl ToggleRecord {
 
                 let segment = match e.get_segment().clone().downcast::<gst::ClockTime>() {
                     Err(segment) => {
-                        gst_element_error!(
+                        gst::element_error!(
                             element,
                             gst::StreamError::Format,
                             [
@@ -1230,7 +1230,7 @@ impl ToggleRecord {
                 };
 
                 if (segment.get_rate() - 1.0).abs() > f64::EPSILON {
-                    gst_element_error!(
+                    gst::element_error!(
                         element,
                         gst::StreamError::Format,
                         [
@@ -1346,7 +1346,7 @@ impl ToggleRecord {
     ) -> bool {
         let stream = match self.pads.lock().get(pad) {
             None => {
-                gst_element_error!(
+                gst::element_error!(
                     element,
                     gst::CoreError::Pad,
                     ["Unknown pad {:?}", pad.get_name()]
@@ -1374,7 +1374,7 @@ impl ToggleRecord {
 
         let stream = match self.pads.lock().get(pad) {
             None => {
-                gst_element_error!(
+                gst::element_error!(
                     element,
                     gst::CoreError::Pad,
                     ["Unknown pad {:?}", pad.get_name()]
@@ -1415,7 +1415,7 @@ impl ToggleRecord {
 
         let stream = match self.pads.lock().get(pad) {
             None => {
-                gst_element_error!(
+                gst::element_error!(
                     element,
                     gst::CoreError::Pad,
                     ["Unknown pad {:?}", pad.get_name()]
@@ -1534,7 +1534,7 @@ impl ToggleRecord {
     ) -> gst::Iterator<gst::Pad> {
         let stream = match self.pads.lock().get(pad) {
             None => {
-                gst_element_error!(
+                gst::element_error!(
                     element,
                     gst::CoreError::Pad,
                     ["Unknown pad {:?}", pad.get_name()]