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, 12 insertions, 8 deletions

diff --git a/src/libflac/demux_flac.c b/src/libflac/demux_flac.c
index 086f20fa9..4573b06b3 100644
--- a/src/libflac/demux_flac.c
+++ b/src/libflac/demux_flac.c
@@ -244,23 +244,27 @@ flac_error_callback (const FLAC__SeekableStreamDecoder *decoder,
                      FLAC__StreamDecoderErrorStatus status,
                      void *client_data)
 {
+    demux_flac_t *this = (demux_flac_t *)client_data;
     /* This will be called if there is an error when flac is seeking
      * in the stream.
      */
-    demux_flac_t *this = (demux_flac_t *)client_data;
 
-    printf("demux_flac: flac_error_callback\n");
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_flac: flac_error_callback\n");
+
     if (status == FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC)
-        printf("demux_flac: Decoder lost synchronization.\n");
+      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	      "demux_flac: Decoder lost synchronization.\n");
     else if (status == FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER)
-        printf("demux_flac: Decoder encounted a corrupted frame header.\n");
+      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+	      "demux_flac: Decoder encounted a corrupted frame header.\n");
     else if (status == FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH)
-        printf("demux_flac: Frame's data did not match the CRC in the footer.\n");
+      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+	      "demux_flac: Frame's data did not match the CRC in the footer.\n");
     else
-        printf("demux_flac: unknown error.\n");
-
+      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_flac: unknown error.\n");
+    
     this->status = DEMUX_FINISHED;
-
+    
     return;
 }