git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't die on loadAlternatives when no file is present
[enigma2.git]
/
lib
/
python
/
enigma_python.i
diff --git
a/lib/python/enigma_python.i
b/lib/python/enigma_python.i
index 5a6f126ecba41c3c0fe84c262639fbcbad85b647..29b66acf35950742291bb029c417a41902749b2a 100644
(file)
--- a/
lib/python/enigma_python.i
+++ b/
lib/python/enigma_python.i
@@
-39,7
+39,7
@@
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/
econfig
.h>
+#include <lib/base/
console
.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>
@@
-58,6
+58,7
@@
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/python/connections.h>
#include <lib/gui/elistbox.h>
#include <lib/gui/elistboxcontent.h>
#include <lib/python/connections.h>
#include <lib/gui/elistbox.h>
#include <lib/gui/elistboxcontent.h>
@@
-125,7
+126,6
@@
typedef long time_t;
%include <lib/python/swig.h>
%include <lib/base/object.h>
%include <lib/base/eerror.h>
%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;
%immutable eTimer::timeout;
%immutable eSocketNotifier::activated;
@@
-139,11
+139,17
@@
typedef long time_t;
// 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 eButton::selected;
%immutable eInput::changed;
%immutable eComponentScan::statusChanged;
+%immutable eComponentScan::newService;
%immutable pNavigation::m_event;
%immutable pNavigation::m_event;
+%immutable eListbox::selectionChanged;
+%include <lib/base/console.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,6
+165,7
@@
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/ewidgetdesktop.h>
%include <lib/gui/elistbox.h>
%include <lib/gui/elistboxcontent.h>
@@
-196,30
+203,34
@@
public:
PyObject *get();
};
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>;
{
public:
PyObject *get();
};
%template(PSignal1VI) PSignal1<void,int>;
+%template(PSignal1VS) PSignal1<void,const char *c>;
%typemap(out) PSignal1VI {
$1 = $input->get();
}
%typemap(out) PSignal1VI {
$1 = $input->get();
}
-%template(PSignal0V) PSignal0<void>;
-
-%typemap(out) PSignal0V {
+%typemap(out) PSignal1VS {
$1 = $input->get();
}
$1 = $input->get();
}
+template<class R, class P0, class P1> class PSignal2
+{
+public:
+ PyObject *get();
+};
/************** debug **************/
/************** debug **************/
@@
-250,4
+261,9
@@
PyObject *New_TestObj()
TestObj *result = (TestObj *)new TestObj();
return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_TestObj, 1);
}
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);
+}
%}
%}