Update to gst::_log_macro_

See the details:
https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/980

1 files changed, 18 insertions, 19 deletions

diff --git a/audio/lewton/src/lewtondec/imp.rs b/audio/lewton/src/lewtondec/imp.rs
index 56e293f5..92abc8b2 100644
--- a/audio/lewton/src/lewtondec/imp.rs
+++ b/audio/lewton/src/lewtondec/imp.rs
@@ -10,7 +10,6 @@
 
 use gst::glib;
 use gst::subclass::prelude::*;
-use gst::{gst_debug, gst_error, gst_warning};
 use gst_audio::audio_decoder_error;
 use gst_audio::prelude::*;
 use gst_audio::subclass::prelude::*;
@@ -123,7 +122,7 @@ impl AudioDecoderImpl for LewtonDec {
     }
 
     fn set_format(&self, element: &Self::Type, caps: &gst::Caps) -> Result<(), gst::LoggableError> {
-        gst_debug!(CAT, obj: element, "Setting format {:?}", caps);
+        gst::debug!(CAT, obj: element, "Setting format {:?}", caps);
 
         // When the caps are changing we require new headers
         let mut state_guard = self.state.borrow_mut();
@@ -141,7 +140,7 @@ impl AudioDecoderImpl for LewtonDec {
         if let Ok(Some(streamheaders)) = s.get_optional::<gst::ArrayRef>("streamheader") {
             let streamheaders = streamheaders.as_slice();
             if streamheaders.len() < 3 {
-                gst_debug!(
+                gst::debug!(
                     CAT,
                     obj: element,
                     "Not enough streamheaders, trying in-band"
@@ -155,7 +154,7 @@ impl AudioDecoderImpl for LewtonDec {
             if let (Ok(Some(ident_buf)), Ok(Some(comment_buf)), Ok(Some(setup_buf))) =
                 (ident_buf, comment_buf, setup_buf)
             {
-                gst_debug!(CAT, obj: element, "Got streamheader buffers");
+                gst::debug!(CAT, obj: element, "Got streamheader buffers");
                 state.header_bufs = (Some(ident_buf), Some(comment_buf), Some(setup_buf));
             }
         }
@@ -164,7 +163,7 @@ impl AudioDecoderImpl for LewtonDec {
     }
 
     fn flush(&self, element: &Self::Type, _hard: bool) {
-        gst_debug!(CAT, obj: element, "Flushing");
+        gst::debug!(CAT, obj: element, "Flushing");
 
         let mut state_guard = self.state.borrow_mut();
         if let Some(ref mut state) = *state_guard {
@@ -177,7 +176,7 @@ impl AudioDecoderImpl for LewtonDec {
         element: &Self::Type,
         inbuf: Option<&gst::Buffer>,
     ) -> Result<gst::FlowSuccess, gst::FlowError> {
-        gst_debug!(CAT, obj: element, "Handling buffer {:?}", inbuf);
+        gst::debug!(CAT, obj: element, "Handling buffer {:?}", inbuf);
 
         let inbuf = match inbuf {
             None => return Ok(gst::FlowSuccess::Ok),
@@ -185,7 +184,7 @@ impl AudioDecoderImpl for LewtonDec {
         };
 
         let inmap = inbuf.map_readable().map_err(|_| {
-            gst_error!(CAT, obj: element, "Failed to buffer readable");
+            gst::error!(CAT, obj: element, "Failed to buffer readable");
             gst::FlowError::Error
         })?;
 
@@ -199,7 +198,7 @@ impl AudioDecoderImpl for LewtonDec {
             if state.headerset.is_some() {
                 return Ok(gst::FlowSuccess::Ok);
             } else {
-                gst_error!(CAT, obj: element, "Got empty packet before all headers");
+                gst::error!(CAT, obj: element, "Got empty packet before all headers");
                 return Err(gst::FlowError::Error);
             }
         }
@@ -228,26 +227,26 @@ impl LewtonDec {
     ) -> Result<gst::FlowSuccess, gst::FlowError> {
         // ident header
         if indata[0] == 0x01 {
-            gst_debug!(CAT, obj: element, "Got ident header buffer");
+            gst::debug!(CAT, obj: element, "Got ident header buffer");
             state.header_bufs = (Some(inbuf.clone()), None, None);
         } else if indata[0] == 0x03 {
             // comment header
             if state.header_bufs.0.is_none() {
-                gst_warning!(CAT, obj: element, "Got comment header before ident header");
+                gst::warning!(CAT, obj: element, "Got comment header before ident header");
             } else {
-                gst_debug!(CAT, obj: element, "Got comment header buffer");
+                gst::debug!(CAT, obj: element, "Got comment header buffer");
                 state.header_bufs.1 = Some(inbuf.clone());
             }
         } else if indata[0] == 0x05 {
             // setup header
             if state.header_bufs.0.is_none() || state.header_bufs.1.is_none() {
-                gst_warning!(
+                gst::warning!(
                     CAT,
                     obj: element,
                     "Got setup header before ident/comment header"
                 );
             } else {
-                gst_debug!(CAT, obj: element, "Got setup header buffer");
+                gst::debug!(CAT, obj: element, "Got setup header buffer");
                 state.header_bufs.2 = Some(inbuf.clone());
             }
         }
@@ -276,7 +275,7 @@ impl LewtonDec {
 
         // First try to parse the headers
         let ident_map = ident_buf.map_readable().map_err(|_| {
-            gst_error!(CAT, obj: element, "Failed to map ident buffer readable");
+            gst::error!(CAT, obj: element, "Failed to map ident buffer readable");
             gst::FlowError::Error
         })?;
         let ident = lewton::header::read_header_ident(ident_map.as_ref()).map_err(|err| {
@@ -289,7 +288,7 @@ impl LewtonDec {
         })?;
 
         let comment_map = comment_buf.map_readable().map_err(|_| {
-            gst_error!(CAT, obj: element, "Failed to map comment buffer readable");
+            gst::error!(CAT, obj: element, "Failed to map comment buffer readable");
             gst::FlowError::Error
         })?;
         let comment = lewton::header::read_header_comment(comment_map.as_ref()).map_err(|err| {
@@ -302,7 +301,7 @@ impl LewtonDec {
         })?;
 
         let setup_map = setup_buf.map_readable().map_err(|_| {
-            gst_error!(CAT, obj: element, "Failed to map setup buffer readable");
+            gst::error!(CAT, obj: element, "Failed to map setup buffer readable");
             gst::FlowError::Error
         })?;
         let setup = lewton::header::read_header_setup(
@@ -338,7 +337,7 @@ impl LewtonDec {
 
             let mut map = [0; 8];
             if gst_audio::channel_reorder_map(from, to, &mut map[..channels]).is_err() {
-                gst_error!(
+                gst::error!(
                     CAT,
                     obj: element,
                     "Failed to generate channel reorder map from {:?} to {:?}",
@@ -354,7 +353,7 @@ impl LewtonDec {
         }
         let audio_info = audio_info.build().unwrap();
 
-        gst_debug!(
+        gst::debug!(
             CAT,
             obj: element,
             "Successfully parsed headers: {:?}",
@@ -410,7 +409,7 @@ impl LewtonDec {
         }
 
         let sample_count = decoded.samples.len() / audio_info.channels() as usize;
-        gst_debug!(CAT, obj: element, "Got {} decoded samples", sample_count);
+        gst::debug!(CAT, obj: element, "Got {} decoded samples", sample_count);
 
         if sample_count == 0 {
             return element.finish_frame(None, 1);