X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2Fenigma_python.i;h=103889b99a5386efba7a71eb5ef4c25b00fa5c6a;hb=25537984665b96b798b62bb904a7f00fc305b9a3;hp=89aef414479881f947c81cec461a6989ac3fcfe6;hpb=2bc720f79ea42168572ba458fec5b2cffb175a04;p=vuplus_dvbapp diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index 89aef41..103889b 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -122,7 +122,7 @@ extern std::string convertDVBUTF8(const unsigned char *data, int len, int table, fragment="t_output_helper") {} %typemap(argout,fragment="t_out_helper"{Type}) Type *OUTPUT, Type &OUTPUT // generate None if smartpointer is NULL - "$result = t_output_helper($result, ((*$1) ? SWIG_NewPointerObj((void*)($1), $1_descriptor, 1) : (Py_INCREF(Py_None), Py_None)));" + "$result = t_output_helper($result, ((*$1) ? SWIG_NewPointerObj((void*)($1), $1_descriptor, 1) : (delete $1, Py_INCREF(Py_None), Py_None)));" %enddef @@ -261,17 +261,7 @@ int getPrevAsciiCode(); void runMainloop(); void quitMainloop(int exit_code); eApplication *getApplication(); -int isUTF8(const std::string &); -std::string convertUTF8DVB(const std::string &, int); -std::string convertDVBUTF8(std::string text, int table); %{ - -std::string convertDVBUTF8(std::string text, int table) -{ - int len = text.length(); - return convertDVBUTF8(len?(unsigned char*)text.c_str():(unsigned char*)"", len, table, 0); -} - RESULT SwigFromPython(ePtr &result, PyObject *obj) { ePtr *res;