small (non critical) fix

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

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index a224e2cc40975a47a0dc337c373e75bffe345ed9..cf973c8948cfb7e47b44ec7a04363045ffb76d08 100644 (file)
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -140,13 +140,11 @@ class eSocketNotifier
 {
 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,10 +173,9 @@ 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;
@@ -187,20 +184,20 @@ class eMainloop
        pthread_mutex_t recalcLock;
        
        int m_now_is_invalid;
-#endif
-public:
-       static void addTimeOffset(int offset);
+       int m_interrupt_requested;
        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;
 #endif
 
        eMainloop()
-               :app_quit_now(0),loop_level(0),retval(0)
+               :app_quit_now(0),loop_level(0),retval(0), m_interrupt_requested(0)
        {
                m_now_is_invalid = 0;
                existing_loops.push_back(this);
@@ -230,6 +227,8 @@ public:
        
                /* our new shared polling interface. */
        PyObject *poll(PyObject *dict, PyObject *timeout);
+       void interruptPoll();
+       void reset();
 };
 
 /**
@@ -260,14 +259,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.
@@ -291,6 +289,5 @@ public:
        bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
 #endif
        void startLongTimer( int seconds );
-       void addTimeOffset(int);
 };
 #endif