X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5518d56f51a8951cc7cea96ee1782ba470380ddc..06578d6778bff8aa2bd6a2387651dd0ba55aa27c:/lib/base/ebase.h

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index f14d07ac..c4dab621 100644
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -132,8 +132,6 @@ static inline long timeout_usec ( const timeval & orig )
 	return (orig-now).tv_sec*1000000 + (orig-now).tv_usec;
 }
 
-#endif
-
 class eMainloop;
 
 					// die beiden signalquellen: SocketNotifier...
@@ -154,6 +152,7 @@ private:
 	int fd;
 	int state;
 	int requested;		// requested events (POLLIN, ...)
+	void activate(int what) { /*emit*/ activated(what); }
 public:
 	/**
 	 * \brief Constructs a eSocketNotifier.
@@ -166,7 +165,6 @@ public:
 	~eSocketNotifier();
 
 	PSignal1<void, int> activated;
-	void activate(int what) { /*emit*/ activated(what); }
 
 	void start();
 	void stop();
@@ -177,6 +175,8 @@ public:
 	void setRequested(int req) { requested=req; }
 };
 
+#endif
+
 class eTimer;
 
 			// werden in einer mainloop verarbeitet
@@ -191,6 +191,7 @@ class eMainloop
 	int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
 	int retval;
 	int time_offset;
+	int m_is_idle;
 	pthread_mutex_t recalcLock;
 	
 	int m_interrupt_requested;
@@ -211,16 +212,13 @@ public:
 #endif
 
 	eMainloop()
-		:app_quit_now(0),loop_level(0),retval(0), m_interrupt_requested(0)
+		:app_quit_now(0),loop_level(0),retval(0), m_is_idle(0), m_interrupt_requested(0)
 	{
 		existing_loops.push_back(this);
 		pthread_mutex_init(&recalcLock, 0);
 	}
-	~eMainloop()
-	{
-		existing_loops.remove(this);
-		pthread_mutex_destroy(&recalcLock);
-	}
+	virtual ~eMainloop();
+
 	int looplevel() { return loop_level; }
 
 #ifndef SWIG
@@ -242,6 +240,9 @@ public:
 	PyObject *poll(SWIG_PYOBJECT(ePyObject) dict, SWIG_PYOBJECT(ePyObject) timeout);
 	void interruptPoll();
 	void reset();
+	
+		/* m_is_idle needs to be atomic, but it doesn't really matter much, as it's read-only from outside */
+	int isIdle() { return m_is_idle; }
 };
 
 /**
@@ -264,6 +265,7 @@ public:
 	}
 };
 
+#ifndef SWIG
 				// ... und Timer
 /**
  * \brief Gives a callback after a specified timeout.
@@ -279,6 +281,7 @@ class eTimer
 	bool bSingleShot;
 	bool bActive;
 	void addTimeOffset(int);
+	void activate();
 public:
 	/**
 	 * \brief Constructs a timer.
@@ -290,17 +293,17 @@ public:
 	~eTimer() { if (bActive) stop(); }
 
 	PSignal0<void> timeout;
-	void activate();
 
 	bool isActive() { return bActive; }
+
 	timeval &getNextActivation() { return nextActivation; }
 
 	void start(long msec, bool b=false);
 	void stop();
 	void changeInterval(long msek);
-#ifndef SWIG
-	bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
-#endif
 	void startLongTimer( int seconds );
+	bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
 };
+#endif  // SWIG
+
 #endif