Use a VLC object for meta reader

[vlc] / modules / meta_engine / id3tag.c

diff --git a/modules/meta_engine/id3tag.c b/modules/meta_engine/id3tag.c
index e02dbf592ac607622e70997f80bca9c6bef82e6a..bc49eca7e45ec499a3cd843705500bafce3b0793 100644 (file)
--- a/modules/meta_engine/id3tag.c
+++ b/modules/meta_engine/id3tag.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_demux.h>
@@ -53,11 +53,11 @@ static int  ParseTags ( vlc_object_t * );
 /*****************************************************************************
  * 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
@@ -92,10 +92,7 @@ static void ParseID3Tag( demux_t *p_demux, const uint8_t *p_data, int i_size )
             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 );
@@ -136,7 +133,8 @@ static void ParseID3Tag( demux_t *p_demux, const uint8_t *p_data, int i_size )
             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 )
@@ -161,7 +159,7 @@ static void ParseID3Tag( demux_t *p_demux, const uint8_t *p_data, int i_size )
     /* 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" ) )
@@ -215,7 +213,7 @@ static void ParseID3Tag( demux_t *p_demux, const uint8_t *p_data, int i_size )
             }
             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" ) )
             {
@@ -345,7 +343,7 @@ static void ParseAPEvXTag( demux_t *p_demux, const uint8_t *p_data, int i_data )
                 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 );
@@ -487,12 +485,12 @@ static void CheckHeader( demux_t *p_demux )
  ****************************************************************************/
 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;
+    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;