X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3550753caccf5f770598d67f9f8093978534a1f9..80058dea34aae48ed729986a65112f0096f5b2d5:/lib/python/enigma_python.i diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index eee5ef00..cb87359e 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -40,6 +40,7 @@ is usually caused by not marking PSignals as immutable. #include #include #include +#include #include #include #include @@ -91,8 +92,10 @@ is usually caused by not marking PSignals as immutable. extern void runMainloop(); extern void quitMainloop(int exit_code); extern eApplication *getApplication(); - -extern PSignal1 &keyPressedSignal(); +extern int getPrevAsciiCode(); +extern int isUTF8(const std::string &); +extern std::string convertUTF8DVB(const std::string &, int); +extern std::string convertDVBUTF8(const unsigned char *data, int len, int table, int tsidonid); %} %feature("ref") iObject "$this->AddRef(); /* eDebug(\"AddRef (%s:%d)!\", __FILE__, __LINE__); */ " @@ -119,7 +122,7 @@ extern PSignal1 &keyPressedSignal(); 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 @@ -141,7 +144,6 @@ typedef long time_t; %template(eServiceCenterPtr) ePtr; %include - // TODO: embed these... %immutable eConsoleAppContainer::appClosed; %immutable eConsoleAppContainer::dataAvail; @@ -152,8 +154,12 @@ typedef long time_t; %immutable eComponentScan::newService; %immutable pNavigation::m_event; %immutable eListbox::selectionChanged; +%immutable eDVBCI_UI::ciStateChanged; +%immutable eDVBResourceManager::frontendUseMaskChanged; +%immutable eAVSwitch::vcr_sb_notifier; %include +%include %include %include %include @@ -252,12 +258,10 @@ void addFont(const char *filename, const char *alias, int scale_factor, int is_r /************** debug **************/ +int getPrevAsciiCode(); void runMainloop(); void quitMainloop(int exit_code); eApplication *getApplication(); -%immutable keyPressed; -PSignal1 &keyPressedSignal(); - %{ RESULT SwigFromPython(ePtr &result, PyObject *obj) {