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, 5 insertions, 6 deletions

diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 21eb10ef5..86f35c0ac 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpgaudio.c,v 1.129 2003/11/26 22:40:25 tmattern Exp $
+ * $Id: demux_mpgaudio.c,v 1.130 2003/12/05 15:54:57 f1rmb Exp $
  *
  * demultiplexer for mpeg audio (i.e. mp3) streams
  *
@@ -641,11 +641,11 @@ static int id3v22_parse_tag(demux_mpgaudio_t *this, int8_t *mp3_frame_header) {
           if (tag_frame_header.id && tag_frame_header.size) {
             if ((pos + tag_frame_header.size) <= tag_header.size) {
               if (!id3v22_interp_frame(this, &tag_frame_header)) {
-                xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
+                xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
                         "id2v22: invalid frame content\n");
               }
             } else {
-              xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
+              xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
                       "id3v22: invalid frame header\n");
               this->input->seek (this->input, tag_header.size - pos, SEEK_CUR);
               return 1;
@@ -657,7 +657,7 @@ static int id3v22_parse_tag(demux_mpgaudio_t *this, int8_t *mp3_frame_header) {
             return 1;
           }
         } else {
-          xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
+          xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
                   "id2v22: id3v2_parse_frame_header problem\n");
           return 0;
         }
@@ -665,8 +665,7 @@ static int id3v22_parse_tag(demux_mpgaudio_t *this, int8_t *mp3_frame_header) {
     }
     return 1;
   } else {
-    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, 
-            "id3v22: id3v2_parse_header problem\n");
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "id3v22: id3v2_parse_header problem\n");
     return 0;
   }
 }