Update taglib

3rdparty/taglib/toolkit/taglib.h

@@ -44,6 +44,16 @@
 #define TAGLIB_CONSTRUCT_BITSET(x) static_cast<unsigned long>(x)
 #endif
 
+#if __cplusplus >= 201402
+#define TAGLIB_DEPRECATED [[deprecated]]
+#elif defined(__GNUC__) || defined(__clang__)
+#define TAGLIB_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#define TAGLIB_DEPRECATED __declspec(deprecated)
+#else
+#define TAGLIB_DEPRECATED
+#endif
+
 #include <string>
 
 //! A namespace for all TagLib related classes and functions
@@ -52,7 +62,7 @@
  * This namespace contains everything in TagLib.  For projects working with
  * TagLib extensively it may be convenient to add a
  * \code
- * using namespace Strawberry_TagLib::TagLib;
+ * using namespace TagLib;
  * \endcode
  */
 

3rdparty/taglib/toolkit/tfile.h

@@ -63,6 +63,23 @@ namespace TagLib {
       End
     };
 
+    /*!
+     * Specify which tags to strip either explicitly, or on save.
+     */
+    enum StripTags {
+      StripNone,  //<! Don't strip any tags
+      StripOthers //<! Strip all tags not explicitly referenced in method call
+    };
+
+    /*!
+     * Used to specify if when saving files, if values between different tag
+     * types should be syncronized.
+     */
+    enum DuplicateTags {
+      Duplicate,     //<! Syncronize values between different tag types
+      DoNotDuplicate //<! Do not syncronize values between different tag types
+    };
+
     /*!
      * Destroys this File instance.
      */
@@ -247,14 +264,14 @@ namespace TagLib {
      *
      * \deprecated
      */
-    static bool isReadable(const char *file);
+    TAGLIB_DEPRECATED static bool isReadable(const char *file);
 
     /*!
      * Returns true if \a file can be opened for writing.
      *
      * \deprecated
      */
-    static bool isWritable(const char *name);
+    TAGLIB_DEPRECATED static bool isWritable(const char *name);
 
   protected:
     /*!

3rdparty/taglib/toolkit/tstring.cpp

@@ -199,7 +199,7 @@ String::String(const wstring &s, Type t) :
     copyFromUTF16(d->data, s.c_str(), s.length(), t);
   }
   else {
-    debug("String::String() -- Strawberry_TagLib::TagLib::wstring should not contain Latin1 or UTF-8.");
+    debug("String::String() -- TagLib::wstring should not contain Latin1 or UTF-8.");
   }
 }
 

3rdparty/taglib/toolkit/tstring.h

@@ -34,9 +34,9 @@
 #include <iostream>
 
 /*!
- * \relates Strawberry_TagLib::TagLib::String
+ * \relates TagLib::String
  *
- * Converts a QString to a Strawberry_TagLib::TagLib::String without a requirement to link to Qt.
+ * Converts a QString to a TagLib::String without a requirement to link to Qt.
  *
  * \note consider conversion via usual char-by-char for loop to avoid UTF16->UTF8->UTF16
  * conversion happening in the background
@@ -49,9 +49,9 @@
 #endif
 
 /*!
- * \relates Strawberry_TagLib::TagLib::String
+ * \relates TagLib::String
  *
- * Converts a Strawberry_TagLib::TagLib::String to a QString without a requirement to link to Qt.
+ * Converts a TagLib::String to a QString without a requirement to link to Qt.
  *
  * \note consider conversion via usual char-by-char for loop to avoid UTF16->UTF8->UTF16
  * conversion happening in the background
@@ -69,7 +69,7 @@ namespace TagLib {
 
   /*!
    * This is an implicitly shared \e wide string.  For storage it uses
-   * Strawberry_TagLib::TagLib::wstring, but as this is an <i>implementation detail</i> this of
+   * TagLib::wstring, but as this is an <i>implementation detail</i> this of
    * course could change.  Strings are stored internally as UTF-16(without BOM/
    * CPU byte order)
    *
@@ -542,7 +542,7 @@ namespace TagLib {
      * may lead to a linkage error.
      */
      // BIC: remove
-    static const Type WCharByteOrder;
+    TAGLIB_DEPRECATED static const Type WCharByteOrder;
 
     class StringPrivate;
     StringPrivate *d;
@@ -552,21 +552,21 @@ namespace TagLib {
 }
 
 /*!
- * \relates Strawberry_TagLib::TagLib::String
+ * \relates TagLib::String
  *
  * Concatenates \a s1 and \a s2 and returns the result as a string.
  */
 TAGLIB_EXPORT const Strawberry_TagLib::TagLib::String operator+(const Strawberry_TagLib::TagLib::String &s1, const Strawberry_TagLib::TagLib::String &s2);
 
 /*!
- * \relates Strawberry_TagLib::TagLib::String
+ * \relates TagLib::String
  *
  * Concatenates \a s1 and \a s2 and returns the result as a string.
  */
 TAGLIB_EXPORT const Strawberry_TagLib::TagLib::String operator+(const char *s1, const Strawberry_TagLib::TagLib::String &s2);
 
 /*!
- * \relates Strawberry_TagLib::TagLib::String
+ * \relates TagLib::String
  *
  * Concatenates \a s1 and \a s2 and returns the result as a string.
  */
@@ -574,7 +574,7 @@ TAGLIB_EXPORT const Strawberry_TagLib::TagLib::String operator+(const Strawberry
 
 
 /*!
- * \relates Strawberry_TagLib::TagLib::String
+ * \relates TagLib::String
  *
  * Send the string to an output stream.
  */