X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmeta_engine%2Fid3tag.c;h=45d33fc0482ee94c0f33e4ecc04698bb0c5f18b7;hb=1c8685fb7d890424ec06ff9a2e3cbc1da984e617;hp=e314b7c36b29b286de56f578026155a875f880f8;hpb=e1066b6e97b167911e96a618990cbe8ceb516977;p=vlc

diff --git a/modules/meta_engine/id3tag.c b/modules/meta_engine/id3tag.c
index e314b7c36b..45d33fc048 100644
--- a/modules/meta_engine/id3tag.c
+++ b/modules/meta_engine/id3tag.c
@@ -27,7 +27,12 @@
 #include <config.h>
 
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_demux.h>
 #include <vlc_playlist.h>
@@ -49,7 +54,7 @@ static int  ParseTags ( vlc_object_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("ID3v1/2 and APEv1/2 tags parser" ) );
+    set_description( N_("ID3v1/2 and APEv1/2 tags parser" ) );
     set_capability( "meta reader", 70 );
     set_callbacks( ParseTags, NULL );
 vlc_module_end();
@@ -57,7 +62,7 @@ vlc_module_end();
 /*****************************************************************************
  * ParseID3Tag : parse an id3tag into the info structures
  *****************************************************************************/
-static void ParseID3Tag( demux_t *p_demux, uint8_t *p_data, int i_size )
+static void ParseID3Tag( demux_t *p_demux, const uint8_t *p_data, int i_size )
 {
     struct id3_tag   *p_id3_tag;
     struct id3_frame *p_frame;
@@ -241,10 +246,10 @@ static void ParseID3Tag( demux_t *p_demux, uint8_t *p_data, int i_size )
  * APEv1/2
  *****************************************************************************/
 #define APE_TAG_HEADERSIZE (32)
-static int GetAPEvXSize( const uint8_t *p_data, int i_data )
+static size_t GetAPEvXSize( const uint8_t *p_data, int i_data )
 {
     uint32_t flags;
-    int i_body;
+    size_t i_body;
 
     if( i_data < APE_TAG_HEADERSIZE ||
         ( GetDWLE( &p_data[8] ) != 1000 && GetDWLE( &p_data[8] ) != 2000 ) || /* v1/v2 only */
@@ -262,13 +267,13 @@ static int GetAPEvXSize( const uint8_t *p_data, int i_data )
     /* it is the footer */
     return i_body + ( (flags&(1<<31)) ? APE_TAG_HEADERSIZE : 0 );
 }
-static void ParseAPEvXTag( demux_t *p_demux, uint8_t *p_data, int i_data )
+static void ParseAPEvXTag( demux_t *p_demux, const uint8_t *p_data, int i_data )
 {
     demux_meta_t     *p_demux_meta = (demux_meta_t*)p_demux->p_private;
     vlc_meta_t       *p_meta;
-    vlc_bool_t b_start;
-    vlc_bool_t b_end;
-    uint8_t *p_header = NULL;
+    bool b_start;
+    bool b_end;
+    const uint8_t *p_header = NULL;
     int i_entry;
 
     if( i_data < APE_TAG_HEADERSIZE )
@@ -371,14 +376,14 @@ static void ParseAPEvXTag( demux_t *p_demux, uint8_t *p_data, int i_data )
 static void CheckFooter( demux_t *p_demux )
 {
     const int64_t i_pos = stream_Size( p_demux->s );
-    const int i_peek = 128+APE_TAG_HEADERSIZE;
-    uint8_t *p_peek;
-    uint8_t *p_peek_id3;
+    const size_t i_peek = 128+APE_TAG_HEADERSIZE;
+    const uint8_t *p_peek;
+    const uint8_t *p_peek_id3;
     int64_t i_id3v2_pos = -1;
     int64_t i_apevx_pos = -1;
     int i_id3v2_size;
     int i_apevx_size;
-    int i_id3v1_size;
+    size_t i_id3v1_size;
 
     if( i_pos < i_peek )
         return;
@@ -447,7 +452,7 @@ static void CheckFooter( demux_t *p_demux )
 }
 static void CheckHeader( demux_t *p_demux )
 {
-    uint8_t *p_peek;
+    const uint8_t *p_peek;
     int i_size;
 
     if( stream_Seek( p_demux->s, 0 ) )
@@ -484,7 +489,7 @@ static int ParseTags( vlc_object_t *p_this )
 {
     demux_t      *p_demux = (demux_t *)p_this;
     demux_meta_t *p_demux_meta = (demux_meta_t*)p_demux->p_private;
-    vlc_bool_t    b_seekable;
+    bool    b_seekable;
     int64_t       i_init;
 
     msg_Dbg( p_demux, "checking for ID3v1/2 and APEv1/2 tags" );