diff --git a/taglib/matroska/matroskatag.cpp b/taglib/matroska/matroskatag.cpp index 34a2b2d7..d2b5b6be 100644 --- a/taglib/matroska/matroskatag.cpp +++ b/taglib/matroska/matroskatag.cpp @@ -331,7 +331,6 @@ namespace std::tuple("ALBUMSORT", "TITLESORT", Matroska::SimpleTag::TargetTypeValue::Album, true), std::tuple("ARTISTSORT", "ARTISTSORT", Matroska::SimpleTag::TargetTypeValue::Track, false), std::tuple("ALBUMARTISTSORT", "ARTISTSORT", Matroska::SimpleTag::TargetTypeValue::Album, true), - std::tuple("ENCODEDBY", "ENCODED_BY", Matroska::SimpleTag::TargetTypeValue::Track, false), std::tuple("MEDIA", "ORIGINAL_MEDIA_TYPE", Matroska::SimpleTag::TargetTypeValue::Track, false), std::tuple("LABEL", "LABEL_CODE", Matroska::SimpleTag::TargetTypeValue::Track, false), std::tuple("CATALOGNUMBER", "CATALOG_NUMBER", Matroska::SimpleTag::TargetTypeValue::Track, false), diff --git a/taglib/toolkit/propertymapping.dox b/taglib/toolkit/propertymapping.dox index 67450af8..b3fcc68e 100644 --- a/taglib/toolkit/propertymapping.dox +++ b/taglib/toolkit/propertymapping.dox @@ -6,107 +6,111 @@ - Vorbis Comments are not included in the table because they use the names from the *Key* column. - %APE tags will also use these keys unless another name can be found in its column. +- %Matroska tags will also use these keys unless another name can be found in its column, + additionally, the target level is listed, e.g. /50 for Album, /30 for Track (default). -| Key | %ID3v2 | %RIFF | %MP4 | %APE | %ASF | -| -------------------------- | ------ | ----- | -------------------------------------------------------- | ----------------------- | --------------------------------- | -| ACOUSTID_FINGERPRINT | | | | | Acoustid/Fingerprint | -| ACOUSTID_ID | | | | | Acoustid/Id | -| ALBUM | TALB | IPRD | ©alb | | WM/AlbumTitle | -| ALBUMARTIST | TPE2 | | aART | ALBUM ARTIST | WM/AlbumArtist | -| ALBUMARTISTSORT | TSO2 | | soaa | | WM/AlbumArtistSortOrder | -| ALBUMSORT | TSOA | | soal | | WM/AlbumSortOrder | -| ARRANGER | | IENG | | | | -| ARTIST | TPE1 | IART | ©ART | | | -| ARTISTS | | | \----:com.apple.iTunes:ARTISTS | | WM/ARTISTS | -| ARTISTSORT | TSOP | | soar | | WM/ArtistSortOrder | -| ARTISTWEBPAGE | WOAR | IBSU | | | WM/AuthorURL | -| ASIN | | | \----:com.apple.iTunes:ASIN | | | -| AUDIOSOURCEWEBPAGE | WOAS | | | | ASIN | -| BARCODE | | | \----:com.apple.iTunes:BARCODE | | WM/Barcode | -| BPM | TBPM | IBPM | tmpo | | WM/BeatsPerMinute | -| CATALOGNUMBER | | | \----:com.apple.iTunes:CATALOGNUMBER | | WM/CatalogNo | -| COMMENT | COMM | ICMT | ©cmt | | | -| COMPILATION | TCMP | | cpil | | | -| COMPOSER | TCOM | IMUS | ©wrt | | WM/Composer | -| COMPOSERSORT | TSOC | | soco | | | -| CONDUCTOR | TPE3 | | \----:com.apple.iTunes:CONDUCTOR | | WM/Conductor | -| COPYRIGHT | TCOP | ICOP | cprt | | | -| COPYRIGHTURL | WCOP | | | | | -| DATE | TDRC | ICRD | ©day | YEAR | WM/Year | -| DISCNUMBER | TPOS | | disk | DISC | WM/PartOfSet | -| DISCSUBTITLE | TSST | PRT1 | \----:com.apple.iTunes:DISCSUBTITLE | | WM/SetSubTitle | -| DJMIXER | | | \----:com.apple.iTunes:DJMIXER | | | -| ENCODEDBY | TENC | ITCH | ©enc | | WM/EncodedBy | -| ENCODING | TSSE | ISFT | ©too | | WM/EncodingSettings | -| ENCODINGTIME | TDEN | IDIT | | | WM/EncodingTime | -| ENGINEER | | | \----:com.apple.iTunes:ENGINEER | | | -| FILETYPE | TFLT | | | | | -| FILEWEBPAGE | WOAF | | | | WM/AudioFileURL | -| GAPLESSPLAYBACK | | | pgap | | | -| GENRE | TCON | IGNR | ©gen | | WM/Genre | -| GROUPING | GRP1 | | ©grp | | | -| INITIALKEY | TKEY | | | | WM/InitialKey | -| INVOLVEDPEOPLE | TIPL | | | | | -| ISRC | TSRC | ISRC | \----:com.apple.iTunes:ISRC | | WM/ISRC | -| LABEL | TPUB | IPUB | \----:com.apple.iTunes:LABEL | | WM/Publisher | -| LANGUAGE | TLAN | ILNG | \----:com.apple.iTunes:LANGUAGE | | WM/Language | -| LENGTH | TLEN | | | | | -| LICENSE | | | \----:com.apple.iTunes:LICENSE | | | -| LYRICIST | TEXT | IWRI | \----:com.apple.iTunes:LYRICIST | | WM/Writer | -| LYRICS | USLT | | ©lyr | | WM/Lyrics | -| MEDIA | TMED | IMED | \----:com.apple.iTunes:MEDIA | | WM/Media | -| MIXER | | | \----:com.apple.iTunes:MIXER | | | -| MOOD | TMOO | | \----:com.apple.iTunes:MOOD | | WM/Mood | -| MOVEMENTCOUNT | | | ©mvc | | | -| MOVEMENTNAME | MVNM | | ©mvn | | | -| MOVEMENTNUMBER | MVIN | | ©mvi | | | -| MUSICBRAINZ_ALBUMID | | | \----:com.apple.iTunes:MusicBrainz Album Id | | MusicBrainz/Album Id | -| MUSICBRAINZ_ALBUMARTISTID | | | \----:com.apple.iTunes:MusicBrainz Album Artist Id | | MusicBrainz/Album Artist Id | -| MUSICBRAINZ_ARTISTID | | | \----:com.apple.iTunes:MusicBrainz Artist Id | | MusicBrainz/Artist Id | -| MUSICBRAINZ_RELEASEGROUPID | | | \----:com.apple.iTunes:MusicBrainz Release Group Id | | MusicBrainz/Release Group Id | -| MUSICBRAINZ_RELEASETRACKID | | | \----:com.apple.iTunes:MusicBrainz Release Track Id | | MusicBrainz/Release Track Id | -| MUSICBRAINZ_TRACKID | | | \----:com.apple.iTunes:MusicBrainz Track Id | | MusicBrainz/Track Id | -| MUSICBRAINZ_WORKID | | | \----:com.apple.iTunes:MusicBrainz Work Id | | MusicBrainz/Work Id | -| MUSICIANCREDITS | TMCL | | | | | -| MUSICIP_PUID | | | | | MusicIP/PUID | -| ORIGINALALBUM | TOAL | | | | WM/OriginalAlbumTitle | -| ORIGINALARTIST | TOPE | | | | WM/OriginalArtist | -| ORIGINALDATE | TDOR | | \----:com.apple.iTunes:ORIGINALDATE | | WM/OriginalReleaseYear | -| ORIGINALFILENAME | TOFN | | | | WM/OriginalFilename | -| ORIGINALLYRICIST | TOLY | | | | WM/OriginalLyricist | -| OWNER | TOWN | | ownr | | | -| PAYMENTWEBPAGE | WPAY | | | | | -| PERFORMER | | ISTR | | | | -| PLAYLISTDELAY | TDLY | | | | | -| PODCAST | PCST | | pcst | | | -| PODCASTCATEGORY | TCAT | | catg | | | -| PODCASTDESC | TDES | | desc | | | -| PODCASTID | TGID | | egid | | | -| PODCASTURL | WFED | | purl | | | -| PRODUCEDNOTICE | TPRO | | | | | -| PRODUCER | | | \----:com.apple.iTunes:PRODUCER | | WM/Producer | -| PUBLISHERWEBPAGE | WPUB | | | | | -| RADIOSTATION | TRSN | | | | | -| RADIOSTATIONOWNER | TRSO | | | | | -| RADIOSTATIONWEBPAGE | WORS | | | | | -| RELEASECOUNTRY | | ICNT | \----:com.apple.iTunes:MusicBrainz Album Release Country | | MusicBrainz/Album Release Country | -| RELEASEDATE | TDRL | | \----:com.apple.iTunes:RELEASEDATE | | | -| RELEASESTATUS | | | \----:com.apple.iTunes:MusicBrainz Album Status | MUSICBRAINZ_ALBUMSTATUS | MusicBrainz/Album Status | -| RELEASETYPE | | | \----:com.apple.iTunes:MusicBrainz Album Type | MUSICBRAINZ_ALBUMTYPE | MusicBrainz/Album Type | -| REMIXER | TPE4 | IEDT | \----:com.apple.iTunes:REMIXER | MIXARTIST | WM/ModifiedBy | -| SCRIPT | | | \----:com.apple.iTunes:SCRIPT | | WM/Script | -| SHOWSORT | | | sosn | | | -| SHOWWORKMOVEMENT | | | shwm | | | -| SUBTITLE | TIT3 | | \----:com.apple.iTunes:SUBTITLE | | WM/SubTitle | -| TAGGINGDATE | TDTG | | | | | -| TITLE | TIT2 | INAM | ©nam | | | -| TITLESORT | TSOT | | sonm | | WM/TitleSortOrder | -| TRACKNUMBER | TRCK | IPRT | trkn | TRACK | WM/TrackNumber | -| TVEPISODE | | | tves | | | -| TVEPISODEID | | | tven | | | -| TVNETWORK | | | tvnn | | | -| TVSEASON | | | tvsn | | | -| TVSHOW | | | tvsh | | | -| URL | WXXX | | | | | -| WORK | TIT1 | | ©wrk | | WM/ContentGroupDescription | +| Key | %ID3v2 | %RIFF | %MP4 | %APE | %ASF | %Matroska | +| -------------------------- | ------ | ----- | -------------------------------------------------------- | ----------------------- | --------------------------------- | ----------------------------- | +| ACOUSTID_FINGERPRINT | | | | | Acoustid/Fingerprint | | +| ACOUSTID_ID | | | | | Acoustid/Id | | +| ALBUM | TALB | IPRD | ©alb | | WM/AlbumTitle | TITLE/50 | +| ALBUMARTIST | TPE2 | | aART | ALBUM ARTIST | WM/AlbumArtist | ARTIST/50 | +| ALBUMARTISTSORT | TSO2 | | soaa | | WM/AlbumArtistSortOrder | ARTISTSORT/50 | +| ALBUMSORT | TSOA | | soal | | WM/AlbumSortOrder | TITLESORT/50 | +| ARRANGER | | IENG | | | | | +| ARTIST | TPE1 | IART | ©ART | | | | +| ARTISTS | | | \----:com.apple.iTunes:ARTISTS | | WM/ARTISTS | | +| ARTISTSORT | TSOP | | soar | | WM/ArtistSortOrder | | +| ARTISTWEBPAGE | WOAR | IBSU | | | WM/AuthorURL | | +| ASIN | | | \----:com.apple.iTunes:ASIN | | | | +| AUDIOSOURCEWEBPAGE | WOAS | | | | ASIN | | +| BARCODE | | | \----:com.apple.iTunes:BARCODE | | WM/Barcode | | +| BPM | TBPM | IBPM | tmpo | | WM/BeatsPerMinute | | +| CATALOGNUMBER | | | \----:com.apple.iTunes:CATALOGNUMBER | | WM/CatalogNo | CATALOG_NUMBER | +| COMMENT | COMM | ICMT | ©cmt | | | | +| COMPILATION | TCMP | | cpil | | | | +| COMPOSER | TCOM | IMUS | ©wrt | | WM/Composer | | +| COMPOSERSORT | TSOC | | soco | | | | +| CONDUCTOR | TPE3 | | \----:com.apple.iTunes:CONDUCTOR | | WM/Conductor | | +| COPYRIGHT | TCOP | ICOP | cprt | | | | +| COPYRIGHTURL | WCOP | | | | | | +| DATE | TDRC | ICRD | ©day | YEAR | WM/Year | DATE_RELEASED/50 | +| DISCNUMBER | TPOS | | disk | DISC | WM/PartOfSet | PART_NUMBER/50 | +| DISCSUBTITLE | TSST | PRT1 | \----:com.apple.iTunes:DISCSUBTITLE | | WM/SetSubTitle | | +| DISCTOTAL | | | | | | TOTAL_PARTS/50 | +| DJMIXER | | | \----:com.apple.iTunes:DJMIXER | | | MIXED_BY | +| ENCODEDBY | TENC | ITCH | ©enc | | WM/EncodedBy | ENCODER | +| ENCODING | TSSE | ISFT | ©too | | WM/EncodingSettings | ENCODER_SETTINGS | +| ENCODINGTIME | TDEN | IDIT | | | WM/EncodingTime | DATE_ENCODED | +| ENGINEER | | | \----:com.apple.iTunes:ENGINEER | | | | +| FILETYPE | TFLT | | | | | | +| FILEWEBPAGE | WOAF | | | | WM/AudioFileURL | | +| GAPLESSPLAYBACK | | | pgap | | | | +| GENRE | TCON | IGNR | ©gen | | WM/Genre | | +| GROUPING | GRP1 | | ©grp | | | | +| INITIALKEY | TKEY | | | | WM/InitialKey | INITIAL_KEY | +| INVOLVEDPEOPLE | TIPL | | | | | | +| ISRC | TSRC | ISRC | \----:com.apple.iTunes:ISRC | | WM/ISRC | | +| LABEL | TPUB | IPUB | \----:com.apple.iTunes:LABEL | | WM/Publisher | LABEL_CODE | +| LANGUAGE | TLAN | ILNG | \----:com.apple.iTunes:LANGUAGE | | WM/Language | | +| LENGTH | TLEN | | | | | | +| LICENSE | | | \----:com.apple.iTunes:LICENSE | | | | +| LYRICIST | TEXT | IWRI | \----:com.apple.iTunes:LYRICIST | | WM/Writer | | +| LYRICS | USLT | | ©lyr | | WM/Lyrics | | +| MEDIA | TMED | IMED | \----:com.apple.iTunes:MEDIA | | WM/Media | ORIGINAL_MEDIA_TYPE | +| MIXER | | | \----:com.apple.iTunes:MIXER | | | | +| MOOD | TMOO | | \----:com.apple.iTunes:MOOD | | WM/Mood | | +| MOVEMENTCOUNT | | | ©mvc | | | | +| MOVEMENTNAME | MVNM | | ©mvn | | | | +| MOVEMENTNUMBER | MVIN | | ©mvi | | | | +| MUSICBRAINZ_ALBUMID | | | \----:com.apple.iTunes:MusicBrainz Album Id | | MusicBrainz/Album Id | MUSICBRAINZ_ALBUMID/50 | +| MUSICBRAINZ_ALBUMARTISTID | | | \----:com.apple.iTunes:MusicBrainz Album Artist Id | | MusicBrainz/Album Artist Id | MUSICBRAINZ_ALBUMARTISTID/50 | +| MUSICBRAINZ_ARTISTID | | | \----:com.apple.iTunes:MusicBrainz Artist Id | | MusicBrainz/Artist Id | | +| MUSICBRAINZ_RELEASEGROUPID | | | \----:com.apple.iTunes:MusicBrainz Release Group Id | | MusicBrainz/Release Group Id | MUSICBRAINZ_RELEASEGROUPID/50 | +| MUSICBRAINZ_RELEASETRACKID | | | \----:com.apple.iTunes:MusicBrainz Release Track Id | | MusicBrainz/Release Track Id | | +| MUSICBRAINZ_TRACKID | | | \----:com.apple.iTunes:MusicBrainz Track Id | | MusicBrainz/Track Id | | +| MUSICBRAINZ_WORKID | | | \----:com.apple.iTunes:MusicBrainz Work Id | | MusicBrainz/Work Id | | +| MUSICIANCREDITS | TMCL | | | | | | +| MUSICIP_PUID | | | | | MusicIP/PUID | | +| ORIGINALALBUM | TOAL | | | | WM/OriginalAlbumTitle | | +| ORIGINALARTIST | TOPE | | | | WM/OriginalArtist | | +| ORIGINALDATE | TDOR | | \----:com.apple.iTunes:ORIGINALDATE | | WM/OriginalReleaseYear | | +| ORIGINALFILENAME | TOFN | | | | WM/OriginalFilename | | +| ORIGINALLYRICIST | TOLY | | | | WM/OriginalLyricist | | +| OWNER | TOWN | | ownr | | | PURCHASE_OWNER | +| PAYMENTWEBPAGE | WPAY | | | | | | +| PERFORMER | | ISTR | | | | | +| PLAYLISTDELAY | TDLY | | | | | | +| PODCAST | PCST | | pcst | | | | +| PODCASTCATEGORY | TCAT | | catg | | | | +| PODCASTDESC | TDES | | desc | | | | +| PODCASTID | TGID | | egid | | | | +| PODCASTURL | WFED | | purl | | | | +| PRODUCEDNOTICE | TPRO | | | | | | +| PRODUCER | | | \----:com.apple.iTunes:PRODUCER | | WM/Producer | | +| PUBLISHERWEBPAGE | WPUB | | | | | | +| RADIOSTATION | TRSN | | | | | | +| RADIOSTATIONOWNER | TRSO | | | | | | +| RADIOSTATIONWEBPAGE | WORS | | | | | | +| RELEASECOUNTRY | | ICNT | \----:com.apple.iTunes:MusicBrainz Album Release Country | | MusicBrainz/Album Release Country | | +| RELEASEDATE | TDRL | | \----:com.apple.iTunes:RELEASEDATE | | | DATE_RELEASED/30 | +| RELEASESTATUS | | | \----:com.apple.iTunes:MusicBrainz Album Status | MUSICBRAINZ_ALBUMSTATUS | MusicBrainz/Album Status | | +| RELEASETYPE | | | \----:com.apple.iTunes:MusicBrainz Album Type | MUSICBRAINZ_ALBUMTYPE | MusicBrainz/Album Type | | +| REMIXER | TPE4 | IEDT | \----:com.apple.iTunes:REMIXER | MIXARTIST | WM/ModifiedBy | REMIXED_BY | +| SCRIPT | | | \----:com.apple.iTunes:SCRIPT | | WM/Script | | +| SHOWSORT | | | sosn | | | | +| SHOWWORKMOVEMENT | | | shwm | | | | +| SUBTITLE | TIT3 | | \----:com.apple.iTunes:SUBTITLE | | WM/SubTitle | | +| TAGGINGDATE | TDTG | | | | | DATE_TAGGED | +| TITLE | TIT2 | INAM | ©nam | | | | +| TITLESORT | TSOT | | sonm | | WM/TitleSortOrder | | +| TRACKNUMBER | TRCK | IPRT | trkn | TRACK | WM/TrackNumber | PART_NUMBER/30 | +| TRACKTOTAL | | | | | | TOTAL_PARTS/30 | +| TVEPISODE | | | tves | | | | +| TVEPISODEID | | | tven | | | | +| TVNETWORK | | | tvnn | | | | +| TVSEASON | | | tvsn | | | | +| TVSHOW | | | tvsh | | | | +| URL | WXXX | | | | | | +| WORK | TIT1 | | ©wrk | | WM/ContentGroupDescription | | */