#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>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( _("ID3v1/2 and APEv1/2 tags parser" ) );
- set_capability( "meta reader", 70 );
- set_callbacks( ParseTags, NULL );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("ID3v1/2 and APEv1/2 tags parser" ) )
+ set_capability( "meta reader", 70 )
+ set_callbacks( ParseTags, NULL )
+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_meta_t *p_demux_meta, const uint8_t *p_data, int i_size )
{
struct id3_tag *p_id3_tag;
struct id3_frame *p_frame;
- demux_meta_t *p_demux_meta = (demux_meta_t*)p_demux->p_private;
vlc_meta_t *p_meta;
int i;
id3_byte_t const * p_ufid;
id3_length_t i_ufidlen;
- p_ufid = (id3_byte_t const *)
- id3_field_getbinarydata(
- &p_frame->fields[1],
- &i_ufidlen );
+ p_ufid = id3_field_getbinarydata( &p_frame->fields[1], &i_ufidlen );
char *psz_ufid = strndup( p_ufid, i_ufidlen );
vlc_meta_SetTrackID( p_meta, psz_ufid );
while( i_data >= 4 )
{
const unsigned int i_peak_size = p_data[3];
- const float f_gain = (float)GetWBE( &p_data[1] ) / 512.0;
+ const float f_temp = GetWBE( &p_data[1] );
+ const float f_gain = f_temp / 512.0;
char psz_value[32];
if( i_data < i_peak_size + 4 )
/* T--- Text informations */
for( i = 0; (p_frame = id3_tag_findframe( p_id3_tag, "T", i )) != NULL; i++ )
{
- int i_strings;
+ unsigned i_strings;
/* Special case TXXX is not the same beast */
if( ID_IS( "TXXX" ) )
}
else if( DESCR_IS( "Track number/position in set" ) )
{
- vlc_meta_SetTracknum( p_meta, psz_temp );
+ vlc_meta_SetTrackNum( p_meta, psz_temp );
}
else if( DESCR_IS( "Album/movie/show title" ) )
{
}
else if( ID_IS ( "APIC" ) )
{
- msg_Dbg( p_demux, "** Has APIC **" );
+ msg_Dbg( p_demux_meta, "** Has APIC **" );
}
else if( p_frame->description )
{
* 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 */
/* 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_meta_t *p_demux_meta, 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 )
char *p = strchr( psz_value, '/' );
if( p )
*p++ = '\0';
- vlc_meta_SetTracknum( p_meta, psz_value );
+ vlc_meta_SetTrackNum( p_meta, psz_value );
}
else if( IS( "Comment" ) )
vlc_meta_SetDescription( p_meta, psz_value );
* CheckFooter: check for ID3/APE at the end of the file
* CheckHeader: check for ID3/APE at the begining of the file
*****************************************************************************/
-static void CheckFooter( demux_t *p_demux )
+static void CheckFooter( demux_meta_t *p_demux_meta )
{
+ demux_t *p_demux = (demux_t *)p_demux_meta->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;
if( i_id3v1_size == 128 )
{
msg_Dbg( p_demux, "found ID3v1 tag" );
- ParseID3Tag( p_demux, p_peek_id3, i_id3v1_size );
+ ParseID3Tag( p_demux_meta, p_peek_id3, i_id3v1_size );
}
/* Compute ID3v2 position */
stream_Peek( p_demux->s, &p_peek, i_id3v2_size ) == i_id3v2_size )
{
msg_Dbg( p_demux, "found ID3v2 tag at end of file" );
- ParseID3Tag( p_demux, p_peek, i_id3v2_size );
+ ParseID3Tag( p_demux_meta, p_peek, i_id3v2_size );
}
}
stream_Peek( p_demux->s, &p_peek, i_apevx_size ) == i_apevx_size )
{
msg_Dbg( p_demux, "found APEvx tag at end of file" );
- ParseAPEvXTag( p_demux, p_peek, i_apevx_size );
+ ParseAPEvXTag( p_demux_meta, p_peek, i_apevx_size );
}
}
}
-static void CheckHeader( demux_t *p_demux )
+static void CheckHeader( demux_meta_t *p_demux_meta )
{
- uint8_t *p_peek;
+ const uint8_t *p_peek;
int i_size;
+ demux_t *p_demux = (demux_t *)p_demux_meta->p_demux;
+
if( stream_Seek( p_demux->s, 0 ) )
return;
stream_Peek( p_demux->s, &p_peek, i_size ) == i_size )
{
msg_Dbg( p_demux, "found ID3v2 tag" );
- ParseID3Tag( p_demux, p_peek, i_size );
+ ParseID3Tag( p_demux_meta, p_peek, i_size );
return;
}
stream_Peek( p_demux->s, &p_peek, i_size ) == i_size )
{
msg_Dbg( p_demux, "found APEv1/2 tag" );
- ParseAPEvXTag( p_demux, p_peek, i_size );
+ ParseAPEvXTag( p_demux_meta, p_peek, i_size );
}
}
****************************************************************************/
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;
+ demux_meta_t *p_demux_meta = (demux_meta_t *)p_this;
+ demux_t *p_demux = (demux_t *)p_demux_meta->p_demux;
+ bool b_seekable;
int64_t i_init;
- msg_Dbg( p_demux, "checking for ID3v1/2 and APEv1/2 tags" );
+ msg_Dbg( p_demux_meta, "checking for ID3v1/2 and APEv1/2 tags" );
stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable );
if( !b_seekable )
return VLC_EGENERIC;
p_demux_meta->p_meta = NULL;
/* */
- CheckFooter( p_demux );
+ CheckFooter( p_demux_meta );
/* */
- CheckHeader( p_demux );
+ CheckHeader( p_demux_meta );
/* Restore position
* Demuxer will not see tags at the start as src/input/demux.c skips it
projects / vlc / blobdiff