Add a function to get the Title and fallback to the name if the title is empty.

[vlc] / modules / meta_engine / id3tag.c

diff --git a/modules/meta_engine/id3tag.c b/modules/meta_engine/id3tag.c
index 865386dc3fa9b3c9e6665e7ae10d44597a5deb1d..78a85cebc18066b33083ffb1271a84ddfe87659e 100644 (file)
--- a/modules/meta_engine/id3tag.c
+++ b/modules/meta_engine/id3tag.c
@@ -31,7 +31,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_demux.h>
 #include <vlc_playlist.h>
@@ -52,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
@@ -214,7 +215,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" ) )
             {
@@ -344,7 +345,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 );