From 97e000b8ce16626a160e2196627fb0c884dbcfbf Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 10 Apr 2021 17:02:43 +0200 Subject: 20210410.1 global branch merge. Signed-off-by: Matteo Bernardini --- libraries/id3lib/patches/id3lib.c_wrapper.patch | 58 ------------------------- 1 file changed, 58 deletions(-) delete mode 100644 libraries/id3lib/patches/id3lib.c_wrapper.patch (limited to 'libraries/id3lib/patches/id3lib.c_wrapper.patch') diff --git a/libraries/id3lib/patches/id3lib.c_wrapper.patch b/libraries/id3lib/patches/id3lib.c_wrapper.patch deleted file mode 100644 index d72e81c0ec..0000000000 --- a/libraries/id3lib/patches/id3lib.c_wrapper.patch +++ /dev/null @@ -1,58 +0,0 @@ -This patch adds C wrapper functions for field encoding. - -It was first introduced in version 3.8.3-8 and fixes -http://bugs.debian.org/281292 ---- a/include/id3.h -+++ b/include/id3.h -@@ -104,6 +104,9 @@ - ID3_C_EXPORT void CCONV ID3Field_GetBINARY (const ID3Field *field, uchar *buffer, size_t buffLength); - ID3_C_EXPORT void CCONV ID3Field_FromFile (ID3Field *field, const char *fileName); - ID3_C_EXPORT void CCONV ID3Field_ToFile (const ID3Field *field, const char *fileName); -+ ID3_C_EXPORT bool CCONV ID3Field_SetEncoding (ID3Field *field, ID3_TextEnc enc); -+ ID3_C_EXPORT ID3_TextEnc CCONV ID3Field_GetEncoding (const ID3Field *field); -+ ID3_C_EXPORT bool CCONV ID3Field_IsEncodable (const ID3Field *field); - - /* field-info wrappers */ - ID3_C_EXPORT char* CCONV ID3FrameInfo_ShortName (ID3_FrameID frameid); ---- a/src/c_wrapper.cpp -+++ b/src/c_wrapper.cpp -@@ -681,6 +681,39 @@ - } - } - -+ ID3_C_EXPORT bool CCONV -+ ID3Field_SetEncoding(ID3Field *field, ID3_TextEnc enc) -+ { -+ bool changed = false; -+ if (field) -+ { -+ ID3_CATCH(changed = reinterpret_cast(field)->SetEncoding(enc)); -+ } -+ return changed; -+ } -+ -+ ID3_C_EXPORT ID3_TextEnc CCONV -+ ID3Field_GetEncoding(const ID3Field *field) -+ { -+ ID3_TextEnc enc = ID3TE_NONE; -+ if (field) -+ { -+ ID3_CATCH(enc = reinterpret_cast(field)->GetEncoding()); -+ } -+ return enc; -+ } -+ -+ ID3_C_EXPORT bool CCONV -+ ID3Field_IsEncodable(const ID3Field *field) -+ { -+ bool isEncodable = false; -+ if (field) -+ { -+ ID3_CATCH(isEncodable = reinterpret_cast(field)->IsEncodable()); -+ } -+ return isEncodable; -+ } -+ - #ifdef __cplusplus - } - #endif /* __cplusplus */ -- cgit v1.2.3