ext/wavpack/: Use a general wavpack debug category for common code.

Original commit message from CVS:
* ext/wavpack/gstwavpack.c: (plugin_init):
* ext/wavpack/gstwavpackcommon.c:
Use a general wavpack debug category for common code.
* ext/wavpack/gstwavpackstreamreader.c:
(gst_wavpack_stream_reader_set_pos_abs),
(gst_wavpack_stream_reader_set_pos_rel),
(gst_wavpack_stream_reader_write_bytes):
Use the general wavpack debug category here too and add debug
output to the functions that should not be called at all by
the wavpack library.
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_plugin_init):
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_plugin_init):
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_plugin_init):
Change debugging category names to conform to the conventions.

diff --git a/ext/wavpack/gstwavpack.c b/ext/wavpack/gstwavpack.c
index 912b583..ddd3f2a 100644 (file)
--- a/ext/wavpack/gstwavpack.c
+++ b/ext/wavpack/gstwavpack.c
@@ -27,9 +27,13 @@
 #include "gstwavpackdec.h"
 #include "gstwavpackenc.h"
 
+/* debug category for common code */
+GST_DEBUG_CATEGORY (wavpack_debug);
+
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
+  GST_DEBUG_CATEGORY_INIT (wavpack_debug, "wavpack", 0, "Wavpack elements");
   return (gst_wavpack_parse_plugin_init (plugin)
       && gst_wavpack_dec_plugin_init (plugin)
       && gst_wavpack_enc_plugin_init (plugin));

diff --git a/ext/wavpack/gstwavpackcommon.c b/ext/wavpack/gstwavpackcommon.c
index 0272fdf..ad16186 100644 (file)
--- a/ext/wavpack/gstwavpackcommon.c
+++ b/ext/wavpack/gstwavpackcommon.c
@@ -28,6 +28,9 @@
 #include "gstwavpackcommon.h"
 #include <string.h>
 
+GST_DEBUG_CATEGORY_EXTERN (wavpack_debug);
+#define GST_CAT_DEFAULT wavpack_debug
+
 gboolean
 gst_wavpack_read_header (WavpackHeader * header, guint8 * buf)
 {

diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c
index cd010ff..b4ee722 100644 (file)
--- a/ext/wavpack/gstwavpackdec.c
+++ b/ext/wavpack/gstwavpackdec.c
@@ -494,7 +494,7 @@ gst_wavpack_dec_plugin_init (GstPlugin * plugin)
   if (!gst_element_register (plugin, "wavpackdec",
           GST_RANK_PRIMARY, GST_TYPE_WAVPACK_DEC))
     return FALSE;
-  GST_DEBUG_CATEGORY_INIT (gst_wavpack_dec_debug, "wavpackdec", 0,
-      "wavpack decoder");
+  GST_DEBUG_CATEGORY_INIT (gst_wavpack_dec_debug, "wavpack_dec", 0,
+      "Wavpack decoder");
   return TRUE;
 }

diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c
index 1661d08..8992d0c 100644 (file)
--- a/ext/wavpack/gstwavpackenc.c
+++ b/ext/wavpack/gstwavpackenc.c
@@ -978,8 +978,8 @@ gst_wavpack_enc_plugin_init (GstPlugin * plugin)
           GST_RANK_NONE, GST_TYPE_WAVPACK_ENC))
     return FALSE;
 
-  GST_DEBUG_CATEGORY_INIT (gst_wavpack_enc_debug, "wavpackenc", 0,
-      "wavpack encoder");
+  GST_DEBUG_CATEGORY_INIT (gst_wavpack_enc_debug, "wavpack_enc", 0,
+      "Wavpack encoder");
 
   return TRUE;
 }

diff --git a/ext/wavpack/gstwavpackparse.c b/ext/wavpack/gstwavpackparse.c
index 6f8ce0e..923f3d6 100644 (file)
--- a/ext/wavpack/gstwavpackparse.c
+++ b/ext/wavpack/gstwavpackparse.c
@@ -1176,8 +1176,8 @@ gst_wavpack_parse_plugin_init (GstPlugin * plugin)
     return FALSE;
   }
 
-  GST_DEBUG_CATEGORY_INIT (gst_wavpack_parse_debug, "wavpackparse", 0,
-      "wavpack file parser");
+  GST_DEBUG_CATEGORY_INIT (gst_wavpack_parse_debug, "wavpack_parse", 0,
+      "Wavpack file parser");
 
   return TRUE;
 }

diff --git a/ext/wavpack/gstwavpackstreamreader.c b/ext/wavpack/gstwavpackstreamreader.c
index 9b3c0bf..9b6260b 100644 (file)
--- a/ext/wavpack/gstwavpackstreamreader.c
+++ b/ext/wavpack/gstwavpackstreamreader.c
@@ -25,6 +25,9 @@
 
 #include "gstwavpackstreamreader.h"
 
+GST_DEBUG_CATEGORY_EXTERN (wavpack_debug);
+#define GST_CAT_DEFAULT wavpack_debug
+
 static int32_t
 gst_wavpack_stream_reader_read_bytes (void *id, void *data, int32_t bcount)
 {
@@ -50,12 +53,14 @@ gst_wavpack_stream_reader_get_pos (void *id)
 static int
 gst_wavpack_stream_reader_set_pos_abs (void *id, uint32_t pos)
 {
+  GST_DEBUG ("should not be called");
   return -1;
 }
 
 static int
 gst_wavpack_stream_reader_set_pos_rel (void *id, int32_t delta, int mode)
 {
+  GST_DEBUG ("should not be called");
   return -1;
 }
 
@@ -85,6 +90,7 @@ gst_wavpack_stream_reader_can_seek (void *id)
 static int32_t
 gst_wavpack_stream_reader_write_bytes (void *id, void *data, int32_t bcount)
 {
+  GST_DEBUG ("should not be called");
   return 0;
 }