Oh, things like "operator= is private in this context" etc.
-is usually caused by not marking PSignals as immutable.
-
+is usually caused by not marking PSignals as immutable.
*/
-%define RefCount(...)
-%typemap(newfree) __VA_ARGS__ * { eDebug("adding ref"); $1->AddRef(); }
-%extend __VA_ARGS__ { ~__VA_ARGS__() { eDebug("removing ref!"); self->Release(); } }
-%ignore __VA_ARGS__::~__VA_ARGS__();
-%enddef
-
%module enigma
%{
+
#define SWIG_COMPILE
#include <lib/base/ebase.h>
#include <lib/base/smartptr.h>
#include <lib/base/eerror.h>
-#include <lib/base/econfig.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/servicedvb.h>
+#include <lib/gdi/fb.h>
+#include <lib/gdi/font.h>
+#include <lib/gdi/gpixmap.h>
#include <lib/gui/ewidget.h>
#include <lib/gui/elabel.h>
+#include <lib/gui/einput.h>
+#include <lib/gui/einputstring.h>
+#include <lib/gui/einputnumber.h>
+#include <lib/gui/epixmap.h>
#include <lib/gui/ebutton.h>
#include <lib/gui/ewindow.h>
#include <lib/gui/ewidgetdesktop.h>
+#include <lib/gui/ewindowstyle.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/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/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/frontendparms.h>
+#include <lib/dvb/dvbtime.h>
+#include <lib/dvb/pmt.h>
+#include <lib/driver/avswitch.h>
+#include <lib/driver/rfmod.h>
+#include <lib/driver/misc_options.h>
+#include <lib/driver/etimezone.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();
-
-extern PSignal1<void,int> &keyPressedSignal();
+extern void quitMainloop(int exit_code);
+extern eApplication *getApplication();
+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);
+PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref, const eServiceReference &ignore)
+{
+ eStaticServiceDVBBouquetInformation info;
+ if (info.isPlayable(bouquet_ref, ignore))
+ return New_eServiceReference(info.getPlayableService());
+ Py_INCREF(Py_None);
+ return Py_None;
+}
%}
-RefCount(eListboxPythonStringContent)
-RefCount(eListboxServiceContent)
-RefCount(eComponentScan)
+%feature("ref") iObject "$this->AddRef(); /* eDebug(\"AddRef (%s:%d)!\", __FILE__, __LINE__); */ "
+%feature("unref") iObject "$this->Release(); /* eDebug(\"Release! %s:%d\", __FILE__, __LINE__); */ "
+
+
+/* this magic allows smartpointer to be used as OUTPUT arguments, i.e. call-by-reference-styled return value. */
+
+%define %typemap_output_simple(Type)
+ %typemap(in,numinputs=0) Type *OUTPUT ($*1_ltype temp),
+ Type &OUTPUT ($*1_ltype temp)
+ "$1 = new Type;";
+ %fragment("t_out_helper"{Type},"header",
+ fragment="t_output_helper") {}
+ %typemap(argout,fragment="t_out_helper"{Type}) Type *OUTPUT, Type &OUTPUT
+ "$result = t_output_helper($result, (SWIG_NewPointerObj((void*)($1), $1_descriptor, 1)));"
+%enddef
+
+%define %typemap_output_ptr(Type)
+ %typemap(in,numinputs=0) Type *OUTPUT ($*1_ltype temp),
+ Type &OUTPUT ($*1_ltype temp)
+ "$1 = new Type;";
+ %fragment("t_out_helper"{Type},"header",
+ 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) : (delete $1, Py_INCREF(Py_None), Py_None)));"
+%enddef
+
#define DEBUG
+typedef long time_t;
+%include "typemaps.i"
%include "stl.i"
+%include <lib/python/swig.h>
%include <lib/base/object.h>
%include <lib/base/eerror.h>
-%include <lib/base/econfig.h>
+
+%immutable eTimer::timeout;
+%immutable eSocketNotifier::activated;
+%include <lib/base/ebase.h>
%include <lib/base/smartptr.h>
%include <lib/service/iservice.h>
%include <lib/service/service.h>
-%template(eServiceCenterPtr) ePtr<eServiceCenter>;
+%template(eServiceCenterPtr) ePtr<eServiceCenter>;
+%include <lib/service/event.h>
// TODO: embed these...
+%immutable eConsoleAppContainer::appClosed;
+%immutable eConsoleAppContainer::dataAvail;
+%immutable eConsoleAppContainer::dataSent;
%immutable eButton::selected;
+%immutable eInput::changed;
%immutable eComponentScan::statusChanged;
-%immutable pNavigation::event;
+%immutable eComponentScan::newService;
+%immutable pNavigation::m_event;
+%immutable pNavigation::m_record_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/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/erect.h>
%include <lib/gdi/esize.h>
%include <lib/gdi/region.h>
%include <lib/gui/ewidget.h>
%include <lib/gui/elabel.h>
+%include <lib/gui/einput.h>
+%include <lib/gui/einputstring.h>
+%include <lib/gui/einputnumber.h>
+%include <lib/gui/epixmap.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/evideo.h>
%include <lib/service/listboxservice.h>
%include <lib/components/scan.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/volume.h>
+%include <lib/dvb/sec.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/dvb/pmt.h>
+%include <lib/driver/avswitch.h>
+%include <lib/driver/rfmod.h>
+%include <lib/driver/misc_options.h>
+%include <lib/driver/etimezone.h>
+%include <lib/gdi/lcd.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>;
+
+/************** signals **************/
template<class R> class PSignal0
{
PyObject *get();
};
-template<class R, class P0> class PSignal1
-{
-public:
- PyObject *get();
-};
+%template(PSignal0V) PSignal0<void>;
-template<class R, class P0, class P1> class PSignal2
+%typemap(out) PSignal0V {
+ $1 = $input->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();
}
-%template(PSignal0V) PSignal0<void>;
-
-%typemap(out) PSignal0V {
+%typemap(out) PSignal1VS {
$1 = $input->get();
}
+template<class R, class P0, class P1> class PSignal2
+{
+public:
+ PyObject *get();
+};
-/************** base **************/
+%template(PSignal2VoidIRecordableServiceInt) PSignal2<void,ePtr<iRecordableService>&,int>;
-%immutable eTimer::timeout;
+%typemap(out) PSignal2VoidIRecordableServiceInt {
+ $1 = $input->get();
+}
-class eTimer
-{
-public:
- eTimer(eMainloop *context = eApp);
- PSignal0<void> timeout;
+/************** temp *****************/
- void start(long msec, bool singleShot=false);
- void stop();
- void changeInterval(long msek);
-};
+ /* 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 **************/
+int getPrevAsciiCode();
void runMainloop();
-void quitMainloop();
-%immutable keyPressed;
-PSignal1<void,int> &keyPressedSignal();
+void quitMainloop(int exit_code);
+eApplication *getApplication();
+PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref, const eServiceReference &ignore);
+%{
+RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
+{
+ ePtr<gPixmap> *res;
+
+ res = 0;
+ result = 0;
+ if (SWIG_Python_ConvertPtr(obj, (void **)&res, SWIGTYPE_p_ePtrTgPixmap_t, SWIG_POINTER_EXCEPTION | 0))
+ return -1;
+ if (!res)
+ return -1;
+ result = *res;
+ return 0;
+}
+PyObject *New_TestObj()
+{
+ TestObj *result = (TestObj *)new TestObj();
+ return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_TestObj, 1);
+}
+PyObject *New_eServiceReference(const eServiceReference &ref)
+{
+ 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);
+}
+%}
git.cweiske.de / enigma2.git / blobdiff