mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

audio/taglib: Update to 2.0.1

Browse Source 
Remove RCC patches which have been an ongoing maintainence burden. Most
applications support ID3v2 tags these days.

PR:		276677
This commit is contained in:
Jason E. Hale 2024-06-04 16:20:53 -04:00
parent 9cf58e3f37
commit 332610a716
4 changed files with 28 additions and 700 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
audio/taglib/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= taglib
DISTVERSION= 1.13.1
DISTVERSION= 2.0.1
CATEGORIES= audio
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
https://taglib.org/releases/
@ -8,40 +8,26 @@ MAINTAINER= jhale@FreeBSD.org
COMMENT= Library for manipulating ID3 tags and Ogg comments
WWW= https://taglib.org/
LICENSE= LGPL21 MPL11
LICENSE_COMB= dual
LICENSE= LGPL21 MPL11
LICENSE_COMB= dual
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL
LICENSE_FILE_MPL11= ${WRKSRC}/COPYING.MPL
USES= cmake compiler:c++11-lang cpe pathfix
BUILD_DEPENDS= utf8cpp>0:devel/utf8cpp
USES= cmake compiler:c++17-lang cpe pathfix
USE_LDCONFIG= yes
CMAKE_ARGS= -DCMAKE_CXX_VISIBILITY_PRESET=hidden
CMAKE_ON= VISIBILITY_HIDDEN \
WITH_ASF \
WITH_MP4
CMAKE_ON= VISIBILITY_HIDDEN
OPTIONS_DEFINE= RCC STATIC TEST
OPTIONS_DEFINE= STATIC TEST
OPTIONS_SUB= yes
# The official patches for this can be obtained from:
# http://darksoft.org/files/rusxmms/patches/
#
RCC_DESC= Build with RusXMMS librcc patches (experimental)
RCC_LIB_DEPENDS= librcc.so:devel/librcc
RCC_USES= localbase:ldflags
RCC_EXTRA_PATCHES= ${FILESDIR}/extrapatch-rcc
STATIC_CMAKE_BOOL_OFF= BUILD_SHARED_LIBS
TEST_BUILD_DEPENDS= cppunit-config:devel/cppunit
TEST_CMAKE_BOOL= BUILD_TESTING
TEST_TEST_TARGET= check
post-patch-RCC-on:
@${REINPLACE_CMD} -e 's|-ltag|-ltag -lrcc|g' \
${WRKSRC}/taglib.pc.cmake ${WRKSRC}/taglib-config.cmake
@${REINPLACE_CMD} -e 's|-ltag_c|-ltag_c -lrcc|g' \
${WRKSRC}/bindings/c/taglib_c.pc.cmake
.include <bsd.port.mk>

6
audio/taglib/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1688325610
SHA256 (taglib-1.13.1.tar.gz) = c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
SIZE (taglib-1.13.1.tar.gz) = 1372618
TIMESTAMP = 1717381906
SHA256 (taglib-2.0.1.tar.gz) = 08c0a27b96aa5c4e23060fe0b6f93102ee9091a9385257b9d0ddcf467de0d925
SIZE (taglib-2.0.1.tar.gz) = 1432624

668
audio/taglib/files/extrapatch-rcc
View File

@ -1,668 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 832af866..d02ccaf1 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -139,6 +139,8 @@ if(NOT BUILD_FRAMEWORK)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
endif()
+SET(HAVE_LIBRCC 1)
+
include_directories(${CMAKE_CURRENT_BINARY_DIR})
configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h")
diff --git a/config.h.cmake b/config.h.cmake
index 8d8c36ab..ccae081b 100644
--- config.h.cmake
+++ config.h.cmake
@@ -29,6 +29,9 @@
/* Indicates whether debug messages are shown even in release mode */
#cmakedefine TRACE_IN_RELEASE 1
+/* Defined if you have LibRCC from RusXMMS project */
+#cmakedefine HAVE_LIBRCC 1
+
#cmakedefine TESTS_DIR "@TESTS_DIR@"
#endif
diff --git a/examples/tagreader_c.c b/examples/tagreader_c.c
index 04369926..e0f17d82 100644
--- examples/tagreader_c.c
+++ examples/tagreader_c.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
TagLib_Tag *tag;
const TagLib_AudioProperties *properties;
- taglib_set_strings_unicode(FALSE);
+ //taglib_set_strings_unicode(FALSE);
for(i = 1; i < argc; i++) {
printf("******************** \"%s\" ********************\n", argv[i]);
diff --git a/examples/tagwriter.cpp b/examples/tagwriter.cpp
index ed8b0d7a..6a7a2632 100644
--- examples/tagwriter.cpp
+++ examples/tagwriter.cpp
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
if(isArgument(argv[i]) && i + 1 < argc && !isArgument(argv[i + 1])) {
char field = argv[i][1];
- TagLib::String value = argv[i + 1];
+ TagLib::String value(argv[i + 1], TagLib::String::Locale);
TagLib::List<TagLib::FileRef>::ConstIterator it;
for(it = fileList.begin(); it != fileList.end(); ++it) {
diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
index ea1ab838..2f7bad07 100644
--- taglib/CMakeLists.txt
+++ taglib/CMakeLists.txt
@@ -39,6 +39,7 @@ set(tag_HDRS
audioproperties.h
taglib_export.h
${CMAKE_CURRENT_BINARY_DIR}/../taglib_config.h
+ toolkit/rccpatch.h
toolkit/taglib.h
toolkit/tstring.h
toolkit/tlist.h
@@ -295,6 +296,7 @@ set(xm_SRCS
)
set(toolkit_SRCS
+ toolkit/rccpatch.cpp
toolkit/tstring.cpp
toolkit/tstringlist.cpp
toolkit/tbytevector.cpp
@@ -338,7 +340,9 @@ add_library(tag ${tag_LIB_SRCS} ${tag_HDRS})
set_property(TARGET tag PROPERTY CXX_STANDARD 98)
if(HAVE_ZLIB AND NOT HAVE_ZLIB_SOURCE)
- target_link_libraries(tag ${ZLIB_LIBRARIES})
+ target_link_libraries(tag rcc ${ZLIB_LIBRARIES})
+else()
+ target_link_libraries(tag rcc)
endif()
set_target_properties(tag PROPERTIES
diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp
index 667adfa6..8b2ceef5 100644
--- taglib/mpeg/id3v1/id3v1tag.cpp
+++ taglib/mpeg/id3v1/id3v1tag.cpp
@@ -69,14 +69,14 @@ StringHandler::StringHandler()
String ID3v1::StringHandler::parse(const ByteVector &data) const
{
- return String(data, String::Latin1).stripWhiteSpace();
+ return String(data, String::Latin1ID3).stripWhiteSpace();
}
ByteVector ID3v1::StringHandler::render(const String &s) const
{
- if(s.isLatin1())
- return s.data(String::Latin1);
- return ByteVector();
+ if(!s.isLatin1() && String::ID3WType(String::Latin1) == String::Latin1)
+ return ByteVector();
+ return s.data(String::Latin1ID3);
}
////////////////////////////////////////////////////////////////////////////////
@@ -259,7 +259,7 @@ void ID3v1::Tag::parse(const ByteVector &data)
d->track = static_cast<unsigned char>(data[offset + 29]);
}
else
- d->comment = data.mid(offset, 30);
+ d->comment = stringHandler->parse(data.mid(offset, 30));
offset += 30;
diff --git a/taglib/mpeg/id3v2/frames/commentsframe.cpp b/taglib/mpeg/id3v2/frames/commentsframe.cpp
index add0bf2f..b641c49d 100644
--- taglib/mpeg/id3v2/frames/commentsframe.cpp
+++ taglib/mpeg/id3v2/frames/commentsframe.cpp
@@ -150,10 +150,10 @@ void CommentsFrame::parseFields(const ByteVector &data)
return;
}
- d->textEncoding = static_cast<String::Type>(data[0]);
+ d->textEncoding = String::ID3Type(data[0]);
d->language = data.mid(1, 3);
- int byteAlign = d->textEncoding == String::Latin1 || d->textEncoding == String::UTF8 ? 1 : 2;
+ int byteAlign = (d->textEncoding == String::Latin1 || d->textEncoding == String::Latin1ID3 || d->textEncoding == String::Latin1ID3V2 || d->textEncoding == String::UTF8) ? 1 : 2;
ByteVectorList l = ByteVectorList::split(data.mid(4), textDelimiter(d->textEncoding), byteAlign, 2);
@@ -174,10 +174,12 @@ ByteVector CommentsFrame::renderFields() const
String::Type encoding = d->textEncoding;
+ encoding = String::ID3WType(encoding);
+
encoding = checkTextEncoding(d->description, encoding);
encoding = checkTextEncoding(d->text, encoding);
- v.append(static_cast<char>(encoding));
+ v.append(static_cast<char>(String::ID3RealType(encoding)));
v.append(d->language.size() == 3 ? d->language : "XXX");
v.append(d->description.data(encoding));
v.append(textDelimiter(encoding));
diff --git a/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
index cda40d95..6ac15400 100644
--- taglib/mpeg/id3v2/frames/textidentificationframe.cpp
+++ taglib/mpeg/id3v2/frames/textidentificationframe.cpp
@@ -194,12 +194,12 @@ void TextIdentificationFrame::parseFields(const ByteVector &data)
// read the string data type (the first byte of the field data)
- d->textEncoding = static_cast<String::Type>(data[0]);
+ d->textEncoding = String::ID3Type(data[0]);
// split the byte array into chunks based on the string type (two byte delimiter
// for unicode encodings)
- int byteAlign = d->textEncoding == String::Latin1 || d->textEncoding == String::UTF8 ? 1 : 2;
+ int byteAlign = (d->textEncoding == String::Latin1 || d->textEncoding == String::Latin1ID3 || d->textEncoding == String::Latin1ID3V2 || d->textEncoding == String::UTF8) ? 1 : 2;
// build a small counter to strip nulls off the end of the field
@@ -250,11 +250,14 @@ void TextIdentificationFrame::parseFields(const ByteVector &data)
ByteVector TextIdentificationFrame::renderFields() const
{
- String::Type encoding = checkTextEncoding(d->fieldList, d->textEncoding);
+ String::Type encoding = d->textEncoding;
+
+ encoding = String::ID3WType(encoding);
+ encoding = checkTextEncoding(d->fieldList, encoding);
ByteVector v;
- v.append(static_cast<char>(encoding));
+ v.append(static_cast<char>(String::ID3RealType(encoding)));
for(StringList::ConstIterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) {
diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp
index c3a45a2a..fac929b9 100644
--- taglib/mpeg/id3v2/id3v2frame.cpp
+++ taglib/mpeg/id3v2/id3v2frame.cpp
@@ -297,7 +297,7 @@ String::Type Frame::checkEncoding(const StringList &fields, String::Type encodin
if((encoding == String::UTF8 || encoding == String::UTF16BE) && version != 4)
return String::UTF16;
- if(encoding != String::Latin1)
+ if((encoding != String::Latin1)&&(encoding != String::Latin1ID3V2))
return encoding;
for(StringList::ConstIterator it = fields.begin(); it != fields.end(); ++it) {
diff --git a/taglib/toolkit/rccpatch.cpp b/taglib/toolkit/rccpatch.cpp
new file mode 100644
index 00000000..972874e3
--- /dev/null
+++ taglib/toolkit/rccpatch.cpp
@@ -0,0 +1,237 @@
+#include <stdlib.h>
+
+#include <string>
+#include "tstring.h"
+#include "tbytevector.h"
+
+//#define RCC_DEBUG
+
+
+#ifndef HAVE_LIBRCC
+# include <config.h>
+#endif
+
+#ifdef HAVE_LIBRCC
+# ifdef RCC_DEBUG
+# include <stdio.h>
+# endif /* RCC_DEBUG */
+# include <librcc.h>
+# include <string.h>
+#endif /* HAVE_LIBRCC */
+
+
+#ifdef HAVE_LIBRCC
+# define ID3_CLASS 0
+# define ID3V2_CLASS 1
+# define UTF_CLASS 2
+# define OUT_CLASS 3
+static rcc_class classes[] = {
+ { "id3", RCC_CLASS_STANDARD, NULL, NULL, "ID3 Encoding", 0 },
+ { "id3v2", RCC_CLASS_STANDARD, "id3", NULL, "ID3 v.2 Encoding", 0 },
+ { "utf", RCC_CLASS_KNOWN, "UTF-8", NULL, "Unicode Encoding", 0},
+ { "out", RCC_CLASS_TRANSLATE_LOCALE, "LC_CTYPE", NULL, "Output Encoding", 0 },
+ { NULL, RCC_CLASS_STANDARD, NULL, NULL, NULL, 0 }
+};
+
+static int rcc_initialized = 0;
+
+static rcc_context ctx = NULL;
+#endif /* HAVE_LIBRCC */
+
+
+void rccTaglibPatchFree() {
+#ifdef HAVE_LIBRCC
+ if (rcc_initialized) {
+ rccFree();
+ rcc_initialized = 0;
+ }
+#endif /* HAVE_LIBRCC */
+}
+
+void rccTaglibPatchInit() {
+#ifdef HAVE_LIBRCC
+ if (rcc_initialized) return;
+ rccInit();
+ rccInitDefaultContext(NULL, 0, 0, classes, 0);
+ rccLoad(NULL, "xmms");
+ rccInitDb4(NULL, NULL, 0);
+ rcc_initialized = 1;
+#endif /* HAVE_LIBRCC */
+}
+
+void rccTaglibPatchSetContext(void *newctx) {
+#ifdef HAVE_LIBRCC
+ if (newctx) {
+ ctx = (rcc_context)newctx;
+ rcc_initialized = 1;
+ }
+#endif /* HAVE_LIBRCC */
+}
+
+static void rccTaglibPatchTryInit() {
+#ifdef HAVE_LIBRCC
+ if (!rcc_initialized) {
+ rccTaglibPatchInit();
+ if (rcc_initialized) atexit(rccTaglibPatchFree);
+ }
+#endif /* HAVE_LIBRCC */
+}
+
+
+TagLib::ByteVector rccTaglibPatchRecodeOutput(const std::string &s) {
+ TagLib::ByteVector v;
+#ifdef HAVE_LIBRCC
+ size_t rlen;
+ char *res;
+
+ rccTaglibPatchTryInit();
+
+ res = rccSizedRecode(ctx, UTF_CLASS, OUT_CLASS, s.c_str(), s.length(), &rlen);
+#ifdef RCC_DEBUG
+ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) {
+ if (*c > 127) {
+ printf(" Output: %s - %s\n", s.c_str(), res?res:"null");
+ break;
+ }
+ }
+#endif /* RCC_DEBUG */
+
+ if (res) v.setData(res, rlen);
+ else v.setData("", 0);
+ //v.setData(s.c_str(), s.length());
+
+ return v;
+#else
+ v.setData("", 0);
+
+ return v;
+#endif /* HAVE_LIBRCC */
+}
+
+TagLib::ByteVector rccTaglibPatchRecodeOutputID3(const std::string &s, bool v2 = false) {
+ TagLib::ByteVector v;
+#ifdef HAVE_LIBRCC
+ size_t rlen;
+ char *res;
+
+ rccTaglibPatchTryInit();
+
+ res = rccSizedRecode(ctx, UTF_CLASS, v2?ID3V2_CLASS:ID3_CLASS, s.c_str(), s.length(), &rlen);
+#ifdef RCC_DEBUG
+ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) {
+ if (*c > 127) {
+ printf(" OutputID3(%i): %s - %s\n", v2, s.c_str(), res?res:"null");
+ break;
+ }
+ }
+#endif /* RCC_DEBUG */
+
+ if (res) v.setData(res, rlen);
+ else v.setData("", 0);
+ //v.setData(s.c_str(), s.length());
+
+ return v;
+#else
+ v.setData("", 0);
+
+ return v;
+#endif /* HAVE_LIBRCC */
+}
+
+TagLib::ByteVector rccTaglibPatchRecodeInput(const std::string &s) {
+ TagLib::ByteVector v;
+#ifdef HAVE_LIBRCC
+ size_t rlen;
+ char *res;
+
+ rccTaglibPatchTryInit();
+
+ res = rccSizedRecode(ctx, OUT_CLASS, UTF_CLASS, s.c_str(), s.length(), &rlen);
+#ifdef RCC_DEBUG
+ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) {
+ if (*c > 127) {
+ printf(" Input: %s - %s\n", s.c_str(), res?res:"null");
+ break;
+ }
+ }
+#endif /* RCC_DEBUG */
+
+ if (res) v.setData(res, rlen);
+ else
+#endif /* HAVE_LIBRCC */
+ v.setData("", 0);
+
+ return v;
+}
+
+TagLib::ByteVector rccTaglibPatchRecodeInputID3(const std::string &s, bool v2 = false) {
+ TagLib::ByteVector v;
+#ifdef HAVE_LIBRCC
+ size_t rlen;
+ char *res;
+
+ rccTaglibPatchTryInit();
+
+ res = rccSizedRecode(ctx, v2?ID3V2_CLASS:ID3_CLASS, UTF_CLASS, s.c_str(), s.length(), &rlen);
+#ifdef RCC_DEBUG
+ for (const unsigned char *c = (const unsigned char*)s.c_str(); *c; c++) {
+ if (*c > 127) {
+ printf(" InputID3(%i): %s - %s\n", v2, s.c_str(), res?res:"null");
+ break;
+ }
+ }
+#endif /* RCC_DEBUG */
+ if (res) v.setData(res, rlen + 1);
+ else
+#endif /* HAVE_LIBRCC */
+ v.setData("", 0);
+
+ return v;
+}
+
+TagLib::String::Type rccTaglibPatchGetLocaleType() {
+#ifdef HAVE_LIBRCC
+ size_t len;
+ char charset[32];
+
+ rccTaglibPatchTryInit();
+ if (!rccLocaleGetCharset(charset, NULL, 31)) {
+ if (!strncmp(charset, "UTF", 3)) {
+ len = strlen(charset);
+
+ if (charset[len-1]=='8') return TagLib::String::UTF8;
+ if (!strcmp(charset+(len-2),"16")) return TagLib::String::UTF16;
+ if (!strcmp(charset+(len-4),"16LE")) return TagLib::String::UTF16LE;
+ if (!strcmp(charset+(len-4),"16BE")) return TagLib::String::UTF16BE;
+ }
+ return TagLib::String::Latin1;
+ }
+#endif /* HAVE_LIBRCC */
+ return TagLib::String::UTF8;
+}
+
+TagLib::String::Type rccTaglibPatchGetID3Type() {
+#ifdef HAVE_LIBRCC
+ size_t len;
+ const char *charset;
+
+ rccTaglibPatchTryInit();
+
+ charset = rccGetCurrentCharsetName(ctx, ID3V2_CLASS);
+ if (charset) {
+ if (!strncmp(charset, "UTF", 3)) {
+ len = strlen(charset);
+
+ if (charset[len-1]=='8') return TagLib::String::UTF8;
+ if (!strcmp(charset+(len-2),"16")) return TagLib::String::UTF16;
+ if (!strcmp(charset+(len-4),"16LE")) return TagLib::String::UTF16LE;
+ if (!strcmp(charset+(len-4),"16BE")) return TagLib::String::UTF16BE;
+ }
+ return TagLib::String::Latin1ID3V2;
+ } else {
+ // Error or no-language configured: If Latin1ID3V2 is returned we normally will use the default unicode encoding unless Latin1 is selected by taglib
+ return TagLib::String::Latin1ID3V2;
+ }
+#endif /* HAVE_LIBRCC */
+ return TagLib::String::Latin1;
+}
diff --git a/taglib/toolkit/rccpatch.h b/taglib/toolkit/rccpatch.h
new file mode 100644
index 00000000..31f44106
--- /dev/null
+++ taglib/toolkit/rccpatch.h
@@ -0,0 +1,20 @@
+#ifndef _RCC_PATCH_H
+#define _RCC_PATCH_H
+
+#include <string.h>
+#include "tstring.h"
+#include "tbytevector.h"
+
+void rccTaglibPatchFree();
+void rccTaglibPatchInit();
+void rccTaglibPatchSetContext(void *newctx);
+
+TagLib::ByteVector rccTaglibPatchRecodeOutput(const std::string &s);
+TagLib::ByteVector rccTaglibPatchRecodeInput(const std::string &s);
+TagLib::ByteVector rccTaglibPatchRecodeOutputID3(const std::string &s, bool v2 = false);
+TagLib::ByteVector rccTaglibPatchRecodeInputID3(const std::string &s, bool v2 = false);
+
+TagLib::String::Type rccTaglibPatchGetLocaleType();
+TagLib::String::Type rccTaglibPatchGetID3Type();
+
+#endif /* _RCC_PATCH_H */
diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index 212c186f..690720ec 100644
--- taglib/toolkit/tstring.cpp
+++ taglib/toolkit/tstring.cpp
@@ -33,6 +33,7 @@
#include <trefcounter.h>
#include <tutils.h>
+#include "rccpatch.h"
#include "tstring.h"
namespace
@@ -47,14 +48,36 @@ namespace
return String::UTF16BE;
}
+ void copyFromUTF8(std::wstring &data, const char *s, size_t length);
+
// Converts a Latin-1 string into UTF-16(without BOM/CPU byte order)
// and copies it to the internal buffer.
- void copyFromLatin1(std::wstring &data, const char *s, size_t length)
+ void copyFromLatin1(std::wstring &data, const char *s, size_t length, bool prepare = false, String::Type t = String::Latin1)
{
data.resize(length);
for(size_t i = 0; i < length; ++i)
data[i] = static_cast<unsigned char>(s[i]);
+
+
+ // librcc conversation
+ if (prepare) {
+
+ ByteVector v;
+ std::string str = std::string(s, length);
+
+ if (t == String::Latin1ID3) v = rccTaglibPatchRecodeInputID3(str, false);
+ else if (t == String::Latin1ID3V2) v = rccTaglibPatchRecodeInputID3(str, true);
+ else /* Latin1 converted from Locale */ v = rccTaglibPatchRecodeInput(str);
+
+ if (v.size()) {
+ copyFromUTF8(data, v.data(), v.size());
+ } else {
+ // We don't know if we got UTF-8 encoded string or either rcc is disable or something is failed,
+ // since standard applications are really expecting here Latin1, it is safe to just check if we have violations of UTF8
+ //if (Unicode::isLegalUTF8(s)) t = UTF8;
+ }
+ }
}
// Converts a UTF-8 string into UTF-16(without BOM/CPU byte order)
@@ -174,8 +197,11 @@ String::String(const String &s) :
String::String(const std::string &s, Type t) :
d(new StringPrivate())
{
- if(t == Latin1)
- copyFromLatin1(d->data, s.c_str(), s.length());
+ if(t == Locale)
+ t = rccTaglibPatchGetLocaleType();
+
+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+ copyFromLatin1(d->data, s.c_str(), s.length(), true, t);
else if(t == String::UTF8)
copyFromUTF8(d->data, s.c_str(), s.length());
else {
@@ -222,8 +248,11 @@ String::String(const wchar_t *s, Type t) :
String::String(const char *s, Type t) :
d(new StringPrivate())
{
- if(t == Latin1)
- copyFromLatin1(d->data, s, ::strlen(s));
+ if(t == Locale)
+ t = rccTaglibPatchGetLocaleType();
+
+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+ copyFromLatin1(d->data, s, ::strlen(s), true, t);
else if(t == String::UTF8)
copyFromUTF8(d->data, s, ::strlen(s));
else {
@@ -259,8 +288,12 @@ String::String(const ByteVector &v, Type t) :
if(v.isEmpty())
return;
- if(t == Latin1)
- copyFromLatin1(d->data, v.data(), v.size());
+ if(t == Locale)
+ t = rccTaglibPatchGetLocaleType();
+
+ if(t == Latin1 || t == Latin1ID3 || t == Latin1ID3V2)
+ copyFromLatin1(d->data, v.data(), v.size(), true, t);
+
else if(t == UTF8)
copyFromUTF8(d->data, v.data(), v.size());
else
@@ -412,8 +445,38 @@ bool String::isNull() const
ByteVector String::data(Type t) const
{
- switch(t)
- {
+ ByteVector v;
+
+ if (t == Locale) {
+ // The source is either Unicode or real Latin1 (if rcc is bypassed)
+ std::string s = to8Bit(true);
+
+ // In case of UTF8 locale, this probably will return NULL (no recoding needed), but we will take UTF8 path in the next swtich
+ v = rccTaglibPatchRecodeOutput(s);
+ if (v.size()) return v;
+
+ t = rccTaglibPatchGetLocaleType();
+ }
+
+ switch(t) {
+ case Latin1ID3:
+ case Latin1ID3V2:
+ {
+ std::string s = to8Bit(true);
+ if (t == Latin1ID3) v = rccTaglibPatchRecodeOutputID3(s, false);
+ else if (t == Latin1ID3V2) v = rccTaglibPatchRecodeOutputID3(s, true);
+ if (v.size())
+ return v;
+
+ // we don't know if we got NULL because rcc is disabled (error) or UTF8 output is required
+ if ((t == Latin1ID3V2)&&(rccTaglibPatchGetID3Type() == UTF8)) {
+ v.setData(s.c_str(), s.length());
+ } else {
+ for(wstring::const_iterator it = d->data.begin(); it != d->data.end(); it++)
+ v.append(char(*it));
+ }
+ return v;
+ }
case Latin1:
{
ByteVector v(size(), 0);
@@ -737,7 +800,33 @@ TagLib::String operator+(const TagLib::String &s1, const char *s2)
std::ostream &operator<<(std::ostream &s, const TagLib::String &str)
{
- s << str.to8Bit();
+ TagLib::ByteVector bv = str.data(TagLib::String::Locale);
+ s << bv;
return s;
}
+TagLib::String::Type TagLib::String::ID3Type(int i)
+{
+ if(i == Latin1)
+ return Latin1ID3V2;
+ return Type(i);
+};
+
+TagLib::String::Type TagLib::String::ID3WType(Type type)
+{
+ Type rcc_type = rccTaglibPatchGetID3Type();
+ if((rcc_type == Latin1ID3)||(rcc_type == Latin1ID3V2)||(rcc_type == Latin1)) {
+ if(type == Latin1) return
+ rcc_type;
+ return type;
+ }
+
+ return rcc_type;
+};
+
+TagLib::String::Type TagLib::String::ID3RealType(Type type)
+{
+ if((type == Latin1ID3) || (type == Latin1ID3V2))
+ return Latin1;
+ return type;
+}
diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h
index e3853d80..b8eb70df 100644
--- taglib/toolkit/tstring.h
+++ taglib/toolkit/tstring.h
@@ -95,6 +95,18 @@ namespace TagLib {
* ID3v1 is assumed to be Latin1 and Ogg Vorbis comments use UTF8.
*/
enum Type {
+ /*!
+ * Determine using current locale settings
+ */
+ Locale = -1,
+ /*!
+ * Latin1 for ID3 tags.
+ */
+ Latin1ID3 = 65,
+ /*!
+ * Latin1 for ID3v2 tags.
+ */
+ Latin1ID3V2 = 66,
/*!
* IS08859-1, or <i>Latin1</i> encoding. 8 bit characters.
*/
@@ -118,6 +130,10 @@ namespace TagLib {
UTF16LE = 4
};
+ static Type ID3Type(int i);
+ static Type ID3WType(Type type);
+ static Type ID3RealType(Type type);
+
/*!
* Constructs an empty String.
*/

24
audio/taglib/pkg-plist
View File

@ -15,6 +15,11 @@ include/taglib/attachedpictureframe.h
include/taglib/audioproperties.h
include/taglib/chapterframe.h
include/taglib/commentsframe.h
include/taglib/dsdiffdiintag.h
include/taglib/dsdifffile.h
include/taglib/dsdiffproperties.h
include/taglib/dsffile.h
include/taglib/dsfproperties.h
include/taglib/eventtimingcodesframe.h
include/taglib/fileref.h
include/taglib/flacfile.h
@ -43,6 +48,7 @@ include/taglib/mp4atom.h
include/taglib/mp4coverart.h
include/taglib/mp4file.h
include/taglib/mp4item.h
include/taglib/mp4itemfactory.h
include/taglib/mp4properties.h
include/taglib/mp4tag.h
include/taglib/mpcfile.h
@ -60,7 +66,6 @@ include/taglib/ownershipframe.h
include/taglib/podcastframe.h
include/taglib/popularimeterframe.h
include/taglib/privateframe.h
%%RCC%%include/taglib/rccpatch.h
include/taglib/relativevolumeframe.h
include/taglib/rifffile.h
include/taglib/s3mfile.h
@ -72,7 +77,6 @@ include/taglib/tableofcontentsframe.h
include/taglib/tag.h
include/taglib/tag_c.h
include/taglib/taglib.h
include/taglib/taglib_config.h
include/taglib/taglib_export.h
include/taglib/tbytevector.h
include/taglib/tbytevectorlist.h
@ -86,12 +90,14 @@ include/taglib/tlist.h
include/taglib/tlist.tcc
include/taglib/tmap.h
include/taglib/tmap.tcc
include/taglib/tpicturetype.h
include/taglib/tpropertymap.h
include/taglib/trefcounter.h
include/taglib/trueaudiofile.h
include/taglib/trueaudioproperties.h
include/taglib/tstring.h
include/taglib/tstringlist.h
include/taglib/tvariant.h
include/taglib/tversionnumber.h
include/taglib/uniquefileidentifierframe.h
include/taglib/unknownframe.h
include/taglib/unsynchronizedlyricsframe.h
@ -106,13 +112,17 @@ include/taglib/xingheader.h
include/taglib/xiphcomment.h
include/taglib/xmfile.h
include/taglib/xmproperties.h
lib/cmake/taglib/taglib-config-version.cmake
lib/cmake/taglib/taglib-config.cmake
lib/cmake/taglib/taglib-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/taglib/taglib-targets.cmake
%%STATIC%%lib/libtag.a
%%NO_STATIC%%lib/libtag.so
%%NO_STATIC%%lib/libtag.so.1
%%NO_STATIC%%lib/libtag.so.1.19.1
%%NO_STATIC%%lib/libtag.so.2
%%NO_STATIC%%lib/libtag.so.2.0.1
%%STATIC%%lib/libtag_c.a
%%NO_STATIC%%lib/libtag_c.so
%%NO_STATIC%%lib/libtag_c.so.0
%%NO_STATIC%%lib/libtag_c.so.0.0.0
%%NO_STATIC%%lib/libtag_c.so.2
%%NO_STATIC%%lib/libtag_c.so.2.0.1
libdata/pkgconfig/taglib.pc
libdata/pkgconfig/taglib_c.pc