* 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 9d52fe1cd08bb11de0a6111749b64c0401d610b5..58dfc193217d93c2572de2c88657cf15603014bb 100644 (file)
--- a/modules/demux/util/id3.c
+++ b/modules/demux/util/id3.c
@@ -2,15 +2,15 @@
  * id3.c: simple id3 tag skipper
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: id3.c,v 1.3 2003/02/20 01:52:46 sigmunau Exp $
+ * $Id$
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -30,15 +30,11 @@
 #include <vlc/vlc.h>
 #include <vlc/input.h>
 
-#include <sys/types.h>
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
 static int  SkipID3Tag ( vlc_object_t * );
 
-/* TODO: support MPEG-2.5, not difficult, but I need somes samples... */
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -48,45 +44,29 @@ vlc_module_begin();
     set_callbacks( SkipID3Tag, NULL );
 vlc_module_end();
 
-/*****************************************************************************
- * Definitions of structures  and functions used by this plugins 
- *****************************************************************************/
-
-
 /****************************************************************************
- * ParseID3Tag : check if an ID3 header is present and parse and skip it
- ****************************************************************************
- *
- * Author : Sigmund Augdal 
- * 
-' ****************************************************************************/
+ * SkipID3Tag : check if an ID3 tag is present, and skip it if it is
+ ****************************************************************************/
 static int SkipID3Tag( vlc_object_t *p_this )
 {
-    input_thread_t *p_input;
-    u8  *p_peek;
+    demux_t *p_demux = (demux_t *)p_this;
+    uint8_t *p_peek;
     int i_size;
-    u8  version, revision;
+    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" );
-    /* get 10 byte id3 header */    
-    if( input_Peek( p_input, &p_peek, 10 ) < 10 )
-    {
-        msg_Err( p_input, "cannot peek()" );
-        return( VLC_EGENERIC );
-    }
+    msg_Dbg( p_demux, "checking for ID3 tag" );
+
+    /* get 10 byte id3 header */
+    if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) return VLC_EGENERIC;
 
-    if ( !( (p_peek[0] == 0x49) && (p_peek[1] == 0x44) && (p_peek[2] == 0x33)))
+    if( p_peek[0] != 'I' || p_peek[1] != 'D' || p_peek[2] != '3' )
     {
-        return( VLC_SUCCESS );
+        return VLC_SUCCESS;
     }
-    
+
     version = p_peek[3];  /* These may become usfull later, */
     revision = p_peek[4]; /* but we ignore them for now */
     b_footer = p_peek[5] & 0x10;
@@ -100,15 +80,11 @@ static int SkipID3Tag( vlc_object_t *p_this )
     }
     i_size += 10;
 
-    /* peek the entire tag */
-    if ( input_Peek( p_input, &p_peek, i_size ) < i_size )
-    {
-        msg_Err( p_input, "cannot peek()" );
-        return( VLC_EGENERIC );
-    }
+    /* Skip the entire tag */
+    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 );
-    p_input->p_current_data += i_size; /* seek passed end of ID3 tag */
-    return ( VLC_SUCCESS );
+
+    return VLC_SUCCESS;
 }