X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/015545dc0fb37a24f6ad4d2820d34a16bd385f94..f41b32acf318e07ea16e8f5be28e84261b13d8e2:/lib/base/ebase.h

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index cf973c89..8e6ea711 100644
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -1,6 +1,7 @@
 #ifndef __ebase_h
 #define __ebase_h
 
+#ifndef SWIG
 #include <vector>
 #include <map>
 #include <sys/poll.h>
@@ -9,8 +10,10 @@
 #include <time.h>
 
 #include <lib/base/eptrlist.h>
-#include <lib/python/connections.h>
 #include <libsig_comp.h>
+#endif
+
+#include <lib/python/connections.h>
 
 class eApplication;
 
@@ -138,6 +141,7 @@ class eMainloop;
  */
 class eSocketNotifier
 {
+	friend class eMainloop;
 public:
 	enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP };
 private:
@@ -179,7 +183,7 @@ class eMainloop
 	ePtrList<eTimer> m_timer_list;
 	bool app_quit_now;
 	int loop_level;
-	int processOneEvent(unsigned int user_timeout, PyObject **res=0, PyObject *additional=0);
+	int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
 	int retval;
 	pthread_mutex_t recalcLock;
 	
@@ -219,14 +223,14 @@ public:
 		  1 - timeout
 		  2 - signal
 		*/
-	int iterate(unsigned int timeout=0, PyObject **res=0, PyObject *additional=0);
-		
+	int iterate(unsigned int timeout=0, PyObject **res=0, SWIG_PYOBJECT(ePyObject) additional=(PyObject*)0);
+
 		/* run will iterate endlessly until the app is quit, and return
 		   the exit code */
 	int runLoop();
 	
 		/* our new shared polling interface. */
-	PyObject *poll(PyObject *dict, PyObject *timeout);
+	PyObject *poll(SWIG_PYOBJECT(ePyObject) dict, SWIG_PYOBJECT(ePyObject) timeout);
 	void interruptPoll();
 	void reset();
 };