gst/audioresample/: Convert to using gst debugging

Original commit message from CVS:
* gst/audioresample/Makefile.am:
* gst/audioresample/debug.h:
* gst/audioresample/gstaudioresample.c:
* gst/audioresample/resample.c: Convert to using gst debugging

diff --git a/common b/common
index cd4da6a319d9f92d28f7b8a3b412577e6de50b64..793f85c1c14de9c1053b8db7df44bfbba1f0a156 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit cd4da6a319d9f92d28f7b8a3b412577e6de50b64
+Subproject commit 793f85c1c14de9c1053b8db7df44bfbba1f0a156

diff --git a/gst/audioresample/Makefile.am b/gst/audioresample/Makefile.am
index c3e8766e9a4dee3847cc09dd9c00b747e340583c..10b5377fe057d77a0d8d9905927495ac2c67d1ff 100644 (file)
--- a/gst/audioresample/Makefile.am
+++ b/gst/audioresample/Makefile.am
@@ -7,7 +7,6 @@ resample_SOURCES = \
        resample_ref.c \
        resample_chunk.c \
        resample.h \
-       debug.c \
        buffer.c
 
 noinst_HEADERS = \

diff --git a/gst/audioresample/debug.h b/gst/audioresample/debug.h
index 2205940c34218fbe4962e834cf7351bdf15db3fa..b369fe63eeb1872f92df00b7c154ebe954d8f1e5 100644 (file)
--- a/gst/audioresample/debug.h
+++ b/gst/audioresample/debug.h
@@ -2,6 +2,7 @@
 #ifndef __RESAMPLE_DEBUG_H__
 #define __RESAMPLE_DEBUG_H__
 
+#if 0
 enum
 {
   RESAMPLE_LEVEL_NONE = 0,
@@ -30,5 +31,21 @@ void resample_debug_log (int level, const char *file, const char *function,
     int line, const char *format, ...);
 void resample_debug_set_level (int level);
 int resample_debug_get_level (void);
+#else
+
+#include <gst/gst.h>
+
+GST_DEBUG_CATEGORY_EXTERN (audioresample_debug);
+#define GST_CAT_DEFAULT audioresample_debug
+
+#define RESAMPLE_ERROR(...) GST_ERROR(__VA_ARGS__)
+#define RESAMPLE_WARNING(...) GST_WARNING(__VA_ARGS__)
+#define RESAMPLE_INFO(...) GST_INFO(__VA_ARGS__)
+#define RESAMPLE_DEBUG(...) GST_DEBUG(__VA_ARGS__)
+#define RESAMPLE_LOG(...) GST_LOG(__VA_ARGS__)
+
+#define resample_debug_set_level(x) do { } while (0)
+
+#endif
 
 #endif

diff --git a/gst/audioresample/gstaudioresample.c b/gst/audioresample/gstaudioresample.c
index 1d11856e335cea36fe7905034ecee7cb4a7c8c43..62736e98d44b0baa7b1513f82d960e17a64a4f48 100644 (file)
--- a/gst/audioresample/gstaudioresample.c
+++ b/gst/audioresample/gstaudioresample.c
@@ -31,7 +31,7 @@
 #include <gst/audio/audio.h>
 #include <gst/base/gstbasetransform.h>
 
-GST_DEBUG_CATEGORY_STATIC (audioresample_debug);
+GST_DEBUG_CATEGORY (audioresample_debug);
 #define GST_CAT_DEFAULT audioresample_debug
 
 /* elementfactory information */

diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c
index fb39807fca26dae70296d7ff947483722bd9acd2..1f79363908d4fb365487f0ea5ac94992a8c2cc0e 100644 (file)
--- a/gst/audioresample/resample.c
+++ b/gst/audioresample/resample.c
@@ -37,21 +37,15 @@ void resample_scale_ref (ResampleState * r);
 void resample_scale_functable (ResampleState * r);
 
 
-
 void
 resample_init (void)
 {
   static int inited = 0;
-  const char *debug;
 
   if (!inited) {
     oil_init ();
     inited = 1;
   }
-
-  if ((debug = g_getenv ("RESAMPLE_DEBUG"))) {
-    resample_debug_set_level (atoi (debug));
-  }
 }
 
 ResampleState *