diff --git a/id3/id3v1tag.cpp b/id3/id3v1tag.cpp index c93b0b8..0cea11d 100644 --- a/id3/id3v1tag.cpp +++ b/id3/id3v1tag.cpp @@ -152,7 +152,6 @@ const TagValue &Id3v1Tag::value(KnownField field) const case KnownField::Album: return m_album; case KnownField::RecordDate: - case KnownField::Year: return m_year; case KnownField::Comment: return m_comment; @@ -178,7 +177,6 @@ bool Id3v1Tag::setValue(KnownField field, const TagValue &value) m_album = value; break; case KnownField::RecordDate: - case KnownField::Year: m_year = value; break; case KnownField::Comment: @@ -210,7 +208,6 @@ bool Id3v1Tag::hasField(KnownField field) const return !m_artist.isEmpty(); case KnownField::Album: return !m_album.isEmpty(); - case KnownField::Year: return !m_year.isEmpty(); case KnownField::Comment: return !m_comment.isEmpty(); @@ -252,7 +249,6 @@ bool Id3v1Tag::supportsField(KnownField field) const case KnownField::Artist: case KnownField::Album: case KnownField::RecordDate: - case KnownField::Year: case KnownField::Comment: case KnownField::TrackPosition: case KnownField::Genre: diff --git a/id3/id3v2frameids.h b/id3/id3v2frameids.h index 73cab2c..56b739f 100644 --- a/id3/id3v2frameids.h +++ b/id3/id3v2frameids.h @@ -19,7 +19,6 @@ enum KnownValue : std::uint32_t { lRecordingDates = 0x54524441, /**< TRDA */ lDate = 0x54444154, /**< TDAT */ lTime = 0x54494D45, /**< TIME */ - lRecordDate = 0x54445243, /**< FIXME v10: remove in favor of lRecordingTime */ lRecordingTime = 0x54445243, /**< TDRC */ lReleaseTime = 0x5444524C, /**< TDRL */ lOriginalReleaseTime = 0x54444F52, /**< TDOR */ diff --git a/id3/id3v2tag.cpp b/id3/id3v2tag.cpp index 7065d86..a93f0ee 100644 --- a/id3/id3v2tag.cpp +++ b/id3/id3v2tag.cpp @@ -28,7 +28,6 @@ bool Id3v2Tag::supportsMultipleValues(KnownField field) const switch (field) { case KnownField::Album: case KnownField::Artist: - case KnownField::Year: case KnownField::RecordDate: case KnownField::ReleaseDate: case KnownField::Title: @@ -142,7 +141,6 @@ Id3v2Tag::IdentifierType Id3v2Tag::internallyGetFieldId(KnownField field) const case KnownField::Comment: return lComment; case KnownField::RecordDate: - case KnownField::Year: return lRecordingTime; // (de)serializer takes to convert to/from lYear/lRecordingDates/lDate/lTime case KnownField::ReleaseDate: return lReleaseTime; @@ -193,7 +191,6 @@ Id3v2Tag::IdentifierType Id3v2Tag::internallyGetFieldId(KnownField field) const case KnownField::Comment: return sComment; case KnownField::RecordDate: - case KnownField::Year: return lRecordingTime; // (de)serializer takes to convert to/from sYear/sRecordingDates/sDate/sTime case KnownField::Title: return sTitle; diff --git a/matroska/matroskatag.cpp b/matroska/matroskatag.cpp index 25b9a58..8e5fac3 100644 --- a/matroska/matroskatag.cpp +++ b/matroska/matroskatag.cpp @@ -28,7 +28,6 @@ MatroskaTag::IdentifierType MatroskaTag::internallyGetFieldId(KnownField field) case KnownField::Comment: return std::string(comment()); case KnownField::RecordDate: - case KnownField::Year: return std::string(dateRecorded()); case KnownField::ReleaseDate: return std::string(dateRelease()); diff --git a/mp4/mp4ids.h b/mp4/mp4ids.h index f59e410..e3c0ae1 100644 --- a/mp4/mp4ids.h +++ b/mp4/mp4ids.h @@ -22,7 +22,6 @@ enum KnownValue : std::uint32_t { DataInformation = 0x64696e66, /**< dinf */ DataReference = 0x64726566, /**< dref */ Drms = 0x64726D73, /**< drms */ - Edts = 0x65647473, /**< FIXME v10: remove in next major release */ Edit = 0x65647473, /**< edts */ EditList = 0x656C7374, /**< elst */ Free = 0x66726565, /**< free */ diff --git a/mp4/mp4tag.cpp b/mp4/mp4tag.cpp index ccc9a41..30dd210 100644 --- a/mp4/mp4tag.cpp +++ b/mp4/mp4tag.cpp @@ -128,7 +128,6 @@ Mp4Tag::IdentifierType Mp4Tag::internallyGetFieldId(KnownField field) const case KnownField::Comment: return Comment; case KnownField::RecordDate: - case KnownField::Year: return Year; case KnownField::Title: return Title; diff --git a/tag.h b/tag.h index 2d3ccce..4b359ab 100644 --- a/tag.h +++ b/tag.h @@ -45,7 +45,6 @@ enum class KnownField : unsigned int { Album, /**< album/collection */ Artist, /**< artist/band */ Genre, /**< genre */ - Year, /**< record date, deprecated - FIXME v10: remove in favor of RecordDate and ReleaseDate */ Comment, /**< comment */ Bpm, /**< beats per minute */ Bps, /**< beats per second */ @@ -93,7 +92,8 @@ constexpr unsigned int knownFieldArraySize = static_cast(lastKnown */ constexpr bool isKnownFieldDeprecated(KnownField field) { - return field == KnownField::Year; + CPP_UTILITIES_UNUSED(field) + return false; } /*! diff --git a/vorbis/vorbiscomment.cpp b/vorbis/vorbiscomment.cpp index c56c9aa..bc5c00e 100644 --- a/vorbis/vorbiscomment.cpp +++ b/vorbis/vorbiscomment.cpp @@ -57,7 +57,6 @@ VorbisComment::IdentifierType VorbisComment::internallyGetFieldId(KnownField fie case KnownField::Cover: return std::string(cover()); case KnownField::RecordDate: - case KnownField::Year: return std::string(date()); case KnownField::Title: return std::string(title());