s/informations/information/

[vlc] / modules / meta_engine / taglib.cpp

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 7beab4476d4a75da6272cd48a3cdcbbd7f2de4a7..11bcfdf87c964a04bbb03d6954c4cdbea2b4040c 100644 (file)
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -29,12 +29,13 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_playlist.h>
 #include <vlc_meta.h>
 #include <vlc_demux.h>
 #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>
@@ -63,6 +64,10 @@
 # include <wavfile.h>
 #endif
 
+#ifdef TAGLIB_WITH_MP4
+# include <mp4file.h>
+#endif
+
 #include <speexfile.h>
 #include <trueaudiofile.h>
 #include <vorbisfile.h>
@@ -89,7 +94,7 @@ using namespace TagLib;
 
 
 /**
- * Read meta informations from APE tags
+ * Read meta information from APE tags
  * @param tag: the APE tag
  * @param p_demux; the demux object
  * @param p_demux_meta: the demuxer meta
@@ -151,7 +156,7 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
                            p_txxx->fieldList().toString().toCString( true ) );
     }
 
-    // Get some more informations
+    // Get some more information
 #define SET( tagName, metaName )                                               \
     list = tag->frameListMap()[tagName];                                       \
     if( !list.isEmpty() )                                                      \
@@ -266,7 +271,7 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t*
 
 
 /**
- * Read the meta informations from XiphComments
+ * Read the meta information from XiphComments
  * @param tag: the Xiph Comment
  * @param p_demux; the demux object
  * @param p_demux_meta: the demuxer meta
@@ -317,7 +322,28 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_t* p_demux, demux_met
     vlc_meta_SetArtURL( p_meta, "attachment://cover" );
 }
 
-
+#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") )
+    {
+        MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
+        const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+        msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+                 psz_format, list[0].data().size() );
+
+        TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
+        input_attachment_t *p_attachment =
+                vlc_input_attachment_New( "cover", psz_format, "cover",
+                                          list[0].data().data(), list[0].data().size() );
+        TAB_APPEND_CAST( (input_attachment_t**),
+                         p_demux_meta->i_attachments, p_demux_meta->attachments,
+                         p_attachment );
+        vlc_meta_SetArtURL( p_meta, "attachment://cover" );
+    }
+}
+#endif
 
 /**
  * Get the tags from the file using TagLib
@@ -330,23 +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( 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
@@ -396,6 +430,13 @@ static int ReadMeta( vlc_object_t* p_this)
         else if( flac->xiphComment() )
             ReadMetaFromXiph( flac->xiphComment(), p_demux, p_demux_meta, p_meta );
     }
+#if defined(TAGLIB_WITH_MP4) && defined(HAVE_TAGLIB_MP4COVERART_H)
+    else if( MP4::File *mp4 = dynamic_cast<MP4::File*>(f.file()) )
+    {
+        if( mp4->tag() )
+            ReadMetaFromMP4( mp4->tag(), p_demux, p_demux_meta, p_meta );
+    }
+#endif
     else if( MPC::File* mpc = dynamic_cast<MPC::File*>(f.file()) )
     {
         if( mpc->APETag() )
@@ -443,7 +484,7 @@ static int ReadMeta( vlc_object_t* p_this)
 
 
 /**
- * Write meta informations to APE tags
+ * Write meta information to APE tags
  * @param tag: the APE tag
  * @param p_item: the input item
  */
@@ -501,7 +542,7 @@ static void WriteMetaToId3v2( ID3v2::Tag* tag, input_item_t* p_item )
 
 
 /**
- * Write the meta informations to XiphComments
+ * Write the meta information to XiphComments
  * @param tag: the Xiph Comment
  * @param p_input: the input item
  */