From 295db43bcacfc6a61523b71716e0a23389aba649 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 13 Feb 2021 00:31:54 +0100 Subject: [PATCH] taglib: Remove unused methods --- 3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp | 15 +---------- 3rdparty/taglib/mpeg/id3v2/id3v2frame.h | 33 ++--------------------- 3rdparty/taglib/mpeg/mpegfile.cpp | 10 ------- 3rdparty/taglib/mpeg/mpegfile.h | 28 +------------------ 4 files changed, 4 insertions(+), 82 deletions(-) diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp b/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp index 3a5afd237..643b50f06 100644 --- a/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp +++ b/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp @@ -75,10 +75,6 @@ bool isValidFrameID(const ByteVector &frameID) { // static methods //////////////////////////////////////////////////////////////////////////////// -unsigned int Frame::headerSize() { - return Header::size(); -} - unsigned int Frame::headerSize(unsigned int version) { return Header::size(version); } @@ -271,12 +267,7 @@ String Frame::readStringField(const ByteVector &data, String::Type encoding, siz } -String::Type Frame::checkEncoding(const StringList &fields, String::Type encoding) { // static - - return checkEncoding(fields, encoding, 4); -} - -String::Type Frame::checkEncoding(const StringList &fields, String::Type encoding, unsigned int version) { // static +String::Type Frame::checkEncoding(const StringList &fields, String::Type encoding, unsigned int version) const { if ((encoding == String::UTF8 || encoding == String::UTF16BE) && version != 4) return String::UTF16; @@ -507,10 +498,6 @@ class Frame::Header::HeaderPrivate { // static members (Frame::Header) //////////////////////////////////////////////////////////////////////////////// -unsigned int Frame::Header::size() { - return size(4); -} - unsigned int Frame::Header::size(unsigned int version) { switch (version) { case 0: diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2frame.h b/3rdparty/taglib/mpeg/id3v2/id3v2frame.h index dadf9e616..b578cde96 100644 --- a/3rdparty/taglib/mpeg/id3v2/id3v2frame.h +++ b/3rdparty/taglib/mpeg/id3v2/id3v2frame.h @@ -79,15 +79,6 @@ class TAGLIB_EXPORT Frame { */ unsigned int size() const; - /*! - * Returns the size of the frame header - * - * \deprecated This is only accurate for ID3v2.3 or ID3v2.4. - * Please use the call below which accepts an ID3v2 version number. - * In the next non-binary compatible release this will be made into a non-static member that checks the internal ID3v2 version. - */ - unsigned int headerSize(); - /*! * Returns the size of the frame header for the given ID3v2 version. * @@ -210,18 +201,11 @@ class TAGLIB_EXPORT Frame { */ String readStringField(const ByteVector &data, String::Type encoding, size_t &position); - /*! - * Checks a the list of string values to see if they can be used with the specified encoding and returns the recommended encoding. - */ - // BIC: remove and make non-static - static String::Type checkEncoding(const StringList &fields, String::Type encoding); - /*! * Checks a the list of string values to see if they can be used with the specified encoding and returns the recommended encoding. * This method also checks the ID3v2 version and makes sure the encoding can be used in the specified version. */ - // BIC: remove and make non-static - static String::Type checkEncoding(const StringList &fields, String::Type encoding, unsigned int version); + String::Type checkEncoding(const StringList &fields, String::Type encoding, unsigned int version) const; /*! * Checks a the list of string values to see if they can be used with the specified encoding and returns the recommended encoding. @@ -355,25 +339,12 @@ class TAGLIB_EXPORT Frame::Header { */ void setVersion(unsigned int version); - /*! - * Returns the size of the frame header in bytes. - * - * \deprecated Please use the version of this method that accepts a - * version. This is only accurate for ID3v2.3 and ID3v2.4. This will be - * removed in the next binary incompatible release (2.0) and will be - * replaced with a non-static method that checks the frame version. - */ - // BIC: make non-static - static unsigned int size(); - /*! * Returns the size of the frame header in bytes for the ID3v2 version * that's given. - * - * \deprecated Please see the explanation in the version above. */ // BIC: remove - static unsigned int size(unsigned int version); + static unsigned int size(unsigned int version = 4); /*! * Returns true if the flag for tag alter preservation is set. diff --git a/3rdparty/taglib/mpeg/mpegfile.cpp b/3rdparty/taglib/mpeg/mpegfile.cpp index ec08e2e5d..fa9920cfa 100644 --- a/3rdparty/taglib/mpeg/mpegfile.cpp +++ b/3rdparty/taglib/mpeg/mpegfile.cpp @@ -131,12 +131,6 @@ bool MPEG::File::isSupported(IOStream *stream) { // public members //////////////////////////////////////////////////////////////////////////////// -MPEG::File::File(FileName fileName, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(fileName), d(new FilePrivate()) { - - if (isOpen()) - read(readProperties); - -} MPEG::File::File(FileName fileName, ID3v2::FrameFactory *frameFactory, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(fileName), d(new FilePrivate(frameFactory)) { @@ -300,10 +294,6 @@ APE::Tag *MPEG::File::APETag(bool create) { return d->tag.access(APEIndex, create); } -bool MPEG::File::strip(int tags) { - return strip(tags, true); -} - bool MPEG::File::strip(int tags, bool freeMemory) { if (readOnly()) { diff --git a/3rdparty/taglib/mpeg/mpegfile.h b/3rdparty/taglib/mpeg/mpegfile.h index ba846d7eb..fe4cf085e 100644 --- a/3rdparty/taglib/mpeg/mpegfile.h +++ b/3rdparty/taglib/mpeg/mpegfile.h @@ -78,17 +78,6 @@ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File { AllTags = 0xffff }; - /*! - * Constructs an MPEG file from \a file. If \a readProperties is true the - * file's audio properties will also be read. - * - * \note In the current implementation, \a propertiesStyle is ignored. - * - * \deprecated This constructor will be dropped in favor of the one below - * in a future version. - */ - explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average); - /*! * Constructs an MPEG file from \a file. * If \a readProperties is true the file's audio properties will also be read. @@ -98,7 +87,6 @@ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File { * * \note In the current implementation, \a propertiesStyle is ignored. */ - // BIC: merge with the above constructor explicit File(FileName fileName, ID3v2::FrameFactory *frameFactory, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average); /*! @@ -230,19 +218,6 @@ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File { */ APE::Tag *APETag(bool create = false); - /*! - * This will strip the tags that match the OR-ed together TagTypes from the file. - * By default it strips all tags. - * It returns true if the tags are successfully stripped. - * - * This is equivalent to strip(tags, true) - * - * \note This will also invalidate pointers to the ID3 and APE tags as their memory will be freed. - * - * \note This will update the file immediately. - */ - bool strip(int tags = AllTags); - /*! * This will strip the tags that match the OR-ed together TagTypes from the file. * By default it strips all tags. It returns true if the tags are successfully stripped. @@ -251,8 +226,7 @@ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File { * * \note This will update the file immediately. */ - // BIC: merge with the method above - bool strip(int tags, bool freeMemory); + bool strip(int tags = AllTags, bool freeMemory = true); /*! * Returns the position in the file of the first MPEG frame.