cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...

CVS patchset: 5844
CVS date: 2003/12/05 15:54:56

24 files changed, 120 insertions, 72 deletions

diff --git a/src/libxineadec/28k8.c b/src/libxineadec/28k8.c
index e8ae06f81..9b520391e 100644
--- a/src/libxineadec/28k8.c
+++ b/src/libxineadec/28k8.c
@@ -22,7 +22,7 @@
  * Based on public domain source code from:
  *   http://www.honeypot.net/audio/
  *
- * $Id: 28k8.c,v 1.4 2003/11/16 23:33:47 f1rmb Exp $
+ * $Id: 28k8.c,v 1.5 2003/12/05 15:55:00 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -529,7 +529,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   ra28k8_class_t *this ;
 
-  this = (ra28k8_class_t *) malloc (sizeof (ra28k8_class_t));
+  this = (ra28k8_class_t *) xine_xmalloc (sizeof (ra28k8_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.get_identifier  = get_identifier;
diff --git a/src/libxineadec/adpcm.c b/src/libxineadec/adpcm.c
index 9c22eabd5..3b8240142 100644
--- a/src/libxineadec/adpcm.c
+++ b/src/libxineadec/adpcm.c
@@ -31,7 +31,7 @@
  *   this is also useful for extracting streams from Playstation discs
  *
  *
- * $Id: adpcm.c,v 1.34 2003/11/26 19:43:37 f1rmb Exp $
+ * $Id: adpcm.c,v 1.35 2003/12/05 15:55:00 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -1622,7 +1622,7 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre
 
   adpcm_decoder_t *this ;
 
-  this = (adpcm_decoder_t *) malloc (sizeof (adpcm_decoder_t));
+  this = (adpcm_decoder_t *) xine_xmalloc (sizeof (adpcm_decoder_t));
 
   this->audio_decoder.decode_data         = adpcm_decode_data;
   this->audio_decoder.reset               = adpcm_reset;
@@ -1656,7 +1656,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   adpcm_class_t *this ;
 
-  this = (adpcm_class_t *) malloc (sizeof (adpcm_class_t));
+  this = (adpcm_class_t *) xine_xmalloc (sizeof (adpcm_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.get_identifier  = get_identifier;
diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c
index 40b143004..b2c9351f5 100644
--- a/src/libxineadec/fooaudio.c
+++ b/src/libxineadec/fooaudio.c
@@ -21,7 +21,7 @@
  * player. It really works too! It will output a continuous sine wave in
  * place of the data it should actually send.
  *
- * $Id: fooaudio.c,v 1.8 2003/11/16 23:33:47 f1rmb Exp $
+ * $Id: fooaudio.c,v 1.9 2003/12/05 15:55:00 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -128,8 +128,8 @@ static void fooaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
    * the accumulator buffer size as necessary */
   if( this->size + buf->size > this->bufsize ) {
     this->bufsize = this->size + 2 * buf->size;
-    printf("fooaudio: increasing source buffer to %d to avoid overflow.\n",
-      this->bufsize);
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	    "fooaudio: increasing source buffer to %d to avoid overflow.\n", this->bufsize);
     this->buf = realloc( this->buf, this->bufsize );
   }
   xine_fast_memcpy (&this->buf[this->size], buf->content, buf->size);
@@ -179,7 +179,8 @@ static void fooaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
         /* get an audio buffer */
         audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
         if (audio_buffer->mem_size == 0) {
-          printf ("fooaudio: Help! Allocated audio buffer with nothing in it!\n");
+          xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+		   "fooaudio: Help! Allocated audio buffer with nothing in it!\n");
           return;
         }
 
@@ -256,7 +257,7 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre
 
   fooaudio_decoder_t *this ;
 
-  this = (fooaudio_decoder_t *) malloc (sizeof (fooaudio_decoder_t));
+  this = (fooaudio_decoder_t *) xine_xmalloc (sizeof (fooaudio_decoder_t));
 
   /* connect the member functions */
   this->audio_decoder.decode_data         = fooaudio_decode_data;
@@ -311,7 +312,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   fooaudio_class_t *this ;
 
-  this = (fooaudio_class_t *) malloc (sizeof (fooaudio_class_t));
+  this = (fooaudio_class_t *) xine_malloc (sizeof (fooaudio_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.get_identifier  = get_identifier;
diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c
index ac03d940c..c193b83ca 100644
--- a/src/libxineadec/gsm610.c
+++ b/src/libxineadec/gsm610.c
@@ -44,7 +44,7 @@
  * Carsten Bormann
  * --------------------------------------------------------------------
  *
- * $Id: gsm610.c,v 1.10 2003/11/16 23:33:47 f1rmb Exp $
+ * $Id: gsm610.c,v 1.11 2003/12/05 15:55:00 f1rmb Exp $
  *
  */
 
@@ -129,8 +129,8 @@ static void gsm610_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
   if( this->size + buf->size > this->bufsize ) {
     this->bufsize = this->size + 2 * buf->size;
-    printf("gsm610: increasing source buffer to %d to avoid overflow.\n",
-      this->bufsize);
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	    "gsm610: increasing source buffer to %d to avoid overflow.\n", this->bufsize);
     this->buf = realloc( this->buf, this->bufsize );
   }
 
@@ -146,7 +146,8 @@ static void gsm610_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
       /* the data should line up on a 65-byte boundary */
       if ((buf->size % 65) != 0) {
-        printf ("gsm610: received MS GSM block that does not line up\n");
+        xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+		 "gsm610: received MS GSM block that does not line up\n");
         this->size = 0;
         return;
       }
@@ -181,7 +182,7 @@ static void gsm610_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
       /* the data should line up on a 33-byte boundary */
       if ((buf->size % 33) != 0) {
-        printf ("gsm610: received GSM block that does not line up\n");
+        xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "gsm610: received GSM block that does not line up\n");
         this->size = 0;
         return;
       }
@@ -235,7 +236,7 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre
 
   gsm610_decoder_t *this ;
 
-  this = (gsm610_decoder_t *) malloc (sizeof (gsm610_decoder_t));
+  this = (gsm610_decoder_t *) xine_xmalloc (sizeof (gsm610_decoder_t));
 
   this->audio_decoder.decode_data         = gsm610_decode_data;
   this->audio_decoder.reset               = gsm610_reset;
@@ -267,7 +268,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   gsm610_class_t *this ;
 
-  this = (gsm610_class_t *) malloc (sizeof (gsm610_class_t));
+  this = (gsm610_class_t *) xine_xmalloc (sizeof (gsm610_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.get_identifier  = get_identifier;
diff --git a/src/libxineadec/interplayaudio.c b/src/libxineadec/interplayaudio.c
index 41680ee98..abc9bcb53 100644
--- a/src/libxineadec/interplayaudio.c
+++ b/src/libxineadec/interplayaudio.c
@@ -21,7 +21,7 @@
  * For more information regarding the Interplay MVE file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: interplayaudio.c,v 1.4 2003/11/16 23:33:47 f1rmb Exp $
+ * $Id: interplayaudio.c,v 1.5 2003/12/05 15:55:00 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -161,8 +161,8 @@ static void interplay_decode_data (audio_decoder_t *this_gen, buf_element_t *buf
    * the accumulator buffer size as necessary */
   if( this->size + buf->size > this->bufsize ) {
     this->bufsize = this->size + 2 * buf->size;
-    printf("interplayaudio: increasing source buffer to %d to avoid overflow.\n",
-      this->bufsize);
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	    "interplayaudio: increasing source buffer to %d to avoid overflow.\n", this->bufsize);
     this->buf = realloc( this->buf, this->bufsize );
   }
   xine_fast_memcpy (&this->buf[this->size], buf->content, buf->size);
@@ -193,7 +193,8 @@ static void interplay_decode_data (audio_decoder_t *this_gen, buf_element_t *buf
 
       audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
       if (audio_buffer->mem_size == 0) {
-        printf ("interplayaudio: Help! Allocated audio buffer with nothing in it!\n");
+        xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+		 "interplayaudio: Help! Allocated audio buffer with nothing in it!\n");
         return;
       }
 
@@ -263,7 +264,7 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre
 
   interplay_decoder_t *this ;
 
-  this = (interplay_decoder_t *) malloc (sizeof (interplay_decoder_t));
+  this = (interplay_decoder_t *) xine_xmalloc (sizeof (interplay_decoder_t));
 
   /* connect the member functions */
   this->audio_decoder.decode_data         = interplay_decode_data;
@@ -318,7 +319,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   interplay_class_t *this ;
 
-  this = (interplay_class_t *) malloc (sizeof (interplay_class_t));
+  this = (interplay_class_t *) xine_xmalloc (sizeof (interplay_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.get_identifier  = get_identifier;
diff --git a/src/libxineadec/logpcm.c b/src/libxineadec/logpcm.c
index cc972eac6..d5a003a66 100644
--- a/src/libxineadec/logpcm.c
+++ b/src/libxineadec/logpcm.c
@@ -30,7 +30,7 @@
  *   http://sox.sourceforge.net/
  * which listed the code as being lifted from Sun Microsystems.
  *
- * $Id: logpcm.c,v 1.14 2003/11/16 23:33:47 f1rmb Exp $
+ * $Id: logpcm.c,v 1.15 2003/12/05 15:55:00 f1rmb Exp $
  *
  */
 
@@ -187,8 +187,8 @@ static void logpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
   if( this->size + buf->size > this->bufsize ) {
     this->bufsize = this->size + 2 * buf->size;
-    printf("logpcm: increasing source buffer to %d to avoid overflow.\n",
-      this->bufsize);
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	    "logpcm: increasing source buffer to %d to avoid overflow.\n", this->bufsize);
     this->buf = realloc( this->buf, this->bufsize );
   }
 
@@ -203,7 +203,8 @@ static void logpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
       audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
       if (audio_buffer->mem_size == 0) {
-        printf ("logpcm: Help! Allocated audio buffer with nothing in it!\n");
+        xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+		 "logpcm: Help! Allocated audio buffer with nothing in it!\n");
         return;
       }
 
@@ -255,7 +256,7 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre
 
   logpcm_decoder_t *this ;
 
-  this = (logpcm_decoder_t *) malloc (sizeof (logpcm_decoder_t));
+  this = (logpcm_decoder_t *) xine_xmalloc (sizeof (logpcm_decoder_t));
 
   this->audio_decoder.decode_data         = logpcm_decode_data;
   this->audio_decoder.reset               = logpcm_reset;
@@ -287,7 +288,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   logpcm_class_t *this ;
 
-  this = (logpcm_class_t *) malloc (sizeof (logpcm_class_t));
+  this = (logpcm_class_t *) xine_xmalloc (sizeof (logpcm_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.get_identifier  = get_identifier;
diff --git a/src/libxineadec/nosefart/dis6502.c b/src/libxineadec/nosefart/dis6502.c
index 10ae2c44e..ff552d219 100644
--- a/src/libxineadec/nosefart/dis6502.c
+++ b/src/libxineadec/nosefart/dis6502.c
@@ -20,7 +20,7 @@
 ** dis6502.c
 **
 ** 6502 disassembler based on code from John Saeger
-** $Id: dis6502.c,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: dis6502.c,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #include "types.h"
@@ -462,10 +462,13 @@ void nes6502_disasm(uint32 PC, uint8 P, uint8 A, uint8 X, uint8 Y, uint8 S)
 
 /*
 ** $Log: dis6502.c,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
 ** Revision 1.4  2000/06/09 15:12:25  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/dis6502.h b/src/libxineadec/nosefart/dis6502.h
index 73440c657..a02fd73ae 100644
--- a/src/libxineadec/nosefart/dis6502.h
+++ b/src/libxineadec/nosefart/dis6502.h
@@ -20,7 +20,7 @@
 ** dis6502.h
 **
 ** 6502 disassembler header
-** $Id: dis6502.h,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: dis6502.h,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #ifndef _DIS6502_H_
@@ -40,10 +40,13 @@ extern void nes6502_disasm(uint32 PC, uint8 P, uint8 A, uint8 X, uint8 Y, uint8
 
 /*
 ** $Log: dis6502.h,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
 ** Revision 1.4  2000/06/09 15:12:25  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/fds_snd.c b/src/libxineadec/nosefart/fds_snd.c
index 3b5fc3e5e..fe2e4d624 100644
--- a/src/libxineadec/nosefart/fds_snd.c
+++ b/src/libxineadec/nosefart/fds_snd.c
@@ -20,7 +20,7 @@
 ** fds_snd.c
 **
 ** Famicom Disk System sound emulation
-** $Id: fds_snd.c,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: fds_snd.c,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #include "types.h"
@@ -76,6 +76,9 @@ apuext_t fds_ext =
 
 /*
 ** $Log: fds_snd.c,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
@@ -88,4 +91,4 @@ apuext_t fds_ext =
 ** Revision 1.1  2000/06/20 00:06:47  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/fds_snd.h b/src/libxineadec/nosefart/fds_snd.h
index d4621d52b..9d20b5b2a 100644
--- a/src/libxineadec/nosefart/fds_snd.h
+++ b/src/libxineadec/nosefart/fds_snd.h
@@ -20,7 +20,7 @@
 ** fds_snd.h
 **
 ** Famicom Disk System sound emulation
-** $Id: fds_snd.h,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: fds_snd.h,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #ifndef _FDS_SND_H_
@@ -35,6 +35,9 @@ extern apuext_t fds_ext;
 
 /*
 ** $Log: fds_snd.h,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
@@ -44,4 +47,4 @@ extern apuext_t fds_ext;
 ** Revision 1.1  2000/06/20 00:06:47  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/log.c b/src/libxineadec/nosefart/log.c
index d865fd382..8935a596e 100644
--- a/src/libxineadec/nosefart/log.c
+++ b/src/libxineadec/nosefart/log.c
@@ -20,7 +20,7 @@
 ** log.c
 **
 ** Error logging functions
-** $Id: log.c,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: log.c,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #include <stdio.h>
@@ -103,6 +103,9 @@ void log_printf(const char *format, ... )
 
 /*
 ** $Log: log.c,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
@@ -112,4 +115,4 @@ void log_printf(const char *format, ... )
 ** Revision 1.4  2000/06/09 15:12:25  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/log.h b/src/libxineadec/nosefart/log.h
index 5ccfb1cd0..b9d282c20 100644
--- a/src/libxineadec/nosefart/log.h
+++ b/src/libxineadec/nosefart/log.h
@@ -20,7 +20,7 @@
 ** log.h
 **
 ** Error logging header file
-** $Id: log.h,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: log.h,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #ifndef _LOG_H_
@@ -37,10 +37,13 @@ extern void log_printf(const char *format, ...);
 
 /*
 ** $Log: log.h,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
 ** Revision 1.4  2000/06/09 15:12:25  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/memguard.c b/src/libxineadec/nosefart/memguard.c
index 24e7a151a..05d0cb91d 100644
--- a/src/libxineadec/nosefart/memguard.c
+++ b/src/libxineadec/nosefart/memguard.c
@@ -22,7 +22,7 @@
 ** memory allocation wrapper routines
 **
 ** NOTE: based on code (c) 1998 the Retrocade group
-** $Id: memguard.c,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: memguard.c,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #include "types.h"
@@ -363,6 +363,9 @@ void mem_checkblocks(void)
 
 /*
 ** $Log: memguard.c,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
@@ -375,4 +378,4 @@ void mem_checkblocks(void)
 ** Revision 1.6  2000/06/09 15:12:25  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/mmc5_snd.c b/src/libxineadec/nosefart/mmc5_snd.c
index c51f61bbf..7269fa967 100644
--- a/src/libxineadec/nosefart/mmc5_snd.c
+++ b/src/libxineadec/nosefart/mmc5_snd.c
@@ -20,7 +20,7 @@
 ** mmc5_snd.c
 **
 ** Nintendo MMC5 sound emulation
-** $Id: mmc5_snd.c,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: mmc5_snd.c,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #include <string.h>
@@ -333,6 +333,9 @@ apuext_t mmc5_ext =
 
 /*
 ** $Log: mmc5_snd.c,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
@@ -354,4 +357,4 @@ apuext_t mmc5_ext =
 ** Revision 1.1  2000/06/20 00:06:47  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/mmc5_snd.h b/src/libxineadec/nosefart/mmc5_snd.h
index 6166567fd..256cc2285 100644
--- a/src/libxineadec/nosefart/mmc5_snd.h
+++ b/src/libxineadec/nosefart/mmc5_snd.h
@@ -20,7 +20,7 @@
 ** mmc5_snd.h
 **
 ** Nintendo MMC5 sound emulation header
-** $Id: mmc5_snd.h,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: mmc5_snd.h,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #ifndef _MMC5_SND_H_
@@ -67,6 +67,9 @@ extern apuext_t mmc5_ext;
 
 /*
 ** $Log: mmc5_snd.h,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
@@ -76,4 +79,4 @@ extern apuext_t mmc5_ext;
 ** Revision 1.1  2000/06/20 00:06:47  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/nes6502.h b/src/libxineadec/nosefart/nes6502.h
index aae2b866a..9b9be5811 100644
--- a/src/libxineadec/nosefart/nes6502.h
+++ b/src/libxineadec/nosefart/nes6502.h
@@ -20,7 +20,7 @@
 ** nes6502.h
 **
 ** NES custom 6502 CPU definitions / prototypes
-** $Id: nes6502.h,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: nes6502.h,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 /* NOTE: 16-bit addresses avoided like the plague: use 32-bit values
@@ -122,10 +122,13 @@ extern void nes6502_getcontext(nes6502_context *cpu);
 
 /*
 ** $Log: nes6502.h,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
 ** Revision 1.4  2000/06/09 15:12:25  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/nsf.h b/src/libxineadec/nosefart/nsf.h
index 9ca9f298c..61cc14f60 100644
--- a/src/libxineadec/nosefart/nsf.h
+++ b/src/libxineadec/nosefart/nsf.h
@@ -20,7 +20,7 @@
 ** nsf.h
 **
 ** NSF loading/saving related defines / prototypes
-** $Id: nsf.h,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: nsf.h,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #ifndef _NSF_H_
@@ -114,6 +114,9 @@ extern void nsf_setfilter(nsf_t *nsf, int filter_type);
 
 /*
 ** $Log: nsf.h,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
@@ -141,4 +144,4 @@ extern void nsf_setfilter(nsf_t *nsf, int filter_type);
 ** Revision 1.4  2000/06/09 15:12:26  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/version.h b/src/libxineadec/nosefart/version.h
index 22e91ecd6..d7dcb2e5d 100644
--- a/src/libxineadec/nosefart/version.h
+++ b/src/libxineadec/nosefart/version.h
@@ -20,7 +20,7 @@
 ** version.h
 **
 ** Program name / version definitions
-** $Id: version.h,v 1.1 2003/01/08 07:04:36 tmmm Exp $
+** $Id: version.h,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #ifndef _VERSION_H_
@@ -38,6 +38,9 @@
 
 /*
 ** $Log: version.h,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:36  tmmm
 ** initial import of Nosefart sources
 **
@@ -53,4 +56,4 @@
 ** Revision 1.4  2000/06/09 15:12:25  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/vrc7_snd.c b/src/libxineadec/nosefart/vrc7_snd.c
index e71c84af5..42cff0103 100644
--- a/src/libxineadec/nosefart/vrc7_snd.c
+++ b/src/libxineadec/nosefart/vrc7_snd.c
@@ -21,7 +21,7 @@
 **
 ** VRCVII sound hardware emulation
 ** Thanks to Charles MacDonald (cgfm2@hooked.net) for donating code.
-** $Id: vrc7_snd.c,v 1.1 2003/01/08 07:04:36 tmmm Exp $
+** $Id: vrc7_snd.c,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #include <stdio.h>
@@ -323,6 +323,9 @@ apuext_t vrc7_ext =
 
 /*
 ** $Log: vrc7_snd.c,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:36  tmmm
 ** initial import of Nosefart sources
 **
@@ -341,4 +344,4 @@ apuext_t vrc7_ext =
 ** Revision 1.1  2000/06/20 00:06:47  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/vrcvisnd.c b/src/libxineadec/nosefart/vrcvisnd.c
index a01a42a5b..b1f26fe52 100644
--- a/src/libxineadec/nosefart/vrcvisnd.c
+++ b/src/libxineadec/nosefart/vrcvisnd.c
@@ -20,7 +20,7 @@
 ** vrcvisnd.c
 **
 ** VRCVI sound hardware emulation
-** $Id: vrcvisnd.c,v 1.1 2003/01/08 07:04:36 tmmm Exp $
+** $Id: vrcvisnd.c,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #include "types.h"
@@ -183,6 +183,9 @@ apuext_t vrcvi_ext =
 
 /*
 ** $Log: vrcvisnd.c,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:36  tmmm
 ** initial import of Nosefart sources
 **
@@ -204,4 +207,4 @@ apuext_t vrcvi_ext =
 ** Revision 1.4  2000/06/09 15:12:28  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/vrcvisnd.h b/src/libxineadec/nosefart/vrcvisnd.h
index 28608a86c..7666fec0c 100644
--- a/src/libxineadec/nosefart/vrcvisnd.h
+++ b/src/libxineadec/nosefart/vrcvisnd.h
@@ -20,7 +20,7 @@
 ** vrcvisnd.h
 **
 ** VRCVI (Konami MMC) sound hardware emulation header
-** $Id: vrcvisnd.h,v 1.1 2003/01/08 07:04:36 tmmm Exp $
+** $Id: vrcvisnd.h,v 1.2 2003/12/05 15:55:01 f1rmb Exp $
 */
 
 #ifndef _VRCVISND_H_
@@ -64,6 +64,9 @@ extern apuext_t vrcvi_ext;
 
 /*
 ** $Log: vrcvisnd.h,v $
+** Revision 1.2  2003/12/05 15:55:01  f1rmb
+** cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...
+**
 ** Revision 1.1  2003/01/08 07:04:36  tmmm
 ** initial import of Nosefart sources
 **
@@ -79,4 +82,4 @@ extern apuext_t vrcvi_ext;
 ** Revision 1.4  2000/06/09 15:12:28  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nsf.c b/src/libxineadec/nsf.c
index aff552039..b57d70be5 100644
--- a/src/libxineadec/nsf.c
+++ b/src/libxineadec/nsf.c
@@ -20,7 +20,7 @@
  * NSF Audio "Decoder" using the Nosefart NSF engine by Matt Conte
  *   http://www.baisoku.org/
  *
- * $Id: nsf.c,v 1.4 2003/11/16 23:33:47 f1rmb Exp $
+ * $Id: nsf.c,v 1.5 2003/12/05 15:55:01 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -113,7 +113,7 @@ static void nsf_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
       nsf_init();
       this->nsf = nsf_load(NULL, this->nsf_file, this->nsf_size);
       if (!this->nsf) {
-        printf ("nsf: could not initialize NSF\n");
+        xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "nsf: could not initialize NSF\n");
         /* make the decoder return on every subsequent buffer */
         this->nsf_index = 0;
       }
@@ -154,7 +154,7 @@ static void nsf_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
     /* get an audio buffer */
     audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
     if (audio_buffer->mem_size == 0) {
-       printf ("nsf: Help! Allocated audio buffer with nothing in it!\n");
+       xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "nsf: Help! Allocated audio buffer with nothing in it!\n");
        return;
     }
 
@@ -206,7 +206,7 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre
 
   nsf_decoder_t *this ;
 
-  this = (nsf_decoder_t *) malloc (sizeof (nsf_decoder_t));
+  this = (nsf_decoder_t *) xine_xmalloc (sizeof (nsf_decoder_t));
 
   /* connect the member functions */
   this->audio_decoder.decode_data         = nsf_decode_data;
@@ -256,7 +256,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   nsf_class_t *this ;
 
-  this = (nsf_class_t *) malloc (sizeof (nsf_class_t));
+  this = (nsf_class_t *) xine_xmalloc (sizeof (nsf_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.get_identifier  = get_identifier;
diff --git a/src/libxineadec/pcm.c b/src/libxineadec/pcm.c
index cdf750f45..2ef908612 100644
--- a/src/libxineadec/pcm.c
+++ b/src/libxineadec/pcm.c
@@ -103,7 +103,7 @@ static void pcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {\
       aud = this->stream->audio_out->get_buffer(this->stream->audio_out);
       
       if (aud->mem_size == 0) {
-         printf(__FILE__ ": :( Got an audio buffer with size 0!\r\n");
+         xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "Got an audio buffer with size 0!\n");
          return;
       }
       
@@ -159,8 +159,7 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre
 
    pcm_decoder_t *this;
    
-   this = (pcm_decoder_t *) malloc (sizeof (pcm_decoder_t));
-   memset(this, 0, sizeof (pcm_decoder_t));
+   this = (pcm_decoder_t *) xine_xmalloc (sizeof (pcm_decoder_t));
     
    this->audio_decoder.decode_data         = pcm_decode_data;
    this->audio_decoder.reset               = pcm_reset;
@@ -193,7 +192,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   pcm_class_t *this ;
 
-  this = (pcm_class_t *) malloc (sizeof (pcm_class_t));
+  this = (pcm_class_t *) xine_xmalloc (sizeof (pcm_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
   this->decoder_class.get_identifier  = get_identifier;
diff --git a/src/libxineadec/roqaudio.c b/src/libxineadec/roqaudio.c
index e446c7051..51b6b5f0c 100644
--- a/src/libxineadec/roqaudio.c
+++ b/src/libxineadec/roqaudio.c
@@ -21,7 +21,7 @@
  * For more information regarding the RoQ file format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  *
- * $Id: roqaudio.c,v 1.17 2003/11/16 23:33:47 f1rmb Exp $
+ * $Id: roqaudio.c,v 1.18 2003/12/05 15:55:01 f1rmb Exp $
  *
  */
 
@@ -101,8 +101,8 @@ static void roqaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
 
   if( this->size + buf->size > this->bufsize ) {
     this->bufsize = this->size + 2 * buf->size;
-    printf("RoQ: increasing source buffer to %d to avoid overflow.\n",
-      this->bufsize);
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	    "RoQ: increasing source buffer to %d to avoid overflow.\n", this->bufsize);
     this->buf = realloc( this->buf, this->bufsize );
   }