From: <sl...@ke...> - 2007-03-07 12:07:22
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: slomo Date: Wed Mar 07 2007 12:07:19 UTC Log message: * 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. Modified files: . : ChangeLog ext/wavpack : gstwavpack.c gstwavpackcommon.c gstwavpackdec.c gstwavpackenc.c gstwavpackparse.c gstwavpackstreamreader.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.2448&r2=1.2449 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpack.c.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpackcommon.c.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpackdec.c.diff?r1=1.17&r2=1.18 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpackenc.c.diff?r1=1.13&r2=1.14 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpackparse.c.diff?r1=1.21&r2=1.22 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpackstreamreader.c.diff?r1=1.1&r2=1.2 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.2448 retrieving revision 1.2449 diff -u -d -r1.2448 -r1.2449 --- ChangeLog 7 Mar 2007 11:37:23 -0000 1.2448 +++ ChangeLog 7 Mar 2007 12:07:06 -0000 1.2449 @@ -1,3 +1,20 @@ +2007-03-07 Sebastian Dröge <sl...@ci...> + + * 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. 2007-03-07 Edward Hervey <ed...@fl...> * gst/qtdemux/qtdemux.c: Index: gstwavpack.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpack.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gstwavpack.c 10 Jun 2006 15:33:18 -0000 1.2 +++ gstwavpack.c 7 Mar 2007 12:07:07 -0000 1.3 @@ -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)); Index: gstwavpackcommon.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpackcommon.c,v --- gstwavpackcommon.c 18 Jul 2006 14:08:06 -0000 1.2 +++ gstwavpackcommon.c 7 Mar 2007 12:07:07 -0000 1.3 @@ -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) Index: gstwavpackdec.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpackdec.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- gstwavpackdec.c 25 Jan 2007 21:55:49 -0000 1.17 +++ gstwavpackdec.c 7 Mar 2007 12:07:07 -0000 1.18 @@ -494,7 +494,7 @@ 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; } Index: gstwavpackenc.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpackenc.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- gstwavpackenc.c 11 Jan 2007 19:51:04 -0000 1.13 +++ gstwavpackenc.c 7 Mar 2007 12:07:07 -0000 1.14 @@ -978,8 +978,8 @@ GST_RANK_NONE, GST_TYPE_WAVPACK_ENC)) - 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"); Index: gstwavpackparse.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpackparse.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- gstwavpackparse.c 31 Jan 2007 08:32:59 -0000 1.21 +++ gstwavpackparse.c 7 Mar 2007 12:07:07 -0000 1.22 @@ -1176,8 +1176,8 @@ } - 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"); Index: gstwavpackstreamreader.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/wavpack/gstwavpackstreamreader.c,v retrieving revision 1.1 diff -u -d -r1.1 -r1.2 --- gstwavpackstreamreader.c 18 Jul 2006 14:08:06 -0000 1.1 +++ gstwavpackstreamreader.c 7 Mar 2007 12:07:07 -0000 1.2 @@ -25,6 +25,9 @@ #include "gstwavpackstreamreader.h" static int32_t gst_wavpack_stream_reader_read_bytes (void *id, void *data, int32_t bcount) @@ -50,12 +53,14 @@ static int gst_wavpack_stream_reader_set_pos_abs (void *id, uint32_t pos) + GST_DEBUG ("should not be called"); return -1; gst_wavpack_stream_reader_set_pos_rel (void *id, int32_t delta, int mode) @@ -85,6 +90,7 @@ gst_wavpack_stream_reader_write_bytes (void *id, void *data, int32_t bcount) return 0; |