diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-05 00:17:02 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-05 00:17:02 +0100 |
| commit | c9fc2db8f1829ec65482487070722194ddc0fcf4 (patch) | |
| tree | 477cc54c407aa66f6a40c330794207bfc01527c1 /lib/dvb/epgcache.h | |
| parent | e4d1d550d6f1a7d1d75e4524d367a8820b119926 (diff) | |
| parent | 7fd4241a1d7b8d7c36385860b24882636517473b (diff) | |
| download | enigma2-c9fc2db8f1829ec65482487070722194ddc0fcf4.tar.gz enigma2-c9fc2db8f1829ec65482487070722194ddc0fcf4.zip | |
Merge branch 'master' into 3.0
Diffstat (limited to 'lib/dvb/epgcache.h')
| -rw-r--r-- | lib/dvb/epgcache.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h index dca05a52..90aff6c6 100644 --- a/lib/dvb/epgcache.h +++ b/lib/dvb/epgcache.h @@ -177,7 +177,8 @@ class eEPGCache: public eMainloop, private eThread, public Object eEPGCache *cache; ePtr<eTimer> abortTimer, zapTimer; int prevChannelState; - __u8 state, isRunning, haveData; + int state; + __u8 isRunning, haveData; ePtr<eDVBChannel> channel; ePtr<eConnection> m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn, m_ViasatConn; ePtr<iDVBSectionReader> m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader, m_ViasatReader; @@ -290,6 +291,7 @@ private: void thread(); // thread function // called from epgcache thread + int m_running; char m_filename[1024]; void save(); void load(); @@ -326,6 +328,9 @@ public: #endif #endif + // must be called once! + void setCacheFile(const char *filename); + // called from main thread inline void Lock(); inline void Unlock(); |