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/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;