projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some FIXMEEE's
[vuplus_dvbapp]
/
lib
/
python
/
enigma_python.i
diff --git
a/lib/python/enigma_python.i
b/lib/python/enigma_python.i
index
322b3e5
..
21c0664
100644
(file)
--- a/
lib/python/enigma_python.i
+++ b/
lib/python/enigma_python.i
@@
-39,9
+39,13
@@
is usually caused by not marking PSignals as immutable.
#include <lib/base/ebase.h>
#include <lib/base/smartptr.h>
#include <lib/base/eerror.h>
#include <lib/base/ebase.h>
#include <lib/base/smartptr.h>
#include <lib/base/eerror.h>
+#include <lib/base/console.h>
+#include <lib/base/nconfig.h>
+#include <lib/driver/rc.h>
#include <lib/service/iservice.h>
#include <lib/service/service.h>
#include <lib/service/event.h>
#include <lib/service/iservice.h>
#include <lib/service/service.h>
#include <lib/service/event.h>
+#include <lib/gdi/fb.h>
#include <lib/gdi/font.h>
#include <lib/gdi/gpixmap.h>
#include <lib/gui/ewidget.h>
#include <lib/gdi/font.h>
#include <lib/gdi/gpixmap.h>
#include <lib/gui/ewidget.h>
@@
-57,17
+61,22
@@
is usually caused by not marking PSignals as immutable.
#include <lib/gui/ewindowstyleskinned.h>
#include <lib/gui/ewidgetanimation.h>
#include <lib/gui/eslider.h>
#include <lib/gui/ewindowstyleskinned.h>
#include <lib/gui/ewidgetanimation.h>
#include <lib/gui/eslider.h>
+#include <lib/gui/epositiongauge.h>
+#include <lib/gui/evideo.h>
#include <lib/python/connections.h>
#include <lib/gui/elistbox.h>
#include <lib/gui/elistboxcontent.h>
#include <lib/service/listboxservice.h>
#include <lib/components/scan.h>
#include <lib/python/connections.h>
#include <lib/gui/elistbox.h>
#include <lib/gui/elistboxcontent.h>
#include <lib/service/listboxservice.h>
#include <lib/components/scan.h>
-#include <lib/components/
listboxepg
.h>
+#include <lib/components/
file_eraser
.h>
#include <lib/nav/pcore.h>
#include <lib/actions/action.h>
#include <lib/gdi/gfont.h>
#include <lib/gdi/epng.h>
#include <lib/dvb/db.h>
#include <lib/nav/pcore.h>
#include <lib/actions/action.h>
#include <lib/gdi/gfont.h>
#include <lib/gdi/epng.h>
#include <lib/dvb/db.h>
+#include <lib/dvb/dvb.h>
+#include <lib/dvb/idvb.h>
+#include <lib/dvb/frontend.h>
#include <lib/dvb/volume.h>
#include <lib/dvb/sec.h>
#include <lib/dvb/epgcache.h>
#include <lib/dvb/volume.h>
#include <lib/dvb/sec.h>
#include <lib/dvb/epgcache.h>
@@
-79,14
+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 void runMainloop();
extern void quitMainloop(int exit_code);
-extern void setLCD(const char *c);
-extern void setLCDClock(const char *c);
extern eApplication *getApplication();
extern eApplication *getApplication();
-
-extern PSignal1<void,int> &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__); */ "
%}
%feature("ref") iObject "$this->AddRef(); /* eDebug(\"AddRef (%s:%d)!\", __FILE__, __LINE__); */ "
@@
-113,7
+124,7
@@
extern PSignal1<void,int> &keyPressedSignal();
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
@@
-135,15
+146,25
@@
typedef long time_t;
%template(eServiceCenterPtr) ePtr<eServiceCenter>;
%include <lib/service/event.h>
%template(eServiceCenterPtr) ePtr<eServiceCenter>;
%include <lib/service/event.h>
-
// TODO: embed these...
// TODO: embed these...
+%immutable eConsoleAppContainer::appClosed;
+%immutable eConsoleAppContainer::dataAvail;
+%immutable eConsoleAppContainer::dataSent;
%immutable eButton::selected;
%immutable eInput::changed;
%immutable eComponentScan::statusChanged;
%immutable eComponentScan::newService;
%immutable pNavigation::m_event;
%immutable eButton::selected;
%immutable eInput::changed;
%immutable eComponentScan::statusChanged;
%immutable eComponentScan::newService;
%immutable pNavigation::m_event;
+%immutable pNavigation::m_record_event;
%immutable eListbox::selectionChanged;
%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/driver/rc.h>
+%include <lib/gdi/fb.h>
%include <lib/gdi/font.h>
%include <lib/gdi/gpixmap.h>
%include <lib/gdi/epoint.h>
%include <lib/gdi/font.h>
%include <lib/gdi/gpixmap.h>
%include <lib/gdi/epoint.h>
@@
-159,15
+180,17
@@
typedef long time_t;
%include <lib/gui/ebutton.h>
%include <lib/gui/ewindow.h>
%include <lib/gui/eslider.h>
%include <lib/gui/ebutton.h>
%include <lib/gui/ewindow.h>
%include <lib/gui/eslider.h>
+%include <lib/gui/epositiongauge.h>
%include <lib/gui/ewidgetdesktop.h>
%include <lib/gui/elistbox.h>
%include <lib/gui/elistboxcontent.h>
%include <lib/gui/ewindowstyle.h>
%include <lib/gui/ewindowstyleskinned.h>
%include <lib/gui/ewidgetanimation.h>
%include <lib/gui/ewidgetdesktop.h>
%include <lib/gui/elistbox.h>
%include <lib/gui/elistboxcontent.h>
%include <lib/gui/ewindowstyle.h>
%include <lib/gui/ewindowstyleskinned.h>
%include <lib/gui/ewidgetanimation.h>
+%include <lib/gui/evideo.h>
%include <lib/service/listboxservice.h>
%include <lib/components/scan.h>
%include <lib/service/listboxservice.h>
%include <lib/components/scan.h>
-%include <lib/components/
listboxepg
.h>
+%include <lib/components/
file_eraser
.h>
%include <lib/nav/pcore.h>
%include <lib/actions/action.h>
%include <lib/gdi/gfont.h>
%include <lib/nav/pcore.h>
%include <lib/actions/action.h>
%include <lib/gdi/gfont.h>
@@
-177,6
+200,9
@@
typedef long time_t;
%include <lib/dvb/epgcache.h>
%include <lib/dvb/frontendparms.h>
%include <lib/dvb/dvbtime.h>
%include <lib/dvb/epgcache.h>
%include <lib/dvb/frontendparms.h>
%include <lib/dvb/dvbtime.h>
+%include <lib/dvb/dvb.h>
+%include <lib/dvb/idvb.h>
+%include <lib/dvb/frontend.h>
%include <lib/driver/avswitch.h>
%include <lib/driver/rfmod.h>
%include <lib/driver/etimezone.h>
%include <lib/driver/avswitch.h>
%include <lib/driver/rfmod.h>
%include <lib/driver/etimezone.h>
@@
-184,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>;
@@
-196,41
+224,55
@@
public:
PyObject *get();
};
PyObject *get();
};
+%template(PSignal0V) PSignal0<void>;
+
+%typemap(out) PSignal0V {
+ $1 = $input->get();
+}
+
template<class R, class P0> class PSignal1
{
public:
PyObject *get();
};
template<class R, class P0> class PSignal1
{
public:
PyObject *get();
};
+%template(PSignal1VI) PSignal1<void,int>;
+%template(PSignal1VS) PSignal1<void,const char *c>;
+
+%typemap(out) PSignal1VI {
+ $1 = $input->get();
+}
+
+%typemap(out) PSignal1VS {
+ $1 = $input->get();
+}
+
template<class R, class P0, class P1> class PSignal2
{
public:
PyObject *get();
};
template<class R, class P0, class P1> class PSignal2
{
public:
PyObject *get();
};
-%template(PSignal
1VI) PSignal1<void
,int>;
+%template(PSignal
2VoidIRecordableServiceInt) PSignal2<void,ePtr<iRecordableService>&
,int>;
-%typemap(out) PSignal
1VI
{
+%typemap(out) PSignal
2VoidIRecordableServiceInt
{
$1 = $input->get();
}
$1 = $input->get();
}
-%template(PSignal0V) PSignal0<void>;
-
-%typemap(out) PSignal0V {
- $1 = $input->get();
-}
+/************** temp *****************/
+ /* need a better place for this, i agree. */
+%{
+void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement);
+%}
+void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement);
/************** debug **************/
/************** debug **************/
+int getPrevAsciiCode();
void runMainloop();
void quitMainloop(int exit_code);
void runMainloop();
void quitMainloop(int exit_code);
-void setLCD(const char*);
-void setLCDClock(const char*);
eApplication *getApplication();
eApplication *getApplication();
-%immutable keyPressed;
-PSignal1<void,int> &keyPressedSignal();
-
%{
RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
{
%{
RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
{
@@
-255,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);
+}
%}
%}