diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-10-29 22:44:53 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-10-29 22:44:53 +0000 |
| commit | 0c59a4279f93f08fe95fca5f2e55f3e025f0cceb (patch) | |
| tree | 71e8c11f2a5487afe84d637d388d3cb060bc9ad5 /lib/dvb/epgcache.h | |
| parent | 4edb65fafb64b52007598e05a1e5b16b75ea752c (diff) | |
| download | enigma2-0c59a4279f93f08fe95fca5f2e55f3e025f0cceb.tar.gz enigma2-0c59a4279f93f08fe95fca5f2e55f3e025f0cceb.zip | |
also use refcounting for eTimers
its now no more possible directly to call new eTimer .. or to embedded
eTimer.
to create a eTimer now eTimer::create must be used... to delete you must
call ->AddRef() after timer creation and ->Release when the timer is no more
needed. Or use ePtr<eTimer> to store the timer reference.. then its enough
to set the ePtr<eTimer> object to 0 when the timer is no more needed
Diffstat (limited to 'lib/dvb/epgcache.h')
| -rw-r--r-- | lib/dvb/epgcache.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h index 5e5e7e8e..fc42ded5 100644 --- a/lib/dvb/epgcache.h +++ b/lib/dvb/epgcache.h @@ -155,7 +155,7 @@ class eEPGCache: public eMainloop, private eThread, public Object pthread_mutex_t channel_active; channel_data(eEPGCache*); eEPGCache *cache; - eTimer abortTimer, zapTimer; + ePtr<eTimer> abortTimer, zapTimer; int prevChannelState; __u8 state, isRunning, haveData; ePtr<eDVBChannel> channel; @@ -163,7 +163,7 @@ class eEPGCache: public eMainloop, private eThread, public Object ePtr<iDVBSectionReader> m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader; tidMap seenSections[3], calcedSections[3]; #ifdef ENABLE_PRIVATE_EPG - eTimer startPrivateTimer; + ePtr<eTimer> startPrivateTimer; int m_PrevVersion; int m_PrivatePid; uniqueEPGKey m_PrivateService; @@ -181,7 +181,7 @@ class eEPGCache: public eMainloop, private eThread, public Object ePtr<eConnection> m_MHWConn, m_MHWConn2; ePtr<iDVBSectionReader> m_MHWReader, m_MHWReader2; eDVBSectionFilterMask m_MHWFilterMask, m_MHWFilterMask2; - eTimer m_MHWTimeoutTimer; + ePtr<eTimer> m_MHWTimeoutTimer; bool m_MHWTimeoutet; void MHWTimeout() { m_MHWTimeoutet=true; } void readMHWData(const __u8 *data); @@ -249,7 +249,7 @@ private: friend class channel_data; static eEPGCache *instance; - eTimer cleanTimer; + ePtr<eTimer> cleanTimer; std::map<iDVBChannel*, channel_data*> m_knownChannels; ePtr<eConnection> m_chanAddedConn; |