Revert "more standard conform handling for dvb-text encodings"

[vuplus_dvbapp] / lib / base / estring.h

diff --git a/lib/base/estring.h b/lib/base/estring.h
index a0b161d..99b839b 100644 (file)
--- a/lib/base/estring.h
+++ b/lib/base/estring.h
@@ -6,13 +6,23 @@
 #include <stdio.h>
 #include "eerror.h"
 
+std::string buildShortName( const std::string &str );
+
 int strnicmp(const char*, const char*, int);
 
 std::string getNum(int num, int base=10);
-std::string convertDVBUTF8(const unsigned char *data, int len, int table=5);
-std::string convertUTF8DVB(const std::string &string);  // with default ISO8859-5
-std::string convertDVBUTF8(const std::string &s, int table=5);
+
+std::string convertDVBUTF8(const unsigned char *data, int len, int table=1, int tsidonid=0); // with default ISO8859-1 / Latin1
 std::string convertLatin1UTF8(const std::string &string);
 int isUTF8(const std::string &string);
 
+std::string removeDVBChars(const std::string &s);
+void makeUpper(std::string &s);
+std::string replace_all(const std::string &in, const std::string &entity, const std::string &symbol);
+
+inline std::string convertDVBUTF8(const std::string &string, int table=1, int tsidonid=0) // with default ISO8859-1 / Latin1
+{
+       return convertDVBUTF8((const unsigned char*)string.c_str(), string.length(), table, tsidonid);
+}
+
 #endif // __E_STRING__