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

1 files changed, 7 insertions, 6 deletions

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;