another try to fix ScanSetup

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

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index aaabd30d436d5bef8e21bc309a60dba0f381887a..2a1fe6288033a4054f99922d2ab9974528499183 100644 (file)
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -16,6 +16,7 @@ class eApplication;
 
 extern eApplication* eApp;
 
+       /* TODO: remove these inlines. */
 static inline bool operator<( const timeval &t1, const timeval &t2 )
 {
        return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_usec < t2.tv_usec);
@@ -113,20 +114,9 @@ static inline timeval operator-=( timeval &t1, const long msek )
        return t1;
 }
 
-static inline timeval timeout_timeval ( const timeval & orig )
+static inline int timeval_to_usec(const timeval &t1)
 {
-       timeval now;
-  gettimeofday(&now,0);
-
-       return orig-now;
-}
-
-static inline long timeout_usec ( const timeval & orig )
-{
-       timeval now;
-  gettimeofday(&now,0);
-
-       return (orig-now).tv_sec*1000000 + (orig-now).tv_usec;
+       return t1.tv_sec*1000000 + t1.tv_usec;
 }
 
 class eMainloop;
@@ -179,24 +169,27 @@ class eMainloop
        friend class eTimer;
        friend class eSocketNotifier;
        std::map<int, eSocketNotifier*> notifiers;
-       ePtrList<eTimer> TimerList;
+       ePtrList<eTimer> m_timer_list;
        bool app_exit_loop;
        bool app_quit_now;
        int loop_level;
        void processOneEvent();
        int retval;
-       int timer_offset;
        pthread_mutex_t recalcLock;
-       inline void doRecalcTimers();
-       inline void addSocketNotifier(eSocketNotifier *sn);
-       inline void removeSocketNotifier(eSocketNotifier *sn);
-       inline void addTimer(eTimer* e) {               TimerList.insert_in_order(e);   }
-       inline void removeTimer(eTimer* e)      {               TimerList.remove(e);    }
+       
+       int m_now_is_invalid;
 public:
+       static void addTimeOffset(int offset);
+       void addSocketNotifier(eSocketNotifier *sn);
+       void removeSocketNotifier(eSocketNotifier *sn);
+       void addTimer(eTimer* e);
+       void removeTimer(eTimer* e);
+
        static ePtrList<eMainloop> existing_loops;
        eMainloop()
-               :app_quit_now(0),loop_level(0),retval(0),timer_offset(0)
+               :app_quit_now(0),loop_level(0),retval(0)
        {
+               m_now_is_invalid = 0;
                existing_loops.push_back(this);
                pthread_mutex_init(&recalcLock, 0);
        }
@@ -207,13 +200,11 @@ public:
        }
        int looplevel() { return loop_level; }
 
+               /* OBSOLETE. DONT USE. */
        int exec();  // recursive enter the loop
        void quit(int ret=0); // leave all pending loops (recursive leave())
        void enter_loop();
        void exit_loop();
-       void setTimerOffset( int );
-       int getTimerOffset() { return timer_offset; }
-       bool isAppQuitNowSet() { return app_quit_now; }
 };
 
 /**
@@ -250,7 +241,6 @@ class eTimer
        long interval;
        bool bSingleShot;
        bool bActive;
-       inline void recalc(int);
 public:
        /**
         * \brief Constructs a timer.
@@ -272,5 +262,6 @@ public:
        void changeInterval(long msek);
        bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
        void startLongTimer( int seconds );
+       void addTimeOffset(int);
 };
 #endif