From 61253b5551acc05804988f20b6d3f75f92fcc561 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 7 Aug 2019 19:29:40 +0200 Subject: [PATCH] Update taglib --- 3rdparty/taglib/mp4/mp4tag.cpp | 25 +++++++++++++++++-- 3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp | 9 ++++--- .../taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 ++-- 3rdparty/taglib/mpeg/mpegfile.cpp | 12 ++++++--- 3rdparty/taglib/mpeg/mpegfile.h | 9 ++++--- 3rdparty/taglib/toolkit/tfilestream.cpp | 1 + 6 files changed, 45 insertions(+), 16 deletions(-) diff --git a/3rdparty/taglib/mp4/mp4tag.cpp b/3rdparty/taglib/mp4/mp4tag.cpp index d130f6222..bd0504cde 100644 --- a/3rdparty/taglib/mp4/mp4tag.cpp +++ b/3rdparty/taglib/mp4/mp4tag.cpp @@ -74,9 +74,20 @@ MP4::Tag::Tag(Strawberry_TagLib::TagLib::File *file, MP4::Atoms *atoms) : atom->name == "hdvd" || atom->name == "shwm") { parseBool(atom); } - else if(atom->name == "tmpo" || atom->name == "rate" || atom->name == "\251mvi" || atom->name == "\251mvc") { + else if(atom->name == "tmpo" || atom->name == "\251mvi" || atom->name == "\251mvc") { parseInt(atom); } + else if(atom->name == "rate") { + AtomDataList data = parseData2(atom); + if(!data.isEmpty()) { + AtomData val = data[0]; + if (val.type == TypeUTF8) { + addItem(atom->name, StringList(String(val.data, String::UTF8))); + } else { + addItem(atom->name, (int)(val.data.toShort())); + } + } + } else if(atom->name == "tvsn" || atom->name == "tves" || atom->name == "cnID" || atom->name == "sfID" || atom->name == "atID" || atom->name == "geID" || atom->name == "cmID") { @@ -480,9 +491,19 @@ MP4::Tag::save() name == "shwm") { data.append(renderBool(name.data(String::Latin1), it->second)); } - else if(name == "tmpo" || name == "rate" || name == "\251mvi" || name == "\251mvc") { + else if(name == "tmpo" || name == "\251mvi" || name == "\251mvc") { data.append(renderInt(name.data(String::Latin1), it->second)); } + else if (name == "rate") { + const MP4::Item& item = it->second; + StringList value = item.toStringList(); + if (value.isEmpty()) { + data.append(renderInt(name.data(String::Latin1), item)); + } + else { + data.append(renderText(name.data(String::Latin1), item)); + } + } else if(name == "tvsn" || name == "tves" || name == "cnID" || name == "sfID" || name == "atID" || name == "geID" || name == "cmID") { diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp b/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp index eb78b7c62..f579777ed 100644 --- a/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp @@ -111,8 +111,8 @@ Frame *Frame::createTextualFrame(const String &key, const StringList &values) // // check if the key is contained in the key<=>frameID mapping ByteVector frameID = keyToFrameID(key); if(!frameID.isEmpty()) { - // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number) are in fact text frames. - if(frameID[0] == 'T' || frameID == "WFED" || frameID == "MVNM" || frameID == "MVIN"){ // text frame + // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number), GRP1 (Grouping) are in fact text frames. + if(frameID[0] == 'T' || frameID == "WFED" || frameID == "MVNM" || frameID == "MVIN" || frameID == "GRP1"){ // text frame TextIdentificationFrame *frame = new TextIdentificationFrame(frameID, String::UTF8); frame->setText(values); return frame; @@ -394,6 +394,7 @@ namespace { "WFED", "PODCASTURL" }, { "MVNM", "MOVEMENTNAME" }, { "MVIN", "MOVEMENTNUMBER" }, + { "GRP1", "GROUPING" }, }; const size_t frameTranslationSize = sizeof(frameTranslation) / sizeof(frameTranslation[0]); @@ -476,8 +477,8 @@ PropertyMap Frame::asProperties() const // workaround until this function is virtual if(id == "TXXX") return dynamic_cast< const UserTextIdentificationFrame* >(this)->asProperties(); - // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number) are in fact text frames. - else if(id[0] == 'T' || id == "WFED" || id == "MVNM" || id == "MVIN") + // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number), GRP1 (Grouping) are in fact text frames. + else if(id[0] == 'T' || id == "WFED" || id == "MVNM" || id == "MVIN" || id == "GRP1") return dynamic_cast< const TextIdentificationFrame* >(this)->asProperties(); else if(id == "WXXX") return dynamic_cast< const UserUrlLinkFrame* >(this)->asProperties(); diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp b/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp index 9642638f5..849da20ac 100644 --- a/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -198,8 +198,8 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader) // Text Identification (frames 4.2) - // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number) are in fact text frames. - if(frameID.startsWith("T") || frameID == "WFED" || frameID == "MVNM" || frameID == "MVIN") { + // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number), GRP1 (Grouping) are in fact text frames. + if(frameID.startsWith("T") || frameID == "WFED" || frameID == "MVNM" || frameID == "MVIN" || frameID == "GRP1") { TextIdentificationFrame *f = frameID != "TXXX" ? new TextIdentificationFrame(data, header) @@ -459,6 +459,7 @@ namespace { "WFD", "WFED" }, { "MVN", "MVNM" }, { "MVI", "MVIN" }, + { "GP1", "GRP1" }, }; const size_t frameConversion2Size = sizeof(frameConversion2) / sizeof(frameConversion2[0]); diff --git a/3rdparty/taglib/mpeg/mpegfile.cpp b/3rdparty/taglib/mpeg/mpegfile.cpp index 75993b5b4..032fce10c 100644 --- a/3rdparty/taglib/mpeg/mpegfile.cpp +++ b/3rdparty/taglib/mpeg/mpegfile.cpp @@ -109,8 +109,8 @@ bool MPEG::File::isSupported(IOStream *stream) const ByteVector buffer = Utils::readHeader(stream, bufferSize(), true, &headerOffset); if(buffer.isEmpty()) - return false; - + return false; + const long originalPosition = stream->tell(); AdapterFile file(stream); @@ -182,7 +182,7 @@ PropertyMap MPEG::File::setProperties(const PropertyMap &properties) { // update ID3v1 tag if it exists, but ignore the return value - if(ID3v1Tag()) + if(hasID3v1Tag()) ID3v1Tag()->setProperties(properties); return ID3v2Tag(true)->setProperties(properties); @@ -195,7 +195,11 @@ MPEG::Properties *MPEG::File::audioProperties() const bool MPEG::File::save() { - return save(AllTags); + if (hasID3v1Tag() || !ID3v1Tag()->isEmpty()) { + return save(AllTags, true, 4, true); + } else { + return save(AllTags, true, 4, false); + } } bool MPEG::File::save(int tags) diff --git a/3rdparty/taglib/mpeg/mpegfile.h b/3rdparty/taglib/mpeg/mpegfile.h index 77446c49a..021a2edba 100644 --- a/3rdparty/taglib/mpeg/mpegfile.h +++ b/3rdparty/taglib/mpeg/mpegfile.h @@ -164,14 +164,15 @@ namespace TagLib { virtual Properties *audioProperties() const; /*! - * Save the file. If at least one tag -- ID3v1 or ID3v2 -- exists this - * will duplicate its content into the other tag. This returns true - * if saving was successful. + * Save the file. If an ID3v1 tag exists this will duplicate the tag + * content into the other tag. This returns true if saving was + * successful. * * If neither exists or if both tags are empty, this will strip the tags * from the file. * - * This is the same as calling save(AllTags); + * This is the same as calling save(AllTags, true, 4, false); or if an + * ID3v1 tag exists, save(AllTags, true, 4, true). * * If you would like more granular control over the content of the tags, * with the concession of generality, use parameterized save call below. diff --git a/3rdparty/taglib/toolkit/tfilestream.cpp b/3rdparty/taglib/toolkit/tfilestream.cpp index 3495751aa..2625a7278 100644 --- a/3rdparty/taglib/toolkit/tfilestream.cpp +++ b/3rdparty/taglib/toolkit/tfilestream.cpp @@ -493,6 +493,7 @@ void FileStream::truncate(long length) #else + fflush(d->file); const int error = ftruncate(fileno(d->file), length); if(error != 0) debug("FileStream::truncate() -- Coundn't truncate the file.");