X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f94e2c9821eb8784ca03b7122485d4720ec6d6e6..b14f1520fe0dabd185ab3555c9d2dd8ab5276dd0:/lib/base/estring.cpp

diff --git a/lib/base/estring.cpp b/lib/base/estring.cpp
index 10bfbef8..487dceec 100644
--- a/lib/base/estring.cpp
+++ b/lib/base/estring.cpp
@@ -5,6 +5,24 @@
 #include <lib/base/encoding.h>
 #include <lib/base/estring.h>
 
+std::string buildShortName( const std::string &str )
+{
+	std::string tmp;
+	static char stropen[3] = { 0xc2, 0x86, 0x00 };
+	static char strclose[3] = { 0xc2, 0x87, 0x00 };
+	unsigned int open=std::string::npos-1;
+	while ( (open = str.find(stropen, open+2)) != std::string::npos )
+	{
+		unsigned int close = str.find(strclose, open);
+		if ( close != std::string::npos )
+		{
+			tmp+=str.substr( open+2, close-(open+2) );
+			eDebug("now %s", tmp.c_str());
+		}
+	}
+	return tmp.length() ? tmp : str;
+}
+
 std::string getNum(int val, int sys)
 {
 //	Returns a string that contain the value val as string
@@ -334,19 +352,21 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts
 
 	switch(data[0])
 	{
-		case 1 ... 12:
+		case 1 ... 11:
 			table=data[i++]+4;
-//			eDebug("(1..12)text encoded in ISO-8859-%d",table);
+//			eDebug("(1..11)text encoded in ISO-8859-%d",table);
 			break;
 		case 0x10:
 		{
 //			eDebug("(0x10)text encoded in ISO-8859-%d",n);
-			int n=(data[++i]<<8)|(data[++i]);
+			int n=(data[++i]<<8);
+			n |= (data[++i]);
 			++i;
 			switch(n)
 			{
 				case 12:
 					eDebug("unsup. ISO8859-12 enc.", n);
+					break;
 				default:
 					table=n;
 					break;
@@ -369,9 +389,11 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts
 			++i;
 			eDebug("unsup. Big5 subset of ISO/IEC 10646-1 enc.");
 			break;
+		case 0x15: // UTF-8 encoding of ISO/IEC 10646-1
+			return std::string((char*)data+1, len-1);
 		case 0x0:
-		case 0xD ... 0xF:
-		case 0x15 ... 0x1F:
+		case 0xC ... 0xF:
+		case 0x16 ... 0x1F:
 			eDebug("reserved %d", data[0]);
 			++i;
 			break;
@@ -521,7 +543,7 @@ std::string convertLatin1UTF8(const std::string &string)
 
 	while (i < len)
 	{
-		unsigned long code=string[i++];
+		unsigned long code=(unsigned char)string[i++];
 				// Unicode->UTF8 encoding
 		if (code < 0x80) // identity latin <-> utf8 mapping
 			res[t++]=char(code);