projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental
[vuplus_dvbapp]
/
lib
/
base
/
ebase.h
diff --git
a/lib/base/ebase.h
b/lib/base/ebase.h
index
524052b
..
f6fc07d
100644
(file)
--- a/
lib/base/ebase.h
+++ b/
lib/base/ebase.h
@@
-195,6
+195,7
@@
class eMainloop
int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
int retval;
int m_is_idle;
int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
int retval;
int m_is_idle;
+ int m_idle_count;
eSocketNotifier *m_inActivate;
int m_interrupt_requested;
eSocketNotifier *m_inActivate;
int m_interrupt_requested;
@@
-204,13
+205,11
@@
class eMainloop
void removeSocketNotifier(eSocketNotifier *sn);
void addTimer(eTimer* e);
void removeTimer(eTimer* e);
void removeSocketNotifier(eSocketNotifier *sn);
void addTimer(eTimer* e);
void removeTimer(eTimer* e);
-public:
-#ifndef SWIG
static ePtrList<eMainloop> existing_loops;
static ePtrList<eMainloop> existing_loops;
-#endif
-
+ static bool isValid(eMainloop *);
+public:
eMainloop()
eMainloop()
- :app_quit_now(0),loop_level(0),retval(0), m_is_idle(0), m_inActivate(0), m_interrupt_requested(0)
+ :app_quit_now(0),loop_level(0),retval(0), m_is_idle(0), m_i
dle_count(0), m_i
nActivate(0), m_interrupt_requested(0)
{
existing_loops.push_back(this);
}
{
existing_loops.push_back(this);
}
@@
-240,6
+239,7
@@
public:
/* 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; }
/* 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; }
+ int idleCount() { return m_idle_count; }
};
/**
};
/**