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

Change mapping of publisher for ID3v2 

TPUB is likely better be mapped to the recently added publisher field. Note
that MP4 and Matroska have a distinct record label field.
This commit is contained in:
Martchus 2022-04-09 23:42:20 +02:00
parent 520a913b07
commit 87aea59735
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
id3/id3v2frameids.h
View File

@ -38,7 +38,7 @@ enum KnownValue : std::uint32_t {
lSynchronizedLyrics = 0x53594C54, /**< SYLT */
lAlbumArtist = 0x54504532, /**< TPE2 */
lContentGroupDescription = 0x54495431, /**< TIT1 */
lRecordLabel = 0x54505542, /**< TPUB */
lRecordLabel = 0x54505542, /**< TPUB \todo rename to lPublisher in v12 */
lUniqueFileId = 0x55464944, /**< UFID */
lComposer = 0x54434f4d, /**< TCOM */
lRating = 0x504f504d, /**< POPM */
@ -72,7 +72,7 @@ enum KnownValue : std::uint32_t {
sSynchronizedLyrics = 0x534C54, /**< ?SLT */
sAlbumArtist = 0x545032, /**< ?TP2 */
sContentGroupDescription = 0x545431, /**< ?TT1 */
sRecordLabel = 0x545042, /**< ?TPB */
sRecordLabel = 0x545042, /**< ?TPB \todo rename to sPublisher in v12 */
sUniqueFileId = 0x554649, /**< ?UFI */
sComposer = 0x54434d, /**< ?TCM */
sRating = 0x504f50, /**< ?POP */

8
id3/id3v2tag.cpp
View File

@ -172,7 +172,7 @@ Id3v2Tag::IdentifierType Id3v2Tag::internallyGetFieldId(KnownField field) const
return lSynchronizedLyrics;
case KnownField::Grouping:
return lContentGroupDescription;
case KnownField::RecordLabel:
case KnownField::Publisher:
return lRecordLabel;
case KnownField::Composer:
return lComposer;
@ -232,7 +232,7 @@ Id3v2Tag::IdentifierType Id3v2Tag::internallyGetFieldId(KnownField field) const
return sSynchronizedLyrics;
case KnownField::Grouping:
return sContentGroupDescription;
case KnownField::RecordLabel:
case KnownField::Publisher:
return sRecordLabel;
case KnownField::Composer:
return sComposer;
@ -298,7 +298,7 @@ KnownField Id3v2Tag::internallyGetKnownField(const IdentifierType &id) const
case lContentGroupDescription:
return KnownField::Grouping;
case lRecordLabel:
return KnownField::RecordLabel;
return KnownField::Publisher;
case lTaggingTime:
return KnownField::TaggingDate;
case lEncodingTime:
@ -344,7 +344,7 @@ KnownField Id3v2Tag::internallyGetKnownField(const IdentifierType &id) const
case sAlbumArtist:
return KnownField::Grouping;
case sRecordLabel:
return KnownField::RecordLabel;
return KnownField::Publisher;
case sRemixedBy:
return KnownField::RemixedBy;
case sCopyright:

2
tests/overallmp3.cpp
View File

@ -135,7 +135,7 @@ void OverallTests::checkMp3Testfile2()
CPPUNIT_ASSERT_EQUAL(m_tagStatus == TagStatus::TestMetaDataPresent ? "Test"s : "Hardstyle"s,
tag->value(KnownField::Genre).toString(TagTextEncoding::Utf8));
CPPUNIT_ASSERT_EQUAL("Lavf57.83.100"s, tag->value(KnownField::EncoderSettings).toString(TagTextEncoding::Utf8));
CPPUNIT_ASSERT_EQUAL("Roughstate"s, tag->value(KnownField::RecordLabel).toString(TagTextEncoding::Utf8));
CPPUNIT_ASSERT_EQUAL("Roughstate"s, tag->value(KnownField::Publisher).toString(TagTextEncoding::Utf8));
CPPUNIT_ASSERT_EQUAL("2017"s, tag->value(KnownField::RecordDate).toString(TagTextEncoding::Utf8));
CPPUNIT_ASSERT_EQUAL(1, tag->value(KnownField::TrackPosition).toPositionInSet().position());
CPPUNIT_ASSERT(tag->value(KnownField::Length).toTimeSpan().isNull());