add a workaround to ensure that the filepush thread take notice of the

[enigma2.git] / lib / base / ebase.h

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index b819fc355b70baf6d7507e410dfe93ea39ce931e..8e6ea711ef75cdf60ea84f531aa6fb609884afe3 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;
 
@@ -138,15 +141,14 @@ class eMainloop;
  */
 class eSocketNotifier
 {
+       friend class eMainloop;
 public:
        enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP };
-#ifndef SWIG
 private:
        eMainloop &context;
        int fd;
        int state;
        int requested;          // requested events (POLLIN, ...)
-#endif
 public:
        /**
         * \brief Constructs a eSocketNotifier.
@@ -175,26 +177,24 @@ class eTimer;
                        // werden in einer mainloop verarbeitet
 class eMainloop
 {
-#ifndef SWIG
        friend class eTimer;
        friend class eSocketNotifier;
-       std::multimap<int, eSocketNotifier*> notifiers;
+       std::map<int, eSocketNotifier*> 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;
        
        int m_now_is_invalid;
        int m_interrupt_requested;
-#endif
-public:
-       static void addTimeOffset(int offset);
        void addSocketNotifier(eSocketNotifier *sn);
        void removeSocketNotifier(eSocketNotifier *sn);
        void addTimer(eTimer* e);
        void removeTimer(eTimer* e);
+public:
+       static void addTimeOffset(int offset);
 
 #ifndef SWIG
        static ePtrList<eMainloop> existing_loops;
@@ -223,15 +223,16 @@ 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();
 };
 
 /**
@@ -262,14 +263,13 @@ public:
  */
 class eTimer
 {
-#ifndef SWIG
        friend class eMainloop;
        eMainloop &context;
        timeval nextActivation;
        long interval;
        bool bSingleShot;
        bool bActive;
-#endif
+       void addTimeOffset(int);
 public:
        /**
         * \brief Constructs a timer.
@@ -293,6 +293,5 @@ public:
        bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
 #endif
        void startLongTimer( int seconds );
-       void addTimeOffset(int);
 };
 #endif