/*****************************************************************************
* taglib.cpp: Taglib tag parser/writer
*****************************************************************************
- * Copyright (C) 2003-2006 the VideoLAN team
+ * Copyright (C) 2003-2011 VLC authors and VideoLAN
* $Id$
*
* 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#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_demux.h> /* demux_meta_t */
+#include <vlc_strings.h> /* vlc_b64_decode_binary */
+#include <vlc_input.h> /* for attachment_new */
+#include <vlc_url.h> /* make_path */
+#include <vlc_mime.h> /* mime type */
+#include <vlc_fs.h>
-#ifdef WIN32
+#include <sys/stat.h>
+
+#ifdef _WIN32
+# include <vlc_charset.h>
# include <io.h>
#else
# include <unistd.h>
#endif
+
+// Taglib headers
+#ifdef _WIN32
+# define TAGLIB_STATIC
+#endif
+#include <taglib.h>
+#define VERSION_INT(a, b, c) ((a)<<16 | (b)<<8 | (c))
+#define TAGLIB_VERSION VERSION_INT(TAGLIB_MAJOR_VERSION, \
+ TAGLIB_MINOR_VERSION, \
+ TAGLIB_PATCH_VERSION)
+
#include <fileref.h>
#include <tag.h>
-#include <tstring.h>
-#include <id3v2tag.h>
-#include <textidentificationframe.h>
#include <tbytevector.h>
-#include <mpegfile.h>
-#include <attachedpictureframe.h>
-//#include <oggflacfile.h> /* ogg flac files aren't auto-casted by TagLib */
+
+#if TAGLIB_VERSION >= VERSION_INT(1,7,0)
+# define TAGLIB_HAVE_APEFILE_H
+# include <apefile.h>
+# ifdef TAGLIB_WITH_ASF // ASF pictures comes with v1.7.0
+# define TAGLIB_HAVE_ASFPICTURE_H
+# include <asffile.h>
+# endif
+#endif
+
+#if TAGLIB_VERSION >= VERSION_INT(1,9,0)
+# include <opusfile.h>
+#endif
+
+#include <apetag.h>
#include <flacfile.h>
-#include <flacproperties.h>
+#include <mpcfile.h>
+#include <mpegfile.h>
+#include <oggfile.h>
+#include <oggflacfile.h>
+#include "../demux/xiph_metadata.h"
+
+#include <aifffile.h>
+#include <wavfile.h>
+
+#if defined(TAGLIB_WITH_MP4)
+# include <mp4file.h>
+#endif
+
+#include <speexfile.h>
+#include <trueaudiofile.h>
#include <vorbisfile.h>
-#include <vorbisproperties.h>
-#include <xiphcomment.h>
-#include <uniquefileidentifierframe.h>
+#include <wavpackfile.h>
+
+#include <attachedpictureframe.h>
#include <textidentificationframe.h>
-//#include <relativevolumeframe.h> /* parse the tags without TagLib helpers? */
-
-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 );
- set_callbacks( ReadMeta, NULL );
- add_submodule();
- set_capability( "art downloader", 50 );
- set_callbacks( DownloadArt, NULL );
- add_submodule();
- set_capability( "meta writer", 50 );
- set_callbacks( WriteMeta, NULL );
-vlc_module_end();
+#include <uniquefileidentifierframe.h>
+
+// taglib is not thread safe
+static vlc_mutex_t taglib_lock = VLC_STATIC_MUTEX;
+
+// Local functions
+static int ReadMeta ( vlc_object_t * );
+static int WriteMeta ( vlc_object_t * );
+
+vlc_module_begin ()
+ set_capability( "meta reader", 1000 )
+ set_callbacks( ReadMeta, NULL )
+ add_submodule ()
+ set_capability( "meta writer", 50 )
+ set_callbacks( WriteMeta, NULL )
+vlc_module_end ()
using namespace TagLib;
-/* Try detecting embedded art */
-static void DetectImage( FileRef f, demux_t *p_demux )
+static void ExtractTrackNumberValues( vlc_meta_t* p_meta, const char *psz_value )
+{
+ unsigned int i_trknum, i_trktot;
+ if( sscanf( psz_value, "%u/%u", &i_trknum, &i_trktot ) == 2 )
+ {
+ char psz_trck[11];
+ snprintf( psz_trck, sizeof( psz_trck ), "%u", i_trknum );
+ vlc_meta_SetTrackNum( p_meta, psz_trck );
+ snprintf( psz_trck, sizeof( psz_trck ), "%u", i_trktot );
+ vlc_meta_Set( p_meta, vlc_meta_TrackTotal, psz_trck );
+ }
+}
+
+/**
+ * Read meta information from APE tags
+ * @param tag: the APE tag
+ * @param p_demux_meta: the demuxer meta
+ * @param p_meta: the meta
+ */
+static void ReadMetaFromAPE( APE::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
{
- 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;
+ APE::ItemListMap fields ( tag->itemListMap() );
+ APE::ItemListMap::Iterator iter;
+
+ iter = fields.find("COVER ART (FRONT)");
+ if( iter != fields.end()
+ && !iter->second.isEmpty()
+ && !iter->second.type() == APE::Item::Binary)
+ {
+ input_attachment_t *p_attachment;
+
+ const ByteVector picture = iter->second.binaryData();
+ const char *p_data = picture.data();
+ unsigned i_data = picture.size();
+
+ /* Null terminated filename followed by the image data */
+ size_t desc_len = strnlen(p_data, i_data);
+ if( desc_len < i_data && IsUTF8( p_data ) )
+ {
+ const char *psz_name = p_data;
+ const char *psz_mime = vlc_mime_Ext2Mime( psz_name );
+ p_data += desc_len + 1; /* '\0' */
+ i_data -= desc_len + 1;
+
+ msg_Dbg( p_demux_meta, "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_name, p_data, i_data );
+ if( p_attachment )
+ {
+ TAB_APPEND_CAST( (input_attachment_t**),
+ p_demux_meta->i_attachments, p_demux_meta->attachments,
+ p_attachment );
+
+ char *psz_url;
+ if( asprintf( &psz_url, "attachment://%s", p_attachment->psz_name ) != -1 )
+ {
+ vlc_meta_SetArtURL( p_meta, psz_url );
+ free( psz_url );
+ }
+ }
+ }
+
+ fields.erase(iter);
+ }
+
+#define SET( keyName, metaName ) \
+ iter = fields.find(keyName); \
+ if( iter != fields.end() && !iter->second.isEmpty() ) { \
+ vlc_meta_Set##metaName( p_meta, iter->second.toString().toCString( true ) ); \
+ fields.erase(iter); \
+ }
+
+#define SET_EXTRA( keyName, metaName ) \
+ iter = fields.find( keyName ); \
+ if( iter != fields.end() && !iter->second.isEmpty() ) { \
+ vlc_meta_AddExtra( p_meta, metaName, iter->second.toString().toCString( true ) ); \
+ fields.erase(iter); \
+ }
+
+ SET( "ALBUM", Album );
+ SET( "ARTIST", Artist );
+ SET( "COMMENT", Description );
+ SET( "GENRE", Genre );
+ SET( "TITLE", Title );
+ SET( "COPYRIGHT", Copyright );
+ SET( "LANGUAGE", Language );
+ SET( "PUBLISHER", Publisher );
+ SET( "MUSICBRAINZ_TRACKID", TrackID );
+
+ SET_EXTRA( "MUSICBRAINZ_ALBUMID", VLC_META_EXTRA_MB_ALBUMID );
+
+#undef SET
+#undef SET_EXTRA
+
+ /* */
+ iter = fields.find( "TRACK" );
+ if( iter != fields.end() && !iter->second.isEmpty() )
+ {
+ ExtractTrackNumberValues( p_meta, iter->second.toString().toCString( true ) );
+ fields.erase( iter );
+ }
+
+ /* Remainings */
+ for( iter = fields.begin(); iter != fields.end(); ++iter )
+ {
+ if( iter->second.isEmpty() )
+ continue;
+
+ if( iter->second.type() != APE::Item::Text )
+ continue;
+
+ vlc_meta_AddExtra( p_meta,
+ iter->first.toCString( true ),
+ iter->second.toString().toCString( true ) );
+ }
+}
+
+
+/**
+ * Read meta information from ASF tags
+ * @param tag: the ASF tag
+ * @param p_demux_meta: the demuxer meta
+ * @param p_meta: the meta
+ */
+static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
+{
+
+ ASF::AttributeList list;
+#define SET( keyName, metaName ) \
+ if( tag->attributeListMap().contains(keyName) ) \
+ { \
+ list = tag->attributeListMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.front().toString().toCString( true ) ); \
+ }
+
+#define SET_EXTRA( keyName, metaName ) \
+ if( tag->attributeListMap().contains(keyName) ) \
+ { \
+ list = tag->attributeListMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.front().toString().toCString( true ) ); \
+ }
+
+ SET("MusicBrainz/Track Id", TrackID );
+ SET_EXTRA("MusicBrainz/Album Id", VLC_META_EXTRA_MB_ALBUMID );
+
+#undef SET
+#undef SET_EXTRA
+
+#ifdef TAGLIB_HAVE_ASFPICTURE_H
+ // List the pictures
+ list = tag->attributeListMap()["WM/Picture"];
+ ASF::AttributeList::Iterator iter;
+ for( iter = list.begin(); iter != list.end(); iter++ )
+ {
+ const ASF::Picture asfPicture = (*iter).toPicture();
+ const ByteVector picture = asfPicture.picture();
+ const char *psz_mime = asfPicture.mimeType().toCString();
+ const char *p_data = picture.data();
+ const unsigned i_data = picture.size();
+ char *psz_name;
+ input_attachment_t *p_attachment;
+
+ if( asfPicture.description().size() > 0 )
+ psz_name = strdup( asfPicture.description().toCString( true ) );
+ else
+ {
+ if( asprintf( &psz_name, "%i", asfPicture.type() ) == -1 )
+ continue;
+ }
+
+ msg_Dbg( p_demux_meta, "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_name, p_data, i_data );
+ if( p_attachment )
+ TAB_APPEND_CAST( (input_attachment_t**),
+ p_demux_meta->i_attachments, p_demux_meta->attachments,
+ p_attachment );
+ char *psz_url;
+ if( asprintf( &psz_url, "attachment://%s", psz_name ) != -1 )
+ {
+ vlc_meta_SetArtURL( p_meta, psz_url );
+ free( psz_url );
+ }
+ free( psz_name );
+ }
+#endif
+}
+
+
+/**
+ * Read meta information from id3v2 tags
+ * @param tag: the id3v2 tag
+ * @param p_demux_meta: the demuxer meta
+ * @param p_meta: the meta
+ */
+static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
+{
+ // Get the unique file identifier
+ ID3v2::FrameList list = tag->frameListMap()["UFID"];
+ ID3v2::FrameList::Iterator iter;
+ for( iter = list.begin(); iter != list.end(); iter++ )
+ {
+ ID3v2::UniqueFileIdentifierFrame* p_ufid =
+ dynamic_cast<ID3v2::UniqueFileIdentifierFrame*>(*iter);
+ if( !p_ufid )
+ continue;
+ const char *owner = p_ufid->owner().toCString();
+ if (!strcmp( owner, "http://musicbrainz.org" ))
+ {
+ /* ID3v2 UFID contains up to 64 bytes binary data
+ * but in our case it will be a '\0'
+ * terminated string */
+ char psz_ufid[64];
+ 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 );
+ }
+ }
+
+ // Get the use text
+ list = tag->frameListMap()["TXXX"];
+ for( iter = list.begin(); iter != list.end(); iter++ )
+ {
+ ID3v2::UserTextIdentificationFrame* p_txxx =
+ dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter);
+ if( !p_txxx )
+ continue;
+ if( !strcmp( p_txxx->description().toCString( true ), "TRACKTOTAL" ) )
+ {
+ vlc_meta_Set( p_meta, vlc_meta_TrackTotal, p_txxx->fieldList().back().toCString( true ) );
+ continue;
+ }
+ if( !strcmp( p_txxx->description().toCString( true ), "MusicBrainz Album Id" ) )
+ {
+ vlc_meta_AddExtra( p_meta, VLC_META_EXTRA_MB_ALBUMID, p_txxx->fieldList().back().toCString( true ) );
+ continue;
+ }
+ vlc_meta_AddExtra( p_meta, p_txxx->description().toCString( true ),
+ p_txxx->fieldList().back().toCString( true ) );
+ }
+
+ // Get some more information
+#define SET( tagName, metaName ) \
+ list = tag->frameListMap()[tagName]; \
+ if( !list.isEmpty() ) \
+ vlc_meta_Set##metaName( p_meta, \
+ (*list.begin())->toString().toCString( true ) );
+
+ SET( "TCOP", Copyright );
+ SET( "TENC", EncodedBy );
+ SET( "TLAN", Language );
+ SET( "TPUB", Publisher );
+ SET( "TPE2", AlbumArtist );
+ SET( "TPOS", DiscNumber );
+
+#undef SET
+
+ /* */
+ list = tag->frameListMap()["TRCK"];
+ if( !list.isEmpty() )
+ {
+ ExtractTrackNumberValues( p_meta, (*list.begin())->toString().toCString( true ) );
+ }
/* Preferred type of image
* The 21 types are defined in id3v2 standard:
3, /* Logo of the band or performer. */
2 /* Logo of the publisher (record company). */
};
+ #define PI_COVER_SCORE_SIZE (sizeof (pi_cover_score) / sizeof (pi_cover_score[0]))
+ int i_score = -1;
+
+ // Try now to get embedded art
+ list = tag->frameListMap()[ "APIC" ];
+ if( list.isEmpty() )
+ return;
- if( MPEG::File *mpeg = dynamic_cast<MPEG::File *>(f.file() ) )
+ for( iter = list.begin(); iter != list.end(); iter++ )
{
- 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;
+ ID3v2::AttachedPictureFrame* p_apic =
+ dynamic_cast<ID3v2::AttachedPictureFrame*>(*iter);
+ if( !p_apic )
+ continue;
+ input_attachment_t *p_attachment;
+
+ const char *psz_mime;
+ char *psz_name, *psz_description;
- TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
- for( ID3v2::FrameList::Iterator iter = list.begin();
- iter != list.end(); iter++ )
+ // 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
{
- p_apic = dynamic_cast<ID3v2::AttachedPictureFrame*>(*iter);
- input_attachment_t *p_attachment;
+ if( asprintf( &psz_description, "%i", p_apic->type() ) == -1 )
+ psz_description = NULL;
+ }
- const char *psz_name, *psz_mime, *psz_description;
- ByteVector p_data_taglib; const char *p_data; int i_data;
+ if( !psz_description )
+ continue;
+ psz_name = psz_description;
- 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_meta, "Invalid picture embedded by broken iTunes version" );
+ free( psz_description );
+ continue;
+ }
- /* 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;
- }
+ const ByteVector picture = p_apic->picture();
+ const char *p_data = picture.data();
+ const unsigned i_data = picture.size();
- p_data_taglib = p_apic->picture();
- p_data = p_data_taglib.data();
- i_data = p_data_taglib.size();
+ msg_Dbg( p_demux_meta, "Found embedded art: %s (%s) is %u bytes",
+ psz_name, psz_mime, i_data );
- 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 );
+ if( !p_attachment )
+ {
+ free( psz_description );
+ continue;
+ }
+ TAB_APPEND_CAST( (input_attachment_t**),
+ p_demux_meta->i_attachments, p_demux_meta->attachments,
+ p_attachment );
+ free( psz_description );
- 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 );
+ unsigned i_pic_type = p_apic->type();
+ if( i_pic_type >= PI_COVER_SCORE_SIZE )
+ i_pic_type = 0; // Defaults to "Other"
- 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 );
- }
+ if( pi_cover_score[i_pic_type] > i_score )
+ {
+ i_score = pi_cover_score[i_pic_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 );
}
}
- 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;
+/**
+ * Read the meta information from XiphComments
+ * @param tag: the Xiph Comment
+ * @param p_demux_meta: the demuxer meta
+ * @param p_meta: the meta
+ */
+static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
+{
+ StringList list;
+ bool hasTrackTotal = false;
+#define SET( keyName, metaName ) \
+ list = tag->fieldListMap()[keyName]; \
+ if( !list.isEmpty() ) \
+ vlc_meta_Set##metaName( p_meta, (*list.begin()).toCString( true ) );
+
+#define SET_EXTRA( keyName, metaName ) \
+ list = tag->fieldListMap()[keyName]; \
+ if( !list.isEmpty() ) \
+ vlc_meta_AddExtra( p_meta, keyName, (*list.begin()).toCString( true ) );
+
+ SET( "COPYRIGHT", Copyright );
+ SET( "ORGANIZATION", Publisher );
+ SET( "DATE", Date );
+ SET( "ENCODER", EncodedBy );
+ SET( "RATING", Rating );
+ SET( "LANGUAGE", Language );
+ SET( "MUSICBRAINZ_TRACKID", TrackID );
+ SET( "ALBUMARTIST", AlbumArtist );
+ SET( "DISCNUMBER", DiscNumber );
+
+ SET_EXTRA( "MUSICBRAINZ_ALBUMID", VLC_META_EXTRA_MB_ALBUMID );
+#undef SET
+#undef SET_EXTRA
- input_attachment_t *p_attachment;
+ list = tag->fieldListMap()["TRACKNUMBER"];
+ if( !list.isEmpty() )
+ {
+ const char *psz_value;
+ unsigned short u_track;
+ unsigned short u_total;
+ psz_value = (*list.begin()).toCString( true );
+ if( sscanf( psz_value, "%hu/%hu", &u_track, &u_total ) == 2)
+ {
+ char str[6];
+ snprintf(str, 6, "%u", u_track);
+ vlc_meta_SetTrackNum( p_meta, str);
+ snprintf(str, 6, "%u", u_total);
+ vlc_meta_SetTrackTotal( p_meta, str);
+ hasTrackTotal = true;
+ }
+ else
+ vlc_meta_SetTrackNum( p_meta, psz_value);
+ }
+ if( !hasTrackTotal )
+ {
+ list = tag->fieldListMap()["TRACKTOTAL"];
+ if( list.isEmpty() )
+ list = tag->fieldListMap()["TOTALTRACKS"];
+ if( !list.isEmpty() )
+ vlc_meta_SetTrackTotal( p_meta, (*list.begin()).toCString( true ) );
+ }
- const char *psz_name, *psz_mime, *psz_description;
- uint8_t *p_data;
- int i_data;
+ // Try now to get embedded art
+ StringList mime_list = tag->fieldListMap()[ "COVERARTMIME" ];
+ StringList art_list = tag->fieldListMap()[ "COVERART" ];
+
+ input_attachment_t *p_attachment;
- psz_name = "cover";
- psz_mime = mime_list[0].toCString(true);
- psz_description = "cover";
+ if( mime_list.size() != 0 && art_list.size() != 0 )
+ {
+ // We get only the first covert art
+ if( mime_list.size() > 1 || art_list.size() > 1 )
+ msg_Warn( p_demux_meta, "Found %i embedded arts, so using only the first one",
+ art_list.size() );
- i_data = vlc_b64_decode_binary( &p_data, art_list[0].toCString(true) );
+ 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 );
+ msg_Dbg( p_demux_meta, "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 );
+ }
+ else
+ {
+ art_list = tag->fieldListMap()[ "METADATA_BLOCK_PICTURE" ];
+ if( art_list.size() == 0 )
+ return;
+
+ uint8_t *p_data;
+ int i_cover_score;
+ int i_cover_idx;
+ int i_data = vlc_b64_decode_binary( &p_data, art_list[0].toCString(true) );
+ i_cover_score = i_cover_idx = 0;
+ /* TODO: Use i_cover_score / i_cover_idx to select the picture. */
+ p_attachment = ParseFlacPicture( p_data, i_data, 0,
+ &i_cover_score, &i_cover_idx );
+ }
+ if (p_attachment) {
TAB_APPEND_CAST( (input_attachment_t**),
p_demux_meta->i_attachments, p_demux_meta->attachments,
p_attachment );
- vlc_meta_SetArtURL( p_meta, "attachment://cover" );
+ char *psz_url;
+ if( asprintf( &psz_url, "attachment://%s", p_attachment->psz_name ) != -1 ) {
+ vlc_meta_SetArtURL( p_meta, psz_url );
+ free( psz_url );
+ }
}
+}
-#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" );
+
+#if defined(TAGLIB_WITH_MP4)
+/**
+ * Read the meta information from mp4 specific tags
+ * @param tag: the mp4 tag
+ * @param p_demux_meta: the demuxer meta
+ * @param p_meta: the meta
+ */
+static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta_t* p_meta )
+{
+ MP4::Item list;
+#define SET( keyName, metaName ) \
+ if( tag->itemListMap().contains(keyName) ) \
+ { \
+ list = tag->itemListMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
}
-#endif
-#if 0
-/* TagLib doesn't support MP4 file yet */
- else if( MP4::File *mp4 =
- dynamic_cast<MP4::File *>( f.file() ) )
+#define SET_EXTRA( keyName, metaName ) \
+ if( tag->itemListMap().contains(keyName) ) \
+ { \
+ list = tag->itemListMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+ SET("----:com.apple.iTunes:MusicBrainz Track Id", TrackID );
+ SET_EXTRA("----:com.apple.iTunes:MusicBrainz Album Id", VLC_META_EXTRA_MB_ALBUMID );
+
+#undef SET
+#undef SET_EXTRA
+
+ if( tag->itemListMap().contains("covr") )
{
- MP4::Tag *mp4tag =
- dynamic_cast<MP4::Tag *>( mp4->tag() );
- if( mp4tag && mp4tag->cover().size() )
- vlc_meta_SetArtURL( p_meta, "MP4C" );
+ 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() );
+
+ 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
}
+#endif
+
-static int ReadMeta( vlc_object_t *p_this )
+/**
+ * Get the tags from the file using TagLib
+ * @param p_this: the demux object
+ * @return VLC_SUCCESS if the operation success
+ */
+static int ReadMeta( 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_meta_t *p_meta;
- TagLib::FileRef f;
+ vlc_mutex_locker locker (&taglib_lock);
+ demux_meta_t* p_demux_meta = (demux_meta_t *)p_this;
+ demux_t* p_demux = p_demux_meta->p_demux;
+ vlc_meta_t* p_meta;
+ FileRef f;
- TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
p_demux_meta->p_meta = NULL;
+ if( strcmp( p_demux->psz_access, "file" ) )
+ return VLC_EGENERIC;
-#if defined(WIN32) || defined (UNDER_CE)
- if(GetVersion() < 0x80000000)
- {
- wchar_t wpath[MAX_PATH + 1];
- if( !MultiByteToWideChar( CP_UTF8, 0, p_demux->psz_path, -1, wpath, MAX_PATH) )
- return VLC_EGENERIC;
+ char *psz_path = strdup( p_demux->psz_file );
+ if( !psz_path )
+ return VLC_ENOMEM;
- wpath[MAX_PATH] = L'0';
- f = FileRef( wpath );
+#if defined(_WIN32)
+ wchar_t *wpath = ToWide( psz_path );
+ if( wpath == NULL )
+ {
+ free( psz_path );
+ return VLC_EGENERIC;
}
- else return VLC_EGENERIC;
+ f = FileRef( wpath );
+ free( wpath );
#else
- const char *local_name = ToLocale( p_demux->psz_path );
-
- if( local_name == NULL )
- return VLC_EGENERIC;
-
- f = FileRef( local_name );
- LocaleFree( local_name );
+ f = FileRef( psz_path );
#endif
+ free( psz_path );
if( f.isNull() )
return VLC_EGENERIC;
-
- if ( !f.tag() || f.tag()->isEmpty() )
+ if( !f.tag() || f.tag()->isEmpty() )
return VLC_EGENERIC;
p_demux_meta->p_meta = p_meta = vlc_meta_New();
- Tag *p_tag = f.tag();
+ if( !p_meta )
+ return VLC_ENOMEM;
+
+
+ // Read the tags from the file
+ Tag* p_tag = f.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( tag, meta ) \
+ if( p_tag->tag() ) \
+ { \
+ char psz_tmp[10]; \
+ snprintf( psz_tmp, 10, "%d", p_tag->tag() ); \
+ vlc_meta_Set##meta( p_meta, psz_tmp ); \
+ }
- if( MPEG::File *p_mpeg =
- dynamic_cast<MPEG::File *>(f.file() ) )
- {
- if( p_mpeg->ID3v2Tag() )
- {
- ID3v2::Tag *p_tag = p_mpeg->ID3v2Tag();
- ID3v2::FrameList list = p_tag->frameListMap()["UFID"];
- ID3v2::UniqueFileIdentifierFrame* p_ufid;
- for( ID3v2::FrameList::Iterator iter = list.begin();
- iter != list.end(); iter++ )
- {
- p_ufid = dynamic_cast<ID3v2::UniqueFileIdentifierFrame*>(*iter);
- const char *owner = p_ufid->owner().toCString();
- if (!strcmp( owner, "http://musicbrainz.org" ))
- {
- /* ID3v2 UFID contains up to 64 bytes binary data
- * but in our case it will be a '\0'
- * terminated string */
- char *psz_ufid = (char*) malloc( 64 );
- int j = 0;
- if( psz_ufid )
- {
- while( ( j < 63 ) &&
- ( j < p_ufid->identifier().size() ) )
- psz_ufid[j] = p_ufid->identifier()[j++];
- psz_ufid[j] = '\0';
- vlc_meta_SetTrackID( p_meta, psz_ufid );
- free( psz_ufid );
- }
- }
- }
+ SET( title, Title );
+ SET( artist, Artist );
+ SET( album, Album );
+ SET( comment, Description );
+ SET( genre, Genre );
+ SETINT( year, Date );
+ SETINT( track, TrackNum );
- list = p_tag->frameListMap()["TXXX"];
- ID3v2::UserTextIdentificationFrame* p_txxx;
- for( ID3v2::FrameList::Iterator iter = list.begin();
- iter != list.end(); iter++ )
- {
- p_txxx = dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter);
- const char *psz_desc= p_txxx->description().toCString();
- vlc_meta_AddExtra( p_meta, psz_desc,
- p_txxx->fieldList().toString().toCString());
- }
-#if 0
- list = p_tag->frameListMap()["RVA2"];
- ID3v2::RelativeVolumeFrame* p_rva2;
- for( ID3v2::FrameList::Iterator iter = list.begin();
- iter != list.end(); iter++ )
- {
- p_rva2 = dynamic_cast<ID3v2::RelativeVolumeFrame*>(*iter);
- /* TODO: process rva2 frames */
- }
-#endif
- list = p_tag->frameList();
- ID3v2::Frame* p_t;
- char psz_tag[4];
- for( ID3v2::FrameList::Iterator iter = list.begin();
- iter != list.end(); iter++ )
- {
- p_t = dynamic_cast<ID3v2::Frame*> (*iter);
- memcpy( psz_tag, p_t->frameID().data(), 4);
-
-#define SET( foo, bar ) if( !strncmp( psz_tag, foo, 4 ) ) \
-vlc_meta_Set##bar( p_meta, p_t->toString().toCString(true))
- SET( "TPUB", Publisher );
- SET( "TCOP", Copyright );
- SET( "TENC", EncodedBy );
- SET( "TLAN", Language );
- //SET( "POPM", Rating ); /* rating needs special handling in id3v2 */
- //if( !strncmp( psz_tag, "RVA2", 4 ) )
- /* TODO */
+#undef SETINT
#undef SET
- }
- }
+
+ TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
+
+ // Try now to read special tags
+#ifdef TAGLIB_HAVE_APEFILE_H
+ if( APE::File* ape = dynamic_cast<APE::File*>(f.file()) )
+ {
+ if( ape->APETag() )
+ ReadMetaFromAPE( ape->APETag(), p_demux_meta, p_meta );
+ }
+ else
+#endif
+#ifdef TAGLIB_WITH_ASF
+ if( ASF::File* asf = dynamic_cast<ASF::File*>(f.file()) )
+ {
+ if( asf->tag() )
+ ReadMetaFromASF( asf->tag(), p_demux_meta, p_meta );
+ }
+ else
+#endif
+ if( FLAC::File* flac = dynamic_cast<FLAC::File*>(f.file()) )
+ {
+ if( flac->ID3v2Tag() )
+ ReadMetaFromId3v2( flac->ID3v2Tag(), p_demux_meta, p_meta );
+ else if( flac->xiphComment() )
+ ReadMetaFromXiph( flac->xiphComment(), p_demux_meta, p_meta );
+ }
+#if defined(TAGLIB_WITH_MP4)
+ else if( MP4::File *mp4 = dynamic_cast<MP4::File*>(f.file()) )
+ {
+ if( mp4->tag() )
+ ReadMetaFromMP4( mp4->tag(), p_demux_meta, p_meta );
+ }
+#endif
+ else if( MPC::File* mpc = dynamic_cast<MPC::File*>(f.file()) )
+ {
+ if( mpc->APETag() )
+ ReadMetaFromAPE( mpc->APETag(), p_demux_meta, p_meta );
+ }
+ else if( MPEG::File* mpeg = dynamic_cast<MPEG::File*>(f.file()) )
+ {
+ if( mpeg->APETag() )
+ ReadMetaFromAPE( mpeg->APETag(), p_demux_meta, p_meta );
+ if( mpeg->ID3v2Tag() )
+ ReadMetaFromId3v2( mpeg->ID3v2Tag(), p_demux_meta, p_meta );
+ }
+ else if( dynamic_cast<Ogg::File*>(f.file()) )
+ {
+ if( Ogg::FLAC::File* ogg_flac = dynamic_cast<Ogg::FLAC::File*>(f.file()))
+ ReadMetaFromXiph( ogg_flac->tag(), p_demux_meta, p_meta );
+ else if( Ogg::Speex::File* ogg_speex = dynamic_cast<Ogg::Speex::File*>(f.file()) )
+ ReadMetaFromXiph( ogg_speex->tag(), p_demux_meta, p_meta );
+ else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
+ ReadMetaFromXiph( ogg_vorbis->tag(), p_demux_meta, p_meta );
+#if defined(TAGLIB_OPUSFILE_H)
+ else if( Ogg::Opus::File* ogg_opus = dynamic_cast<Ogg::Opus::File*>(f.file()) )
+ ReadMetaFromXiph( ogg_opus->tag(), p_demux_meta, p_meta );
+#endif
+ }
+ else if( dynamic_cast<RIFF::File*>(f.file()) )
+ {
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ ReadMetaFromId3v2( riff_aiff->tag(), p_demux_meta, p_meta );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+ ReadMetaFromId3v2( riff_wav->tag(), p_demux_meta, p_meta );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
+ if( trueaudio->ID3v2Tag() )
+ ReadMetaFromId3v2( trueaudio->ID3v2Tag(), p_demux_meta, p_meta );
+ }
+ else if( WavPack::File* wavpack = dynamic_cast<WavPack::File*>(f.file()) )
+ {
+ if( wavpack->APETag() )
+ ReadMetaFromAPE( wavpack->APETag(), p_demux_meta, p_meta );
+ }
+
+ return VLC_SUCCESS;
+}
+
+
+/**
+ * Write meta information 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" );
+ WRITE( TrackID, "MUSICBRAINZ_TRACKID" );
+#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
+ /* Known TXXX frames */
+ ID3v2::FrameList list = tag->frameListMap()["TXXX"];
+
+#define WRITETXXX( metaName, txxName )\
+ psz_meta = input_item_Get##metaName( p_item ); \
+ if ( psz_meta ) \
+ { \
+ ID3v2::UserTextIdentificationFrame *p_txxx; \
+ for( ID3v2::FrameList::Iterator iter = list.begin(); iter != list.end(); iter++ )\
+ { \
+ p_txxx = dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter); \
+ if( !p_txxx ) \
+ continue; \
+ if( !strcmp( p_txxx->description().toCString( true ), txxName ) ) \
+ { \
+ p_txxx->setText( psz_meta ); \
+ FREENULL( psz_meta ); \
+ break; \
+ } \
+ } \
+ if( psz_meta ) /* not found in existing custom fields */ \
+ { \
+ ByteVector p_byte( "TXXX", 4 ); \
+ p_txxx = new ID3v2::UserTextIdentificationFrame( p_byte ); \
+ p_txxx->setDescription( txxName ); \
+ p_txxx->setText( psz_meta ); \
+ free( psz_meta ); \
+ tag->addFrame( p_txxx ); \
+ } \
}
- else if( Ogg::Vorbis::File *p_ogg_v =
- dynamic_cast<Ogg::Vorbis::File *>(f.file() ) )
+ WRITETXXX( TrackTotal, "TRACKTOTAL" );
+
+#undef WRITETXXX
+
+ /* Write album art */
+ char *psz_url = input_item_GetArtworkURL( p_item );
+ if( psz_url == NULL )
+ return;
+
+ char *psz_path = make_path( psz_url );
+ free( psz_url );
+ if( psz_path == NULL )
+ return;
+
+ const char *psz_mime = vlc_mime_Ext2Mime( psz_path );
+
+ FILE *p_file = vlc_fopen( psz_path, "rb" );
+ if( p_file == NULL )
{
- int i_ogg_v_length = p_ogg_v->audioProperties()->length();
+ free( psz_path );
+ return;
+ }
- input_thread_t *p_input = (input_thread_t *)
- vlc_object_find( p_demux,VLC_OBJECT_INPUT, FIND_PARENT );
- if( p_input )
- {
- input_item_t *p_item = input_GetItem( p_input );
- if( p_item )
- input_item_SetDuration( p_item,
- (mtime_t) i_ogg_v_length * 1000000 );
- vlc_object_release( p_input );
- }
+ struct stat st;
+ if( vlc_stat( psz_path, &st ) == -1 )
+ {
+ free( psz_path );
+ fclose( p_file );
+ return;
+ }
+ off_t file_size = st.st_size;
+ free( psz_path );
+
+ /* Limit picture size to 10MiB */
+ if( file_size > 10485760 )
+ {
+ fclose( p_file );
+ return;
}
-#if 0 /* at this moment, taglib is unable to detect ogg/flac files
-* becauses type detection is based on file extension:
-* ogg = ogg/vorbis
-* flac = flac
-* ø = ogg/flac
-*/
- else if( Ogg::FLAC::File *p_ogg_f =
- dynamic_cast<Ogg::FLAC::File *>(f.file() ) )
+
+ char *p_buffer = new (std::nothrow) char[file_size];
+ if( p_buffer == NULL )
{
- long i_ogg_f_length = p_ogg_f->streamLength();
- input_thread_t *p_input = (input_thread_t *)
- vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
- if( p_input )
- {
- input_item_t *p_item = input_GetItem( p_input );
- if( p_item )
- input_item_SetDuration( p_item,
- (mtime_t) i_ogg_f_length * 1000000 );
- vlc_object_release( p_input );
- }
+ fclose( p_file );
+ return;
}
-#endif
- else if( FLAC::File *p_flac =
- dynamic_cast<FLAC::File *>(f.file() ) )
+
+ if( fread( p_buffer, 1, file_size, p_file ) != (unsigned)file_size )
{
- long i_flac_length = p_flac->audioProperties()->length();
- input_thread_t *p_input = (input_thread_t *)
- vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
- if( p_input )
- {
- input_item_t *p_item = input_GetItem( p_input );
- if( p_item )
- input_item_SetDuration( p_item,
- (mtime_t) i_flac_length * 1000000 );
- vlc_object_release( p_input );
- }
+ fclose( p_file );
+ delete[] p_buffer;
+ return;
}
+ fclose( p_file );
+
+ ByteVector data( p_buffer, file_size );
+ delete[] p_buffer;
-#define SET( foo, bar ) if( !p_tag->bar ().isNull() && !p_tag->bar ().isEmpty() ) \
- vlc_meta_Set##foo( p_meta, p_tag->bar ().toCString(true))
-#define SETINT( foo, bar ) { \
- char psz_tmp[10]; \
- snprintf( (char*)psz_tmp, 10, "%d", p_tag->bar() ); \
- vlc_meta_Set##foo( p_meta, (char*)psz_tmp ); \
+ ID3v2::FrameList frames = tag->frameList( "APIC" );
+ ID3v2::AttachedPictureFrame *frame = NULL;
+ if( frames.isEmpty() )
+ {
+ frame = new TagLib::ID3v2::AttachedPictureFrame;
+ tag->addFrame( frame );
+ }
+ else
+ {
+ frame = static_cast<ID3v2::AttachedPictureFrame *>( frames.back() );
}
- SET( Title, title );
- SET( Artist, artist );
- SET( Album, album );
- SET( Description, comment );
- SET( Genre, genre );
- SETINT( Date, year );
- SETINT( Tracknum , track );
-#undef SET
-#undef SETINT
+ frame->setPicture( data );
+ frame->setMimeType( psz_mime );
+}
- DetectImage( f, p_demux );
- return VLC_SUCCESS;
+/**
+ * Write the meta information 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( TrackNum, "TRACKNUMBER" );
+ WRITE( TrackTotal, "TRACKTOTAL" );
+ WRITE( Copyright, "COPYRIGHT" );
+ WRITE( Publisher, "ORGANIZATION" );
+ WRITE( Date, "DATE" );
+ WRITE( EncodedBy, "ENCODER" );
+ WRITE( Rating, "RATING" );
+ WRITE( Language, "LANGUAGE" );
+ WRITE( TrackID, "MUSICBRAINZ_TRACKID" );
+#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;
- meta_export_t *p_export = (meta_export_t *)p_playlist->p_private;
+ vlc_mutex_locker locker (&taglib_lock);
+ meta_export_t *p_export = (meta_export_t *)p_this;
input_item_t *p_item = p_export->p_item;
+ FileRef f;
- if( p_item == NULL )
+ if( !p_item )
{
msg_Err( p_this, "Can't save meta data of an empty input" );
return VLC_EGENERIC;
}
- FileRef f( p_export->psz_file );
+#if defined(_WIN32)
+ wchar_t *wpath = ToWide( p_export->psz_file );
+ if( wpath == NULL )
+ return VLC_EGENERIC;
+ f = FileRef( wpath );
+ free( wpath );
+#else
+ f = FileRef( p_export->psz_file );
+#endif
+
if( f.isNull() || !f.tag() || f.file()->readOnly() )
{
- msg_Err( p_this, "File %s can't be opened for tag writing\n",
- p_export->psz_file );
+ msg_Err( p_this, "File %s can't be opened for tag writing",
+ p_export->psz_file );
return VLC_EGENERIC;
}
char *psz_meta;
-#define SET(a,b) \
- if(b) { \
- String *psz_##a = new String( b, \
- String::UTF8 ); \
- p_tag->set##a( *psz_##a ); \
- delete psz_##a; \
- }
-
-
- psz_meta = input_item_GetArtist( p_item );
- SET( Artist, psz_meta );
- free( psz_meta );
-
- psz_meta = input_item_GetTitle( p_item );
- if( !psz_meta ) psz_meta = input_item_GetName( p_item );
- String *psz_title = new String( psz_meta,
- String::UTF8 );
- p_tag->setTitle( *psz_title );
- delete psz_title;
- free( psz_meta );
-
- psz_meta = input_item_GetAlbum( p_item );
- SET( Album, psz_meta );
+#define SET( a, b ) \
+ psz_meta = input_item_Get ## a( p_item ); \
+ if( psz_meta ) \
+ { \
+ String tmp( psz_meta, String::UTF8 ); \
+ p_tag->set##b( tmp ); \
+ } \
free( psz_meta );
- psz_meta = input_item_GetGenre( p_item );
- SET( Genre, psz_meta );
- free( psz_meta );
+ // Saving all common fields
+ // If the title is empty, use the name
+ SET( TitleFbName, Title );
+ SET( Artist, Artist );
+ SET( Album, Album );
+ SET( Description, Comment );
+ SET( Genre, Genre );
#undef SET
psz_meta = input_item_GetDate( p_item );
- if( psz_meta ) p_tag->setYear( atoi( psz_meta ) );
+ if( !EMPTY_STR(psz_meta) ) p_tag->setYear( atoi( psz_meta ) );
+ else p_tag->setYear( 0 );
free( psz_meta );
psz_meta = input_item_GetTrackNum( p_item );
- if( psz_meta ) p_tag->setTrack( atoi( psz_meta ) );
+ if( !EMPTY_STR(psz_meta) ) p_tag->setTrack( atoi( psz_meta ) );
+ else p_tag->setTrack( 0 );
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
+#ifdef TAGLIB_HAVE_APEFILE_H
+ if( APE::File* ape = dynamic_cast<APE::File*>(f.file()) )
+ {
+ if( ape->APETag() )
+ WriteMetaToAPE( ape->APETag(), p_item );
+ }
+ else
+#endif
+ 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( 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 );
+#if defined(TAGLIB_OPUSFILE_H)
+ else if( Ogg::Opus::File* ogg_opus = dynamic_cast<Ogg::Opus::File*>(f.file()) )
+ WriteMetaToXiph( ogg_opus->tag(), p_item );
+#endif
+ }
+ else if( dynamic_cast<RIFF::File*>(f.file()) )
+ {
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+ WriteMetaToId3v2( riff_wav->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
- * Fetch the thing from the file, save it to the cache folder
- */
- return VLC_EGENERIC;
+ return VLC_SUCCESS;
}
-