git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
speedup show satellite-/ providerlist
[enigma2.git]
/
lib
/
python
/
enigma_python.i
diff --git
a/lib/python/enigma_python.i
b/lib/python/enigma_python.i
index ad41229350dce5270b5ef82d1a062cadbe1adc1f..3772a23dc8d9680fb0f77e0bc82761896e89a3b0 100644
(file)
--- 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 <lib/gdi/lcd.h>
#include <lib/dvb_ci/dvbci_ui.h>
#include <lib/python/python.h>
#include <lib/gdi/lcd.h>
#include <lib/dvb_ci/dvbci_ui.h>
#include <lib/python/python.h>
+#include <lib/gdi/picexif.h>
+#include <lib/gdi/picload.h>
extern void runMainloop();
extern void quitMainloop(int exit_code);
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
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
%enddef
@@
-155,6
+157,8
@@
typedef long time_t;
%immutable pNavigation::m_event;
%immutable eListbox::selectionChanged;
%immutable eDVBCI_UI::ciStateChanged;
%immutable pNavigation::m_event;
%immutable eListbox::selectionChanged;
%immutable eDVBCI_UI::ciStateChanged;
+%immutable eDVBResourceManager::frontendUseMaskChanged;
+%immutable eAVSwitch::vcr_sb_notifier;
%include <lib/base/console.h>
%include <lib/base/nconfig.h>
%include <lib/base/console.h>
%include <lib/base/nconfig.h>
@@
-205,6
+209,8
@@
typedef long time_t;
%include <lib/dvb_ci/dvbci_ui.h>
%include <lib/dvb/db.h>
%include <lib/python/python.h>
%include <lib/dvb_ci/dvbci_ui.h>
%include <lib/dvb/db.h>
%include <lib/python/python.h>
+%include <lib/gdi/picexif.h>
+%include <lib/gdi/picload.h>
/************** eptr **************/
%template(eActionMapPtr) ePtr<eActionMap>;
/************** eptr **************/
%template(eActionMapPtr) ePtr<eActionMap>;
@@
-260,17
+266,7
@@
int getPrevAsciiCode();
void runMainloop();
void quitMainloop(int exit_code);
eApplication *getApplication();
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<gPixmap> &result, PyObject *obj)
{
ePtr<gPixmap> *res;
RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
{
ePtr<gPixmap> *res;