aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb/epgcache.h
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-07-25 20:38:38 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-07-25 20:38:38 +0000
commite14e11bdcb89bf3a0c306b4207c2c030d752b5f4 (patch)
treeeada07a0393eedebaeb738110abb443a7a7736ea /lib/dvb/epgcache.h
parent1fef713f9d9bb5b87e0d719c768d4b721788caf4 (diff)
downloadenigma2-e14e11bdcb89bf3a0c306b4207c2c030d752b5f4.tar.gz
enigma2-e14e11bdcb89bf3a0c306b4207c2c030d752b5f4.zip
code cleanup
Diffstat (limited to 'lib/dvb/epgcache.h')
-rw-r--r--lib/dvb/epgcache.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 81815ed5..fb37b20d 100644
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -2,7 +2,6 @@
#define __epgcache_h_
#define ENABLE_PRIVATE_EPG 1
-#define ENABLE_MHW_EPG 1
#ifndef SWIG
@@ -153,7 +152,7 @@ class eEPGCache: public eMainloop, private eThread, public Object
eEPGCache *cache;
eTimer abortTimer, zapTimer;
int prevChannelState;
- __u8 state, isRunning, haveData, can_delete;
+ __u8 state, isRunning, haveData;
ePtr<eDVBChannel> channel;
ePtr<eConnection> m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn;
ePtr<iDVBSectionReader> m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader;
@@ -168,6 +167,9 @@ class eEPGCache: public eMainloop, private eThread, public Object
std::set<__u8> seenPrivateSections;
void readPrivateData(const __u8 *data);
void startPrivateReader();
+ bool canDelete() { return !isRunning && !m_PrivateConn; }
+#else
+ bool canDelete() { return !isRunning; }
#endif
void readData(const __u8 *data);
void startChannel();