From cee4c63cbc961f83b7266705e28ba966a0e7254a Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Fri, 2 Jan 2009 11:46:09 +0100 Subject: [PATCH] taglib: cleaning. --- modules/meta_engine/taglib.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp index 0ed3f22576..a5268c8795 100644 --- a/modules/meta_engine/taglib.cpp +++ b/modules/meta_engine/taglib.cpp @@ -342,12 +342,12 @@ static int ReadMetaFromId2v2( ID3v2::Tag* tag, vlc_meta_t* p_meta ) */ static int ReadMetaFromXiph( Ogg::XiphComment* tag, vlc_meta_t* p_meta ) { -#define SET( metaName, keyName ) \ +#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" ); + SET( "COPYRIGHT", Copyright ); #undef SET return VLC_SUCCESS; } @@ -386,10 +386,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]; \ @@ -397,13 +397,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 -- 2.39.2