diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-26 19:43:26 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-26 19:43:26 +0000 |
| commit | 3050d97eb83cfdfb4d04a51231acba47e6addf1c (patch) | |
| tree | 4337d69086ce7d870214e7e5f6a028f8b417521e /src/libspeex/xine_decoder.c | |
| parent | ae2a2a8e08ab3140d5c7ee3a5f33e7db81f76b09 (diff) | |
| download | xine-lib-3050d97eb83cfdfb4d04a51231acba47e6addf1c.tar.gz xine-lib-3050d97eb83cfdfb4d04a51231acba47e6addf1c.tar.bz2 | |
lprintf cleanup, pass I.
CVS patchset: 5796
CVS date: 2003/11/26 19:43:26
Diffstat (limited to 'src/libspeex/xine_decoder.c')
| -rw-r--r-- | src/libspeex/xine_decoder.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/src/libspeex/xine_decoder.c b/src/libspeex/xine_decoder.c index 4f4f02bde..17a9fc9f3 100644 --- a/src/libspeex/xine_decoder.c +++ b/src/libspeex/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.5 2003/11/16 23:33:46 f1rmb Exp $ + * $Id: xine_decoder.c,v 1.6 2003/11/26 19:43:36 f1rmb Exp $ * * (ogg/)speex audio decoder plugin (libspeex wrapper) for xine */ @@ -29,6 +29,12 @@ #include <stdlib.h> #include <string.h> +#define LOG_MODULE "speex_decoder" +#define LOG_VERBOSE +/* +#define LOG +*/ + #include "xine_internal.h" #include "audio_out.h" #include "buffer.h" @@ -41,10 +47,6 @@ #define MAX_FRAME_SIZE 2000 -/* -#define LOG -*/ - typedef struct { audio_decoder_class_t decoder_class; } speex_class_t; @@ -176,10 +178,8 @@ void read_metadata (speex_decoder_t *this, char * comments, int length) int keylen = strlen(speex_comment_keys[i].key); char meta_info[(len - keylen) + 1]; -#ifdef LOG - printf ("libspeex: known metadata %d %d\n", - i, speex_comment_keys[i].xine_metainfo_index); -#endif + lprintf ("known metadata %d %d\n", + i, speex_comment_keys[i].xine_metainfo_index); snprintf(meta_info, (len - keylen), "%s", c + keylen); _x_meta_info_set(this->stream, speex_comment_keys[i].xine_metainfo_index, meta_info); @@ -194,15 +194,11 @@ static void speex_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { speex_decoder_t *this = (speex_decoder_t *) this_gen; -#ifdef LOG - printf ("libspeex: decode buf=%8p content=%8p flags=%08x\n", - buf, buf->content, buf->decoder_flags); -#endif + lprintf ("decode buf=%8p content=%8p flags=%08x\n", + buf, buf->content, buf->decoder_flags); if (buf->decoder_flags & BUF_FLAG_PREVIEW) { -#ifdef LOG - printf ("libspeex: preview buffer, %d headers to go\n", this->header_count); -#endif + lprintf ("preview buffer, %d headers to go\n", this->header_count); if (this->header_count) { @@ -365,10 +361,9 @@ static void speex_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { } } -#ifdef LOG - else - printf ("libspeex: output not open\n"); -#endif + else { + lprintf ("output not open\n"); + } } static void speex_dispose (audio_decoder_t *this_gen) { |