mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

std::array conversion (#1157)

Browse Source
This commit is contained in:
Rosen Penev 2023-10-09 08:09:27 -07:00 committed by GitHub
parent 3f25d3c342
commit 89a54863ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
taglib/mpeg/id3v2/id3v2tag.cpp
View File

@ -26,6 +26,7 @@
#include "id3v2tag.h"
#include <algorithm>
#include <array>
#include <utility>
#include "tdebug.h"
@ -53,16 +54,6 @@ namespace
const long MinPaddingSize = 1024;
const long MaxPaddingSize = 1024 * 1024;
bool contains(const char **a, const ByteVector &v)
{
for(int i = 0; a[i]; i++)
{
if(v == a[i])
return true;
}
return false;
}
} // namespace
class ID3v2::Tag::TagPrivate
@ -468,15 +459,15 @@ ByteVector ID3v2::Tag::render() const
void ID3v2::Tag::downgradeFrames(FrameList *frames, FrameList *newFrames) const
{
#ifdef NO_ITUNES_HACKS
static const char *unsupportedFrames[] = {
static constexpr std::array unsupportedFrames {
"ASPI", "EQU2", "RVA2", "SEEK", "SIGN", "TDRL", "TDTG",
"TMOO", "TPRO", "TSOA", "TSOT", "TSST", "TSOP", 0
"TMOO", "TPRO", "TSOA", "TSOT", "TSST", "TSOP"
};
#else
// iTunes writes and reads TSOA, TSOT, TSOP to ID3v2.3.
static const char *unsupportedFrames[] = {
static constexpr std::array unsupportedFrames {
"ASPI", "EQU2", "RVA2", "SEEK", "SIGN", "TDRL", "TDTG",
"TMOO", "TPRO", "TSST", nullptr
"TMOO", "TPRO", "TSST"
};
#endif
ID3v2::TextIdentificationFrame *frameTDOR = nullptr;
@ -488,7 +479,8 @@ void ID3v2::Tag::downgradeFrames(FrameList *frames, FrameList *newFrames) const
for(const auto &frame : std::as_const(d->frameList)) {
ByteVector frameID = frame->header()->frameID();
if(contains(unsupportedFrames, frameID)) {
if(std::any_of(unsupportedFrames.begin(), unsupportedFrames.end(),
[&frameID](auto m){ return frameID == m; })) {
debug("A frame that is not supported in ID3v2.3 \'" + String(frameID) +
"\' has been discarded");
continue;