git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
recording service events now working
[enigma2.git]
/
lib
/
python
/
enigma_python.i
diff --git
a/lib/python/enigma_python.i
b/lib/python/enigma_python.i
index 06d844738e723498cca6fc5676ef901dadeccdec..21c0664a9c2aa4c08cb4a9e0b6aad66dbcd90948 100644
(file)
--- a/
lib/python/enigma_python.i
+++ b/
lib/python/enigma_python.i
@@
-88,13
+88,16
@@
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 eApplication *getApplication();
extern void runMainloop();
extern void quitMainloop(int exit_code);
extern eApplication *getApplication();
-
-extern PSignal1<void,int> &keyPressedSignal();
extern int getPrevAsciiCode();
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__); */ "
%}
%feature("ref") iObject "$this->AddRef(); /* eDebug(\"AddRef (%s:%d)!\", __FILE__, __LINE__); */ "
@@
-121,7
+124,7
@@
extern int getPrevAsciiCode();
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
@@
-152,8
+155,11
@@
typedef long time_t;
%immutable eComponentScan::statusChanged;
%immutable eComponentScan::newService;
%immutable pNavigation::m_event;
%immutable eComponentScan::statusChanged;
%immutable eComponentScan::newService;
%immutable pNavigation::m_event;
+%immutable pNavigation::m_record_event;
%immutable eListbox::selectionChanged;
%immutable eDVBCI_UI::ciStateChanged;
%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>
@@
-204,6
+210,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>;
@@
-245,6
+253,12
@@
public:
PyObject *get();
};
PyObject *get();
};
+%template(PSignal2VoidIRecordableServiceInt) PSignal2<void,ePtr<iRecordableService>&,int>;
+
+%typemap(out) PSignal2VoidIRecordableServiceInt {
+ $1 = $input->get();
+}
+
/************** temp *****************/
/* need a better place for this, i agree. */
/************** temp *****************/
/* need a better place for this, i agree. */
@@
-259,9
+273,6
@@
int getPrevAsciiCode();
void runMainloop();
void quitMainloop(int exit_code);
eApplication *getApplication();
void runMainloop();
void quitMainloop(int exit_code);
eApplication *getApplication();
-%immutable keyPressed;
-PSignal1<void,int> &keyPressedSignal();
-
%{
RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
{
%{
RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
{
@@
-286,4
+297,9
@@
PyObject *New_eServiceReference(const eServiceReference &ref)
eServiceReference *result = new eServiceReference(ref);
return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_eServiceReference, 1);
}
eServiceReference *result = new eServiceReference(ref);
return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_eServiceReference, 1);
}
+PyObject *New_iRecordableServicePtr(const ePtr<iRecordableService> &ptr)
+{
+ ePtr<iRecordableService> *result = new ePtr<iRecordableService>(ptr);
+ return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_ePtrTiRecordableService_t, 1);
+}
%}
%}