]> git.sesse.net Git - vlc/blobdiff - modules/meta_engine/taglib.cpp
taglib: fix warning about overriden variable.
[vlc] / modules / meta_engine / taglib.cpp
index 628522c99a61a260a417a1d7fd4f0a0a8ce9dfac..6d422478899d350d90739ed5e1e6b7871c856182 100644 (file)
@@ -6,6 +6,7 @@
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *          Rafaël Carré <funman@videolanorg>
+ *          Rémi Duraffort <ivoire@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 # include <unistd.h>
 #endif
 
-#include <fileref.h>
 
+// Taglib headers
+#include <fileref.h>
 #include <tag.h>
+#include <tbytevector.h>
+
+#include <apetag.h>
 #include <id3v2tag.h>
 #include <xiphcomment.h>
-#include <apetag.h>
 
 #include <flacfile.h>
 #include <mpcfile.h>
 #include <oggfile.h>
 #include <oggflacfile.h>
 #include <speexfile.h>
-#include <vorbisfile.h>
 #include <trueaudiofile.h>
+#include <vorbisfile.h>
 #include <wavpackfile.h>
 
-#include <tstring.h>
-#include <textidentificationframe.h>
-#include <tbytevector.h>
 #include <attachedpictureframe.h>
-//#include <oggflacfile.h> /* ogg flac files aren't auto-casted by TagLib */
-#include <flacproperties.h>
-#include <vorbisfile.h>
-#include <vorbisproperties.h>
-#include <uniquefileidentifierframe.h>
 #include <textidentificationframe.h>
-//#include <relativevolumeframe.h> /* parse the tags without TagLib helpers? */
+#include <uniquefileidentifierframe.h>
+
 
-static int  ReadMeta    ( vlc_object_t * );
-static int  DownloadArt ( vlc_object_t * );
-static int  WriteMeta   ( vlc_object_t * );
+// Local functions
+static int ReadMeta    ( vlc_object_t * );
+static int DownloadArt ( vlc_object_t * );
+static int WriteMeta   ( vlc_object_t * );
 
 vlc_module_begin ()
     set_capability( "meta reader", 1000 )
@@ -87,192 +85,37 @@ vlc_module_end ()
 using namespace TagLib;
 
 
-/* Try detecting embedded art */
-static void DetectImage( FileRef f, demux_t *p_demux )
-{
-    demux_meta_t        *p_demux_meta   = (demux_meta_t *)p_demux->p_private;
-    vlc_meta_t          *p_meta         = p_demux_meta->p_meta;
-    int                 i_score         = -1;
-
-    /* Preferred type of image
-     * The 21 types are defined in id3v2 standard:
-     * http://www.id3.org/id3v2.4.0-frames */
-    static const int pi_cover_score[] = {
-        0,  /* Other */
-        5,  /* 32x32 PNG image that should be used as the file icon */
-        4,  /* File icon of a different size or format. */
-        20, /* Front cover image of the album. */
-        19, /* Back cover image of the album. */
-        13, /* Inside leaflet page of the album. */
-        18, /* Image from the album itself. */
-        17, /* Picture of the lead artist or soloist. */
-        16, /* Picture of the artist or performer. */
-        14, /* Picture of the conductor. */
-        15, /* Picture of the band or orchestra. */
-        9,  /* Picture of the composer. */
-        8,  /* Picture of the lyricist or text writer. */
-        7,  /* Picture of the recording location or studio. */
-        10, /* Picture of the artists during recording. */
-        11, /* Picture of the artists during performance. */
-        6,  /* Picture from a movie or video related to the track. */
-        1,  /* Picture of a large, coloured fish. */
-        12, /* Illustration related to the track. */
-        3,  /* Logo of the band or performer. */
-        2   /* Logo of the publisher (record company). */
-    };
-
-    if( MPEG::File *mpeg = dynamic_cast<MPEG::File *>(f.file() ) )
-    {
-        ID3v2::Tag  *p_tag = mpeg->ID3v2Tag();
-        if( !p_tag )
-            return;
-        ID3v2::FrameList list = p_tag->frameListMap()[ "APIC" ];
-        if( list.isEmpty() )
-            return;
-        ID3v2::AttachedPictureFrame *p_apic;
-
-        TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
-        for( ID3v2::FrameList::Iterator iter = list.begin();
-                iter != list.end(); iter++ )
-        {
-            p_apic = dynamic_cast<ID3v2::AttachedPictureFrame*>(*iter);
-            input_attachment_t *p_attachment;
-
-            const char *psz_name, *psz_mime, *psz_description;
-            ByteVector p_data_taglib; const char *p_data; int i_data;
-
-            psz_mime = p_apic->mimeType().toCString(true);
-            psz_description = psz_name = p_apic->description().toCString(true);
-
-            /* some old iTunes version not only sets incorrectly the mime type
-             * or the description of the image,
-             * but also embeds incorrectly the image.
-             * Recent versions seem to behave correctly */
-            if( !strncmp( psz_mime, "PNG", 3 ) ||
-                !strncmp( psz_name, "\xC2\x89PNG", 5 ) )
-            {
-                msg_Warn( p_demux,
-                    "%s: Invalid picture embedded by broken iTunes version, "
-                    "you really shouldn't use this crappy software.",
-                    (const char *)f.file()->name() );
-                break;
-            }
-
-            p_data_taglib = p_apic->picture();
-            p_data = p_data_taglib.data();
-            i_data = p_data_taglib.size();
-
-            msg_Dbg( p_demux, "Found embedded art: %s (%s) is %i bytes",
-                    psz_name, psz_mime, i_data );
-
-            p_attachment = vlc_input_attachment_New( psz_name, psz_mime,
-                    psz_description, p_data, i_data );
-            TAB_APPEND_CAST( (input_attachment_t**),
-                    p_demux_meta->i_attachments, p_demux_meta->attachments,
-                    p_attachment );
-
-            if( pi_cover_score[p_apic->type()] > i_score )
-            {
-                i_score = pi_cover_score[p_apic->type()];
-                char *psz_url;
-                if( asprintf( &psz_url, "attachment://%s",
-                        p_attachment->psz_name ) == -1 )
-                    return;
-                vlc_meta_SetArtURL( p_meta, psz_url );
-                free( psz_url );
-            }
-        }
-    }
-    else
-    if( Ogg::Vorbis::File *oggv = dynamic_cast<Ogg::Vorbis::File *>(f.file() ) )
-    {
-        Ogg::XiphComment *p_tag = oggv->tag();
-        if( !p_tag )
-            return;
-
-        StringList mime_list = p_tag->fieldListMap()[ "COVERARTMIME" ];
-        StringList art_list = p_tag->fieldListMap()[ "COVERART" ];
-
-        /* we support only one cover in ogg/vorbis */
-        if( mime_list.size() != 1 || art_list.size() != 1 )
-            return;
-
-        input_attachment_t *p_attachment;
-
-        const char *psz_name, *psz_mime, *psz_description;
-        uint8_t *p_data;
-        int i_data;
-
-        psz_name = "cover";
-        psz_mime = mime_list[0].toCString(true);
-        psz_description = "cover";
-
-        i_data = vlc_b64_decode_binary( &p_data, art_list[0].toCString(true) );
-
-        msg_Dbg( p_demux, "Found embedded art: %s (%s) is %i bytes",
-                    psz_name, psz_mime, i_data );
-
-        TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
-        p_attachment = vlc_input_attachment_New( psz_name, psz_mime,
-                psz_description, p_data, i_data );
-        free( p_data );
-
-        TAB_APPEND_CAST( (input_attachment_t**),
-                p_demux_meta->i_attachments, p_demux_meta->attachments,
-                p_attachment );
-
-        vlc_meta_SetArtURL( p_meta, "attachment://cover" );
-    }
-
-#if 0
-    //flac embedded images are extracted in the flac demuxer
-    else if( FLAC::File *flac =
-             dynamic_cast<FLAC::File *>(f.file() ) )
-    {
-        p_tag = flac->ID3v2Tag();
-        if( p_tag )
-            return;
-        ID3v2::FrameList l = p_tag->frameListMap()[ "APIC" ];
-        if( l.isEmpty() )
-            return;
-            vlc_meta_SetArtURL( p_meta, "APIC" );
-    }
-#endif
-#if 0
-/* TagLib doesn't support MP4 file yet */
-    else if( MP4::File *mp4 =
-               dynamic_cast<MP4::File *>( f.file() ) )
-    {
-        MP4::Tag *mp4tag =
-                dynamic_cast<MP4::Tag *>( mp4->tag() );
-        if( mp4tag && mp4tag->cover().size() )
-            vlc_meta_SetArtURL( p_meta, "MP4C" );
-    }
-#endif
-}
-
-
-
 /**
  * Read meta informations from APE tags
  * @param tag: the APE tag
+ * @param p_demux; the demux object
+ * @param p_demux_meta: the demuxer meta
  * @param p_meta: the meta
- * @return VLC_SUCCESS if everything goes ok
  */
-static int ReadMetaFromAPE( APE::Tag* tag, vlc_meta_t* p_meta )
+static void ReadMetaFromAPE( APE::Tag* tag, demux_t* p_demux, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
 {
-    return VLC_SUCCESS;
+    APE::Item item;
+#define SET( keyName, metaName ) \
+    item = tag->itemListMap()[keyName]; \
+    vlc_meta_Set##metaName( p_meta, item.toString().toCString( true ) );\
+
+    SET( "COPYRIGHT", Copyright );
+    SET( "LANGUAGE", Language );
+    SET( "PUBLISHER", Publisher );
+
+#undef SET
 }
 
 
 
 /**
- * read meta information from id3v2 tags
+ * Read meta information from id3v2 tags
  * @param tag: the id3v2 tag
+ * @param p_demux; the demux object
+ * @param p_demux_meta: the demuxer meta
  * @param p_meta: the meta
- * @return VLC_SUCCESS if everything goes ok
  */
-static int ReadMetaFromId2v2( ID3v2::Tag* tag, vlc_meta_t* p_meta )
+static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
 {
     // Get the unique file identifier
     ID3v2::FrameList list = tag->frameListMap()["UFID"];
@@ -288,12 +131,9 @@ static int ReadMetaFromId2v2( ID3v2::Tag* tag, vlc_meta_t* p_meta )
              * but in our case it will be a '\0'
              * terminated string */
             char psz_ufid[64];
-            int j = 0;
-            int max_size = p_ufid->identifier().size() < 63 ?
-                           p_ufid->identifier().size() : 63;
-            while( j < max_size )
-                psz_ufid[j] = p_ufid->identifier()[j++];
-            psz_ufid[j] = '\0';
+            int max_size = __MIN( p_ufid->identifier().size(), 63);
+            strncpy( psz_ufid, p_ufid->identifier().data(), max_size );
+            psz_ufid[max_size] = '\0';
             vlc_meta_SetTrackID( p_meta, psz_ufid );
         }
     }
@@ -321,7 +161,103 @@ static int ReadMetaFromId2v2( ID3v2::Tag* tag, vlc_meta_t* p_meta )
     SET( "TPUB", Publisher );
 
 #undef SET
-    return VLC_SUCCESS;
+
+    /* Preferred type of image
+     * The 21 types are defined in id3v2 standard:
+     * http://www.id3.org/id3v2.4.0-frames */
+    static const int pi_cover_score[] = {
+        0,  /* Other */
+        5,  /* 32x32 PNG image that should be used as the file icon */
+        4,  /* File icon of a different size or format. */
+        20, /* Front cover image of the album. */
+        19, /* Back cover image of the album. */
+        13, /* Inside leaflet page of the album. */
+        18, /* Image from the album itself. */
+        17, /* Picture of the lead artist or soloist. */
+        16, /* Picture of the artist or performer. */
+        14, /* Picture of the conductor. */
+        15, /* Picture of the band or orchestra. */
+        9,  /* Picture of the composer. */
+        8,  /* Picture of the lyricist or text writer. */
+        7,  /* Picture of the recording location or studio. */
+        10, /* Picture of the artists during recording. */
+        11, /* Picture of the artists during performance. */
+        6,  /* Picture from a movie or video related to the track. */
+        1,  /* Picture of a large, coloured fish. */
+        12, /* Illustration related to the track. */
+        3,  /* Logo of the band or performer. */
+        2   /* Logo of the publisher (record company). */
+    };
+    int i_score = -1;
+
+    // Try now to get embedded art
+    list = tag->frameListMap()[ "APIC" ];
+    if( list.isEmpty() )
+        return;
+
+    TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
+    for( iter = list.begin(); iter != list.end(); iter++ )
+    {
+        ID3v2::AttachedPictureFrame* p_apic =
+            dynamic_cast<ID3v2::AttachedPictureFrame*>(*iter);
+        input_attachment_t *p_attachment;
+
+        const char *psz_mime;
+        char *psz_name, *psz_description;
+
+        // Get the mime and description of the image.
+        // If the description is empty, take the type as a description
+        psz_mime = p_apic->mimeType().toCString( true );
+        if( p_apic->description().size() > 0 )
+            psz_description = strdup( p_apic->description().toCString( true ) );
+        else
+        {
+            if( asprintf( &psz_description, "%i", p_apic->type() ) == -1 )
+                psz_description = NULL;
+        }
+
+        if( !psz_description )
+            continue;
+        psz_name = psz_description;
+
+        /* some old iTunes version not only sets incorrectly the mime type
+         * or the description of the image,
+         * but also embeds incorrectly the image.
+         * Recent versions seem to behave correctly */
+        if( !strncmp( psz_mime, "PNG", 3 ) ||
+            !strncmp( psz_name, "\xC2\x89PNG", 5 ) )
+        {
+            msg_Warn( p_demux, "Invalid picture embedded by broken iTunes version" );
+            free( psz_description );
+            continue;
+        }
+
+        const ByteVector picture = p_apic->picture();
+        const char *p_data = picture.data();
+        const unsigned i_data = picture.size();
+
+        msg_Dbg( p_demux, "Found embedded art: %s (%s) is %u bytes",
+                 psz_name, psz_mime, i_data );
+
+        p_attachment = vlc_input_attachment_New( psz_name, psz_mime,
+                                psz_description, p_data, i_data );
+        if( p_attachment )
+            TAB_APPEND_CAST( (input_attachment_t**),
+                             p_demux_meta->i_attachments, p_demux_meta->attachments,
+                             p_attachment );
+        free( psz_description );
+
+        if( pi_cover_score[p_apic->type()] > i_score )
+        {
+            i_score = pi_cover_score[p_apic->type()];
+            char *psz_url;
+            if( asprintf( &psz_url, "attachment://%s",
+                          p_attachment->psz_name ) == -1 )
+                continue;
+            vlc_meta_SetArtURL( p_meta, psz_url );
+            free( psz_url );
+        }
+    }
 }
 
 
@@ -329,12 +265,53 @@ static int ReadMetaFromId2v2( ID3v2::Tag* tag, vlc_meta_t* p_meta )
 /**
  * Read the meta informations from XiphComments
  * @param tag: the Xiph Comment
+ * @param p_demux; the demux object
+ * @param p_demux_meta: the demuxer meta
  * @param p_meta: the meta
- * @return VLC_SUCCESS if everything goes ok
  */
-static int ReadMetaFromXiph( Ogg::XiphComment* tag, vlc_meta_t* p_meta )
+static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_t* p_demux, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
 {
-    return VLC_SUCCESS;
+#define SET( keyName, metaName )                                               \
+    StringList list = tag->fieldListMap()[keyName];                            \
+    if( !list.isEmpty() )                                                      \
+        vlc_meta_Set##metaName( p_meta, (*list.begin()).toCString( true ) );
+
+    SET( "COPYRIGHT", Copyright );
+#undef SET
+
+    // Try now to get embedded art
+    StringList mime_list = tag->fieldListMap()[ "COVERARTMIME" ];
+    StringList art_list = tag->fieldListMap()[ "COVERART" ];
+
+    // We get only the first covert art
+    if( mime_list.size() > 1 || art_list.size() > 1 )
+        msg_Warn( p_demux, "Found %i embedded arts, so using only the first one",
+                  art_list.size() );
+    else if( mime_list.size() == 0 || art_list.size() == 0 )
+        return;
+
+    input_attachment_t *p_attachment;
+
+    const char* psz_name = "cover";
+    const char* psz_mime = mime_list[0].toCString(true);
+    const char* psz_description = "cover";
+
+    uint8_t *p_data;
+    int i_data = vlc_b64_decode_binary( &p_data, art_list[0].toCString(true) );
+
+    msg_Dbg( p_demux, "Found embedded art: %s (%s) is %i bytes",
+             psz_name, psz_mime, i_data );
+
+    TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
+              p_attachment = vlc_input_attachment_New( psz_name, psz_mime,
+              psz_description, p_data, i_data );
+    free( p_data );
+
+    TAB_APPEND_CAST( (input_attachment_t**),
+                     p_demux_meta->i_attachments, p_demux_meta->attachments,
+                     p_attachment );
+
+    vlc_meta_SetArtURL( p_meta, "attachment://cover" );
 }
 
 
@@ -371,10 +348,10 @@ static int ReadMeta( vlc_object_t* p_this)
     // Read the tags from the file
     Tag* p_tag = f.tag();
 
-#define SET( meta, tag )                                                       \
+#define SET( tag, meta )                                                       \
     if( !p_tag->tag().isNull() && !p_tag->tag().isEmpty() )                    \
         vlc_meta_Set##meta( p_meta, p_tag->tag().toCString(true) )
-#define SETINT( meta, tag )                                                    \
+#define SETINT( tag, meta )                                                    \
     if( p_tag->tag() )                                                         \
     {                                                                          \
         char psz_tmp[10];                                                      \
@@ -382,13 +359,13 @@ static int ReadMeta( vlc_object_t* p_this)
         vlc_meta_Set##meta( p_meta, psz_tmp );                                 \
     }
 
-    SET( Title, title );
-    SET( Artist, artist );
-    SET( Album, album );
-    SET( Description, comment );
-    SET( Genre, genre );
-    SETINT( Date, year );
-    SETINT( Tracknum, track );
+    SET( title, Title );
+    SET( artist, Artist );
+    SET( album, Album );
+    SET( comment, Description );
+    SET( genre, Genre );
+    SETINT( year, Date );
+    SETINT( track, TrackNum );
 
 #undef SETINT
 #undef SET
@@ -398,49 +375,136 @@ static int ReadMeta( vlc_object_t* p_this)
     if( FLAC::File* flac = dynamic_cast<FLAC::File*>(f.file()) )
     {
         if( flac->ID3v2Tag() )
-            ReadMetaFromId2v2( flac->ID3v2Tag(), p_meta );
+            ReadMetaFromId3v2( flac->ID3v2Tag(), p_demux, p_demux_meta, p_meta );
         else if( flac->xiphComment() )
-            ReadMetaFromXiph( flac->xiphComment(), p_meta );
+            ReadMetaFromXiph( flac->xiphComment(), p_demux, p_demux_meta, p_meta );
     }
     else if( MPC::File* mpc = dynamic_cast<MPC::File*>(f.file()) )
     {
         if( mpc->APETag() )
-            ReadMetaFromAPE( mpc->APETag(), p_meta );
+            ReadMetaFromAPE( mpc->APETag(), p_demux, p_demux_meta, p_meta );
     }
     else if( MPEG::File* mpeg = dynamic_cast<MPEG::File*>(f.file()) )
     {
         if( mpeg->ID3v2Tag() )
-            ReadMetaFromId2v2( mpeg->ID3v2Tag(), p_meta );
+            ReadMetaFromId3v2( mpeg->ID3v2Tag(), p_demux, p_demux_meta, p_meta );
         else if( mpeg->APETag() )
-            ReadMetaFromAPE( mpeg->APETag(), p_meta );
+            ReadMetaFromAPE( mpeg->APETag(), p_demux, p_demux_meta, p_meta );
     }
     else if( Ogg::File* ogg = dynamic_cast<Ogg::File*>(f.file()) )
     {
         if( Ogg::FLAC::File* ogg_flac = dynamic_cast<Ogg::FLAC::File*>(f.file()))
-            ReadMetaFromXiph( ogg_flac->tag(), p_meta );
+            ReadMetaFromXiph( ogg_flac->tag(), p_demux, p_demux_meta, p_meta );
         else if( Ogg::Speex::File* ogg_speex = dynamic_cast<Ogg::Speex::File*>(f.file()) )
-            ReadMetaFromXiph( ogg_speex->tag(), p_meta );
+            ReadMetaFromXiph( ogg_speex->tag(), p_demux, p_demux_meta, p_meta );
         else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
-            ReadMetaFromXiph( ogg_vorbis->tag(), p_meta );
+            ReadMetaFromXiph( ogg_vorbis->tag(), p_demux, p_demux_meta, p_meta );
     }
     else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
     {
         if( trueaudio->ID3v2Tag() )
-            ReadMetaFromId2v2( trueaudio->ID3v2Tag(), p_meta );
+            ReadMetaFromId3v2( trueaudio->ID3v2Tag(), p_demux, p_demux_meta, p_meta );
     }
     else if( WavPack::File* wavpack = dynamic_cast<WavPack::File*>(f.file()) )
     {
         if( wavpack->APETag() )
-            ReadMetaFromAPE( wavpack->APETag(), p_meta );
+            ReadMetaFromAPE( wavpack->APETag(), p_demux, p_demux_meta, p_meta );
     }
 
-    // Try now to find a image
-    DetectImage( f, p_demux );
-
     return VLC_SUCCESS;
 }
 
 
+
+/**
+ * Write meta informations to APE tags
+ * @param tag: the APE tag
+ * @param p_item: the input item
+ */
+static void WriteMetaToAPE( APE::Tag* tag, input_item_t* p_item )
+{
+    char* psz_meta;
+#define WRITE( metaName, keyName )                      \
+    psz_meta = input_item_Get##metaName( p_item );      \
+    if( psz_meta )                                      \
+    {                                                   \
+        String key( keyName, String::UTF8 );            \
+        String value( psz_meta, String::UTF8 );         \
+        tag->addValue( key, value, true );              \
+    }                                                   \
+    free( psz_meta );
+
+    WRITE( Copyright, "COPYRIGHT" );
+    WRITE( Language, "LANGUAGE" );
+    WRITE( Publisher, "PUBLISHER" );
+
+#undef WRITE
+}
+
+
+
+/**
+ * Write meta information to id3v2 tags
+ * @param tag: the id3v2 tag
+ * @param p_input: the input item
+ */
+static void WriteMetaToId3v2( ID3v2::Tag* tag, input_item_t* p_item )
+{
+    char* psz_meta;
+#define WRITE( metaName, tagName )                                            \
+    psz_meta = input_item_Get##metaName( p_item );                            \
+    if( psz_meta )                                                            \
+    {                                                                         \
+        ByteVector p_byte( tagName, 4 );                                      \
+        tag->removeFrames( p_byte );                                         \
+        ID3v2::TextIdentificationFrame* p_frame =                             \
+            new ID3v2::TextIdentificationFrame( p_byte, String::UTF8 );       \
+        p_frame->setText( psz_meta );                                         \
+        tag->addFrame( p_frame );                                             \
+    }                                                                         \
+    free( psz_meta );
+
+    WRITE( Copyright, "TCOP" );
+    WRITE( EncodedBy, "TENC" );
+    WRITE( Language,  "TLAN" );
+    WRITE( Publisher, "TPUB" );
+
+#undef WRITE
+}
+
+
+
+/**
+ * Write the meta informations to XiphComments
+ * @param tag: the Xiph Comment
+ * @param p_input: the input item
+ */
+static void WriteMetaToXiph( Ogg::XiphComment* tag, input_item_t* p_item )
+{
+    char* psz_meta;
+#define WRITE( metaName, keyName )                      \
+    psz_meta = input_item_Get##metaName( p_item );      \
+    if( psz_meta )                                      \
+    {                                                   \
+        String key( keyName, String::UTF8 );            \
+        String value( psz_meta, String::UTF8 );         \
+        tag->addField( key, value, true );              \
+    }                                                   \
+    free( psz_meta );
+
+    WRITE( Copyright, "COPYRIGHT" );
+
+#undef WRITE
+}
+
+
+
+/**
+ * Set the tags to the file using TagLib
+ * @param p_this: the demux object
+ * @return VLC_SUCCESS if the operation success
+ */
+
 static int WriteMeta( vlc_object_t *p_this )
 {
     playlist_t *p_playlist = (playlist_t *)p_this;
@@ -508,32 +572,55 @@ static int WriteMeta( vlc_object_t *p_this )
     if( psz_meta ) p_tag->setTrack( atoi( psz_meta ) );
     free( psz_meta );
 
-    if( ID3v2::Tag *p_id3tag =
-        dynamic_cast<ID3v2::Tag *>(p_tag) )
-    {
-#define WRITE( foo, bar ) \
-        psz_meta = input_item_Get##foo( p_item ); \
-        if( psz_meta ) \
-        { \
-            ByteVector p_byte( bar, 4 ); \
-            ID3v2::TextIdentificationFrame p_frame( p_byte ); \
-            p_frame.setText( psz_meta ); \
-            p_id3tag->addFrame( &p_frame ); \
-            free( psz_meta ); \
-        } \
-
-        WRITE( Publisher, "TPUB" );
-        WRITE( Copyright, "TCOP" );
-        WRITE( EncodedBy, "TENC" );
-        WRITE( Language, "TLAN" );
 
-#undef WRITE
+    // Try now to write special tags
+    if( FLAC::File* flac = dynamic_cast<FLAC::File*>(f.file()) )
+    {
+        if( flac->ID3v2Tag() )
+            WriteMetaToId3v2( flac->ID3v2Tag(), p_item );
+        else if( flac->xiphComment() )
+            WriteMetaToXiph( flac->xiphComment(), p_item );
+    }
+    else if( MPC::File* mpc = dynamic_cast<MPC::File*>(f.file()) )
+    {
+        if( mpc->APETag() )
+            WriteMetaToAPE( mpc->APETag(), p_item );
+    }
+    else if( MPEG::File* mpeg = dynamic_cast<MPEG::File*>(f.file()) )
+    {
+        if( mpeg->ID3v2Tag() )
+            WriteMetaToId3v2( mpeg->ID3v2Tag(), p_item );
+        else if( mpeg->APETag() )
+            WriteMetaToAPE( mpeg->APETag(), p_item );
+    }
+    else if( Ogg::File* ogg = dynamic_cast<Ogg::File*>(f.file()) )
+    {
+        if( Ogg::FLAC::File* ogg_flac = dynamic_cast<Ogg::FLAC::File*>(f.file()))
+            WriteMetaToXiph( ogg_flac->tag(), p_item );
+        else if( Ogg::Speex::File* ogg_speex = dynamic_cast<Ogg::Speex::File*>(f.file()) )
+            WriteMetaToXiph( ogg_speex->tag(), p_item );
+        else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
+            WriteMetaToXiph( ogg_vorbis->tag(), p_item );
+    }
+    else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+    {
+        if( trueaudio->ID3v2Tag() )
+            WriteMetaToId3v2( trueaudio->ID3v2Tag(), p_item );
+    }
+    else if( WavPack::File* wavpack = dynamic_cast<WavPack::File*>(f.file()) )
+    {
+        if( wavpack->APETag() )
+            WriteMetaToAPE( wavpack->APETag(), p_item );
     }
 
+    // Save the meta data
     f.save();
+
     return VLC_SUCCESS;
 }
 
+
+
 static int DownloadArt( vlc_object_t *p_this )
 {
     /* We need to be passed the file name