some python import cleanups

[vuplus_dvbapp] / lib / base / ebase.h

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index 32a22db..75b5820 100644 (file)
--- 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;
 
@@ -175,11 +178,11 @@ class eMainloop
 {
        friend class eTimer;
        friend class eSocketNotifier;
-       std::multimap<int, eSocketNotifier*> notifiers;
+       std::map<int, eSocketNotifier*> notifiers, new_notifiers;
        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 +222,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();
 };