X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6798f163cf317e89a65d38377fb3dc1475b37ae6..f50ae710c1bfbbccb9f25302ff038235845224d4:/lib/python/enigma_python.i diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index ad412293..3772a23d 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -88,6 +88,8 @@ is usually caused by not marking PSignals as immutable. #include #include #include +#include +#include extern void runMainloop(); extern void quitMainloop(int exit_code); @@ -122,7 +124,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 @@ -155,6 +157,8 @@ typedef long time_t; %immutable pNavigation::m_event; %immutable eListbox::selectionChanged; %immutable eDVBCI_UI::ciStateChanged; +%immutable eDVBResourceManager::frontendUseMaskChanged; +%immutable eAVSwitch::vcr_sb_notifier; %include %include @@ -205,6 +209,8 @@ typedef long time_t; %include %include %include +%include +%include /************** eptr **************/ %template(eActionMapPtr) ePtr; @@ -260,17 +266,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?text.c_str():"", len, table, 0); -} - RESULT SwigFromPython(ePtr &result, PyObject *obj) { ePtr *res;