Index: server/lib/MP4/Info.pm =================================================================== --- server/lib/MP4/Info.pm (revision 25502) +++ server/lib/MP4/Info.pm (working copy) @@ -788,11 +788,6 @@ return 0 if defined ($tags->{GNRE}); $id='GNRE'; } - elsif ($id eq 'AART') - { - return 0 if defined ($tags->{ART}); - $id = 'ART'; - } elsif ($id eq 'DAY') { $data = substr ($data, 0, 4); Index: server/Slim/Formats/APE.pm =================================================================== --- server/Slim/Formats/APE.pm (revision 25502) +++ server/Slim/Formats/APE.pm (working copy) @@ -39,9 +39,10 @@ use MP3::Info (); my %tagMapping = ( - 'TRACK' => 'TRACKNUM', - 'DATE' => 'YEAR', - 'DISCNUMBER' => 'DISC', + 'TRACK' => 'TRACKNUM', + 'DATE' => 'YEAR', + 'DISCNUMBER' => 'DISC', + 'ALBUM ARTIST' => 'ALBUMARTIST', # bug 10724 - support APEv2 Album Artist ); # Given a file, return a hash of name value pairs, Index: server/Slim/Formats/Movie.pm =================================================================== --- server/Slim/Formats/Movie.pm (revision 25502) +++ server/Slim/Formats/Movie.pm (working copy) @@ -16,6 +16,7 @@ use Slim::Utils::SoundCheck; my %tagMapping = ( + 'AART' => 'ALBUMARTIST', # bug 10724 - support aART as Album Artist 'WRT' => 'COMPOSER', 'CPIL' => 'COMPILATION', 'COVR' => 'PIC', @@ -86,7 +87,9 @@ elsif ($meta->{'NAME'} eq 'MusicBrainz Album Artist') { - $tags->{'ALBUMARTIST'} = $meta->{'DATA'}; + # bug 10724 - support now obsolete MusicBrainz Album Artist + # usage of aART overrules this (MB Picard, iTunes, Tag&Rename use aART) + $tags->{'ALBUMARTIST'} = $meta->{'DATA'} if not defined $tags->{'ALBUMARTIST'}; } elsif ($meta->{'NAME'} eq 'MusicBrainz Sortname') {