Fix taglib compilation.

[vlc] / modules / meta_engine / taglib.cpp

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 79fd6621d71ea5e4b81eb52e301067149010a3b7..a75756823d58b64032d5ff5fa5e08f2ade7deffa 100644 (file)
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -34,6 +34,8 @@
 #include <vlc_strings.h>
 #include <vlc_charset.h>
 #include <vlc_url.h>
+#include <vlc_input_item.h>
+#include <vlc_input.h> /* for attachment_new */
 
 #ifdef WIN32
 # include <io.h>
@@ -320,7 +322,7 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_t* p_demux, demux_met
     vlc_meta_SetArtURL( p_meta, "attachment://cover" );
 }
 
-#ifdef TAGLIB_WITH_MP4
+#if defined(TAGLIB_WITH_MP4) && defined(HAVE_TAGLIB_MP4COVERART_H)
 static void ReadMetaFromMP4( MP4::Tag* tag, demux_t *p_demux, demux_meta_t *p_demux_meta, vlc_meta_t* p_meta )
 {
     if( tag->itemListMap().contains("covr") )
@@ -354,25 +356,31 @@ static int ReadMeta( vlc_object_t* p_this)
     demux_t*        p_demux = p_demux_meta->p_demux;
     vlc_meta_t*     p_meta;
     FileRef f;
-    char *psz_path = decode_URI_duplicate( p_demux->psz_path );
 
     p_demux_meta->p_meta = NULL;
-    if( !psz_path )
-        return VLC_ENOMEM;
-    if( strncmp( p_demux->psz_access, "file", strlen("file") ) )
+    if( strcmp( p_demux->psz_access, "file" ) )
         return VLC_EGENERIC;
 
+    char *psz_path = strdup( p_demux->psz_file );
+    if( !psz_path )
+        return VLC_ENOMEM;
 
 #if defined(WIN32) || defined (UNDER_CE)
     wchar_t wpath[MAX_PATH + 1];
     if( !MultiByteToWideChar( CP_UTF8, 0, psz_path, -1, wpath, MAX_PATH) )
+    {
+        free( psz_path );
         return VLC_EGENERIC;
+    }
     wpath[MAX_PATH] = L'\0';
     f = FileRef( wpath );
 #else
     const char* local_name = ToLocale( psz_path );
     if( !local_name )
+    {
+        free( psz_path );
         return VLC_EGENERIC;
+    }
     f = FileRef( local_name );
     LocaleFree( local_name );
 #endif
@@ -422,7 +430,7 @@ static int ReadMeta( vlc_object_t* p_this)
         else if( flac->xiphComment() )
             ReadMetaFromXiph( flac->xiphComment(), p_demux, p_demux_meta, p_meta );
     }
-#ifdef TAGLIB_WITH_MP4
+#if defined(TAGLIB_WITH_MP4) && defined(HAVE_TAGLIB_MP4COVERART_H)
     else if( MP4::File *mp4 = dynamic_cast<MP4::File*>(f.file()) )
     {
         if( mp4->tag() )