X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmeta_engine%2Ftaglib.cpp;h=1a90d580d39777aa0de16c6408775e549046e25a;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=0b2b81b2f4a2b22e75f56e14d32d9c1c0e1b5b61;hpb=295830f1a60d7f5c1ed18e768250ae8d5ee81504;p=vlc diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp index 0b2b81b2f4..1a90d580d3 100644 --- a/modules/meta_engine/taglib.cpp +++ b/modules/meta_engine/taglib.cpp @@ -5,6 +5,7 @@ * $Id$ * * Authors: Clément Stenac + * Rafaël Carré * * 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 @@ -20,7 +21,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include #include #include @@ -29,12 +29,23 @@ #include #include +#include #include +#include +#include #include #include +#if 0 +#include +#endif +#include +#include +#include +#include #include -#if 0 //for artist and album id #include +#if 0 /* parse the tags without taglib helpers? */ +#include #endif static int ReadMeta ( vlc_object_t * ); @@ -52,9 +63,9 @@ vlc_module_begin(); set_callbacks( WriteMeta, NULL ); vlc_module_end(); -static bool checkID3Image( const TagLib::ID3v2::Tag *tag ) +static bool checkID3Image( const TagLib::ID3v2::Tag *p_tag ) { - TagLib::ID3v2::FrameList l = tag->frameListMap()[ "APIC" ]; + TagLib::ID3v2::FrameList l = p_tag->frameListMap()[ "APIC" ]; return !l.isEmpty(); } @@ -90,80 +101,168 @@ static int ReadMeta( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t *)p_this; - if( !strncmp( p_demux->psz_access, "file", 4 ) ) + if( strncmp( p_demux->psz_access, "file", 4 ) ) + return VLC_EGENERIC; + + TagLib::FileRef f( p_demux->psz_path ); + if( f.isNull() ) + return VLC_EGENERIC; + + if ( !f.tag() || f.tag()->isEmpty() ) + return VLC_EGENERIC; + + if( !p_demux->p_private ) + p_demux->p_private = (void*)vlc_meta_New(); + vlc_meta_t *p_meta = (vlc_meta_t *)(p_demux->p_private ); + TagLib::Tag *p_tag = f.tag(); + + if( TagLib::MPEG::File *p_mpeg = + dynamic_cast(f.file() ) ) { - if( !p_demux->p_private ) - p_demux->p_private = (void*)vlc_meta_New(); - TagLib::FileRef f( p_demux->psz_path ); - if( !f.isNull() && f.tag() && !f.tag()->isEmpty() ) + if( p_mpeg->ID3v2Tag() ) { - TagLib::Tag *tag = f.tag(); - vlc_meta_t *p_meta = (vlc_meta_t *)(p_demux->p_private ); - -#define SET( foo, bar ) vlc_meta_Set##foo( p_meta, tag->bar ().toCString(true)) - SET( Title, title ); - SET( Artist, artist ); - SET( Album, album ); -// SET( Comment, comment ); - SET( Genre, genre ); -// SET( Year, year ); Gra, this is an int, need to convert -// SET( Tracknum , track ); Same -#undef SET - - if( TagLib::MPEG::File *p_mpeg = - dynamic_cast(f.file() ) ) + TagLib::ID3v2::Tag *p_tag = p_mpeg->ID3v2Tag(); + TagLib::ID3v2::FrameList list = p_tag->frameListMap()["UFID"]; + TagLib::ID3v2::UniqueFileIdentifierFrame* p_ufid; + for( TagLib::ID3v2::FrameList::Iterator iter = list.begin(); + iter != list.end(); iter++ ) { - if( p_mpeg->ID3v2Tag() ) + p_ufid = dynamic_cast(*iter); + const char *owner = p_ufid->owner().toCString(); + if (!strcmp( owner, "http://musicbrainz.org" )) { - TagLib::ID3v2::Tag *tag = p_mpeg->ID3v2Tag(); - TagLib::ID3v2::FrameList list = tag->frameListMap()["UFID"]; - TagLib::ID3v2::UniqueFileIdentifierFrame* p_ufid; - for( TagLib::ID3v2::FrameList::Iterator iter = list.begin(); - iter != list.end(); iter++ ) - { - p_ufid = dynamic_cast(*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; - 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 ); - } - } - /* musicbrainz artist and album id: not useful yet */ + /* 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; + 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 ); + } + } + + list = p_tag->frameListMap()["TXXX"]; + TagLib::ID3v2::UserTextIdentificationFrame* p_txxx; + for( TagLib::ID3v2::FrameList::Iterator iter = list.begin(); + iter != list.end(); iter++ ) + { + p_txxx = dynamic_cast(*iter); + const char *psz_desc= p_txxx->description().toCString(); + vlc_meta_AddExtra( p_meta, psz_desc, + p_txxx->fieldList().toString().toCString()); + } #if 0 - list = tag->frameListMap()["TXXX"]; - TagLib::ID3v2::UserTextIdentificationFrame* p_txxx; - for( TagLib::ID3v2::FrameList::Iterator iter = list.begin(); - iter != list.end(); iter++ ) - { - p_txxx = dynamic_cast(*iter); - const char *psz_desc= p_txxx->description().toCString(); - if( !strncmp( psz_desc, "MusicBrainz Artist Id", 21 ) ) - vlc_meta_SetArtistID( p_meta, - p_txxx->fieldList().toString().toCString()); - if( !strncmp( psz_desc, "MusicBrainz Album Id", 20 ) ) - vlc_meta_SetAlbumID( p_meta, - p_txxx->fieldList().toString().toCString()); - } + list = p_tag->frameListMap()["RVA2"]; + TagLib::ID3v2::RelativeVolumeFrame* p_rva2; + for( TagLib::ID3v2::FrameList::Iterator iter = list.begin(); + iter != list.end(); iter++ ) + { + p_rva2 = dynamic_cast(*iter); + /* TODO: process rva2 frames */ + } #endif - } + list = p_tag->frameList(); + TagLib::ID3v2::Frame* p_t; + char psz_tag[4]; + for( TagLib::ID3v2::FrameList::Iterator iter = list.begin(); + iter != list.end(); iter++ ) + { + p_t = dynamic_cast (*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 SET } + } + } - DetectImage( f, p_meta ); + else if( TagLib::Ogg::Vorbis::File *p_ogg_v = + dynamic_cast(f.file() ) ) + { + int i_ogg_v_length = p_ogg_v->audioProperties()->length(); - return VLC_SUCCESS; + 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 ); } + } - return VLC_EGENERIC; +#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( TagLib::Ogg::FLAC::File *p_ogg_f = + dynamic_cast(f.file() ) ) + { + 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 ); + } + } +#endif + else if( TagLib::FLAC::File *p_flac = + dynamic_cast(f.file() ) ) + { + 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 ); + } + } + +#define SET( foo, bar ) 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 ); \ + } + + 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 + + DetectImage( f, p_meta ); + + return VLC_SUCCESS; } static int WriteMeta( vlc_object_t *p_this ) @@ -171,26 +270,90 @@ 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; input_item_t *p_item = p_export->p_item; + + if( p_item == NULL ) + { + msg_Err( p_this, "Can't save meta data of an empty input" ); + return VLC_EGENERIC; + } TagLib::FileRef f( p_export->psz_file ); - if( !f.isNull() && f.tag() ) + if( f.isNull() || !f.tag() || f.file()->readOnly() ) { - TagLib::Tag *tag = f.tag(); - tag->setArtist( p_item->p_meta->psz_artist ); - if( p_item->p_meta->psz_title ) - tag->setTitle( p_item->p_meta->psz_title ); - else - tag->setTitle( p_item->psz_name ); - tag->setAlbum( p_item->p_meta->psz_album ); - tag->setGenre( p_item->p_meta->psz_genre ); - if( p_item->p_meta->psz_date ) - tag->setYear( atoi( p_item->p_meta->psz_date ) ); - if( p_item->p_meta->psz_tracknum ) - tag->setTrack( atoi( p_item->p_meta->psz_tracknum ) ); - f.save(); - return VLC_SUCCESS; + msg_Err( p_this, "File %s can't be opened for tag writing\n", + p_export->psz_file ); + return VLC_EGENERIC; } - return VLC_EGENERIC; + + msg_Dbg( p_this, "Writing metadata for %s", p_export->psz_file ); + + TagLib::Tag *p_tag = f.tag(); + + char *psz_meta; + +#define SET(a,b) \ + if(b) { \ + TagLib::String *psz_##a = new TagLib::String( b, \ + TagLib::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 ); + TagLib::String *psz_title = new TagLib::String( psz_meta, + TagLib::String::UTF8 ); + p_tag->setTitle( *psz_title ); + delete psz_title; + free( psz_meta ); + + psz_meta = input_item_GetAlbum( p_item ); + SET( Album, psz_meta ); + free( psz_meta ); + + psz_meta = input_item_GetGenre( p_item ); + SET( Genre, psz_meta ); + free( psz_meta ); + +#undef SET + + psz_meta = input_item_GetDate( p_item ); + if( psz_meta ) p_tag->setYear( atoi( psz_meta ) ); + free( psz_meta ); + + psz_meta = input_item_GetTrackNum( p_item ); + if( psz_meta ) p_tag->setTrack( atoi( psz_meta ) ); + free( psz_meta ); + + if( TagLib::ID3v2::Tag *p_id3tag = + dynamic_cast(p_tag) ) + { +#define WRITE( foo, bar ) \ + psz_meta = input_item_Get##foo( p_item ); \ + if( psz_meta ) \ + { \ + TagLib::ByteVector p_byte( bar, 4 ); \ + TagLib::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 + } + + f.save(); + return VLC_SUCCESS; } static int DownloadArt( vlc_object_t *p_this ) @@ -200,3 +363,4 @@ static int DownloadArt( vlc_object_t *p_this ) */ return VLC_EGENERIC; } +