Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename Id2v2 frame ID "grouping" to "albumArtist"

This commit is contained in:
Martchus 2019-06-16 17:45:49 +02:00
parent 0af4044a50
commit ed816a322d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
id3/id3v2frameids.cpp
View File

@ -57,8 +57,8 @@ std::uint32_t convertToShortId(std::uint32_t id)
return sEncoderSettings; return sEncoderSettings;
case lUnsynchronizedLyrics: case lUnsynchronizedLyrics:
return sUnsynchronizedLyrics; return sUnsynchronizedLyrics;
case lGrouping: case lAlbumArtist:
return sGrouping; return sAlbumArtist;
case lContentGroupDescription: case lContentGroupDescription:
return sContentGroupDescription; return sContentGroupDescription;
case lRecordLabel: case lRecordLabel:
@ -111,8 +111,8 @@ std::uint32_t convertToLongId(std::uint32_t id)
return lEncoderSettings; return lEncoderSettings;
case sUnsynchronizedLyrics: case sUnsynchronizedLyrics:
return lUnsynchronizedLyrics; return lUnsynchronizedLyrics;
case sGrouping: case sAlbumArtist:
return lGrouping; return lAlbumArtist;
case sContentGroupDescription: case sContentGroupDescription:
return lContentGroupDescription; return lContentGroupDescription;
case sRecordLabel: case sRecordLabel:

4
id3/id3v2frameids.h
View File

@ -27,7 +27,7 @@ enum KnownValue : std::uint32_t {
lEncoderSettings = 0x54535345, lEncoderSettings = 0x54535345,
lUnsynchronizedLyrics = 0x55534c54, lUnsynchronizedLyrics = 0x55534c54,
lSynchronizedLyrics = 0x53594C54, lSynchronizedLyrics = 0x53594C54,
lGrouping = 0x54504532, // FIXME: rename to lAlbumArtist in v9 lAlbumArtist = 0x54504532,
lContentGroupDescription = 0x54495431, lContentGroupDescription = 0x54495431,
lRecordLabel = 0x54505542, lRecordLabel = 0x54505542,
lUniqueFileId = 0x55464944, lUniqueFileId = 0x55464944,
@ -53,7 +53,7 @@ enum KnownValue : std::uint32_t {
sEncoderSettings = 0x545353, sEncoderSettings = 0x545353,
sUnsynchronizedLyrics = 0x554C54, sUnsynchronizedLyrics = 0x554C54,
sSynchronizedLyrics = 0x534C54, sSynchronizedLyrics = 0x534C54,
sGrouping = 0x545032, // FIXME: rename to sAlbumArtist in v9 sAlbumArtist = 0x545032,
sContentGroupDescription = 0x545431, sContentGroupDescription = 0x545431,
sRecordLabel = 0x545042, sRecordLabel = 0x545042,
sUniqueFileId = 0x554649, sUniqueFileId = 0x554649,

8
id3/id3v2tag.cpp
View File

@ -184,7 +184,7 @@ Id3v2Tag::IdentifierType Id3v2Tag::internallyGetFieldId(KnownField field) const
case KnownField::Rating: case KnownField::Rating:
return lRating; return lRating;
case KnownField::AlbumArtist: case KnownField::AlbumArtist:
return lGrouping; return lAlbumArtist;
default:; default:;
} }
} else { } else {
@ -234,7 +234,7 @@ Id3v2Tag::IdentifierType Id3v2Tag::internallyGetFieldId(KnownField field) const
case KnownField::Rating: case KnownField::Rating:
return sRating; return sRating;
case KnownField::AlbumArtist: case KnownField::AlbumArtist:
return sGrouping; return sAlbumArtist;
default:; default:;
} }
} }
@ -281,7 +281,7 @@ KnownField Id3v2Tag::internallyGetKnownField(const IdentifierType &id) const
return KnownField::Lyrics; return KnownField::Lyrics;
case lSynchronizedLyrics: case lSynchronizedLyrics:
return KnownField::SynchronizedLyrics; return KnownField::SynchronizedLyrics;
case lGrouping: case lAlbumArtist:
return KnownField::AlbumArtist; return KnownField::AlbumArtist;
case lContentGroupDescription: case lContentGroupDescription:
return KnownField::Grouping; return KnownField::Grouping;
@ -321,7 +321,7 @@ KnownField Id3v2Tag::internallyGetKnownField(const IdentifierType &id) const
return KnownField::Lyrics; return KnownField::Lyrics;
case sSynchronizedLyrics: case sSynchronizedLyrics:
return KnownField::SynchronizedLyrics; return KnownField::SynchronizedLyrics;
case sGrouping: case sAlbumArtist:
return KnownField::Grouping; return KnownField::Grouping;
case sRecordLabel: case sRecordLabel:
return KnownField::RecordLabel; return KnownField::RecordLabel;