From 3050d97eb83cfdfb4d04a51231acba47e6addf1c Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Wed, 26 Nov 2003 19:43:26 +0000 Subject: lprintf cleanup, pass I. CVS patchset: 5796 CVS date: 2003/11/26 19:43:26 --- src/input/input_pnm.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'src/input/input_pnm.c') diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c index a15bb7745..2f4c61557 100644 --- a/src/input/input_pnm.c +++ b/src/input/input_pnm.c @@ -35,6 +35,12 @@ #include #include "bswap.h" +#define LOG_MODULE "input_pnm" +#define LOG_VERBOSE +/* +#define LOG +*/ + #include "xine_internal.h" #include "xineutils.h" #include "input_plugin.h" @@ -42,10 +48,6 @@ #include "pnm.h" #include "net_buf_ctrl.h" -/* -#define LOG -*/ - #define BUFSIZE 4096 #if !defined(NDELAY) && defined(O_NDELAY) @@ -82,10 +84,7 @@ static off_t pnm_plugin_read (input_plugin_t *this_gen, pnm_input_plugin_t *this = (pnm_input_plugin_t *) this_gen; off_t n; -#ifdef LOG - printf ("pnm_plugin_read: %lld bytes ...\n", - len); -#endif + lprintf ("pnm_plugin_read: %lld bytes ...\n", len); nbc_check_buffers (this->nbc); @@ -101,10 +100,7 @@ static buf_element_t *pnm_plugin_read_block (input_plugin_t *this_gen, buf_element_t *buf = fifo->buffer_pool_alloc (fifo); int total_bytes; -#ifdef LOG - printf ("pnm_plugin_read_block: %lld bytes...\n", - todo); -#endif + lprintf ("pnm_plugin_read_block: %lld bytes...\n", todo); buf->content = buf->mem; buf->type = BUF_DEMUX_BLOCK; @@ -211,12 +207,9 @@ static int pnm_plugin_get_optional_data (input_plugin_t *this_gen, static int pnm_plugin_open (input_plugin_t *this_gen) { pnm_input_plugin_t *this = (pnm_input_plugin_t *) this_gen; - pnm_t *pnm; -#ifdef LOG - printf ("input_pnm: trying to open '%s'\n", this->mrl); -#endif + lprintf ("trying to open '%s'\n", this->mrl); pnm = pnm_connect (this->stream, this->mrl); -- cgit v1.2.3