taglib: Check if a tablig string is !null and !empty before we try to use it.

[vlc] / modules / meta_engine / id3tag.c

diff --git a/modules/meta_engine/id3tag.c b/modules/meta_engine/id3tag.c
index f66d2cd9aa4de40916cbfcdddcea895478dcfca1..45d33fc0482ee94c0f33e4ecc04698bb0c5f18b7 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>
@@ -53,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();
@@ -270,8 +271,8 @@ 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;
+    bool b_start;
+    bool b_end;
     const uint8_t *p_header = NULL;
     int i_entry;
 
@@ -488,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" );