* modules/demux/*: removed useless probing messages.

[vlc] / modules / demux / util / id3.c

diff --git a/modules/demux/util/id3.c b/modules/demux/util/id3.c
index 06caa727ddd624299666a4db2a4fdb358826677b..58dfc193217d93c2572de2c88657cf15603014bb 100644 (file)
--- a/modules/demux/util/id3.c
+++ b/modules/demux/util/id3.c
@@ -2,7 +2,7 @@
  * id3.c: simple id3 tag skipper
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: id3.c,v 1.7 2004/01/25 20:05:29 hartman Exp $
+ * $Id$
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -30,10 +30,6 @@
 #include <vlc/vlc.h>
 #include <vlc/input.h>
 
-#include "ninput.h"
-
-#include <sys/types.h>
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -53,26 +49,18 @@ vlc_module_end();
  ****************************************************************************/
 static int SkipID3Tag( vlc_object_t *p_this )
 {
-    input_thread_t *p_input;
+    demux_t *p_demux = (demux_t *)p_this;
     uint8_t *p_peek;
     int i_size;
     uint8_t version, revision;
     int b_footer;
 
-    if ( p_this->i_object_type != VLC_OBJECT_INPUT )
-    {
-        return( VLC_EGENERIC );
-    }
-    p_input = (input_thread_t *)p_this;
+    p_demux->p_private = NULL;
 
-    msg_Dbg( p_input, "checking for ID3 tag" );
+    msg_Dbg( p_demux, "checking for ID3 tag" );
 
     /* get 10 byte id3 header */
-    if( stream_Peek( p_input->s, &p_peek, 10 ) < 10 )
-    {
-        msg_Err( p_input, "cannot peek()" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) return VLC_EGENERIC;
 
     if( p_peek[0] != 'I' || p_peek[1] != 'D' || p_peek[2] != '3' )
     {
@@ -93,9 +81,9 @@ static int SkipID3Tag( vlc_object_t *p_this )
     i_size += 10;
 
     /* Skip the entire tag */
-    stream_Read( p_input->s, NULL, i_size );
+    stream_Read( p_demux->s, NULL, i_size );
 
-    msg_Dbg( p_input, "ID3v2.%d revision %d tag found, skiping %d bytes",
+    msg_Dbg( p_demux, "ID3v2.%d revision %d tag found, skiping %d bytes",
              version, revision, i_size );
 
     return VLC_SUCCESS;