#ifndef __epgcache_h_
#define __epgcache_h_
+#define ENABLE_PRIVATE_EPG 1
+
#ifndef SWIG
#include <vector>
#include <lib/base/thread.h>
#include <lib/base/message.h>
#include <lib/service/event.h>
+#include <lib/python/python.h>
#define CLEAN_INTERVAL 60000 // 1 min
#define UPDATE_INTERVAL 3600000 // 60 min
class eventData;
class eServiceReferenceDVB;
+class eDVBServicePMTHandler;
struct uniqueEPGKey
{
#define tidMap std::set<__u32>
#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ == 4 ) // check if gcc version >= 3.1
#define eventCache __gnu_cxx::hash_map<uniqueEPGKey, std::pair<eventMap, timeMap>, hash_uniqueEPGKey, uniqueEPGKey::equal>
+ #ifdef ENABLE_PRIVATE_EPG
+ #define contentTimeMap __gnu_cxx::hash_map<time_t, std::pair<time_t, __u16> >
+ #define contentMap __gnu_cxx::hash_map<int, contentTimeMap >
+ #define contentMaps __gnu_cxx::hash_map<uniqueEPGKey, contentMap, hash_uniqueEPGKey, uniqueEPGKey::equal >
+ #endif
#else // for older gcc use following
#define eventCache std::hash_map<uniqueEPGKey, std::pair<eventMap, timeMap>, hash_uniqueEPGKey, uniqueEPGKey::equal >
+ #ifdef ENABLE_PRIVATE_EPG
+ #define contentTimeMap std::hash_map<time_t, std::pair<time_t, __u16> >
+ #define contentMap std::hash_map<int, contentTimeMap >
+ #define contentMaps std::hash_map<uniqueEPGKey, contentMap, hash_uniqueEPGKey, uniqueEPGKey::equal>
+ #endif
#endif
#define descriptorPair std::pair<int,__u8*>
#define descriptorMap std::map<__u32, descriptorPair >
-#endif // SWIG
-
class eventData
{
-#ifndef SWIG
friend class eEPGCache;
private:
__u8* EITdata;
static int CacheSize;
static void load(FILE *);
static void save(FILE *);
-#endif // SWIG
public:
eventData(const eit_event_struct* e=NULL, int size=0, int type=0);
~eventData();
-#ifndef SWIG
const eit_event_struct* get() const;
operator const eit_event_struct*() const
{
return get();
}
-#endif
int getEventID()
{
return (EITdata[0] << 8) | EITdata[1];
int getDuration()
{
return fromBCD(EITdata[7])*3600+fromBCD(EITdata[8])*60+fromBCD(EITdata[9]);
- }
+ }
};
+#endif
class eEPGCache: public eMainloop, private eThread, public Object
{
channel_data(eEPGCache*);
eEPGCache *cache;
eTimer abortTimer, zapTimer;
- __u8 state, isRunning, haveData, can_delete;
+ int prevChannelState;
+ __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;
tidMap seenSections[3], calcedSections[3];
+#ifdef ENABLE_PRIVATE_EPG
+ eTimer startPrivateTimer;
+ int m_PrevVersion;
+ int m_PrivatePid;
+ uniqueEPGKey m_PrivateService;
+ ePtr<eConnection> m_PrivateConn;
+ ePtr<iDVBSectionReader> m_PrivateReader;
+ 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();
void startEPG();
void abortEPG();
void abortNonAvail();
};
+ void FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service);
public:
- enum {NOWNEXT=1, SCHEDULE=2, SCHEDULE_OTHER=4};
+ enum {PRIVATE=0, NOWNEXT=1, SCHEDULE=2, SCHEDULE_OTHER=4};
struct Message
{
enum
updated,
isavail,
quit,
+ got_private_pid,
timeChanged
};
int type;
int err;
time_t time;
bool avail;
+ int pid;
};
Message()
:type(0), time(0) {}
updateMap channelLastUpdated;
static pthread_mutex_t cache_lock, channel_map_lock;
+#ifdef ENABLE_PRIVATE_EPG
+ contentMaps content_time_tables;
+#endif
+
void thread(); // thread function
// called from epgcache thread
void save();
void load();
+#ifdef ENABLE_PRIVATE_EPG
+ void privateSectionRead(const uniqueEPGKey &, const __u8 *);
+#endif
void sectionRead(const __u8 *data, int source, channel_data *channel);
void gotMessage(const Message &message);
void flushEPG(const uniqueEPGKey & s=uniqueEPGKey());
void DVBChannelRunning(iDVBChannel *);
timeMap::iterator m_timemap_cursor, m_timemap_end;
+ int currentQueryTsidOnid; // needed for getNextTimeEntry.. only valid until next startTimeQuery call
+#else
+ eEPGCache();
+ ~eEPGCache();
#endif // SWIG
public:
static eEPGCache *getInstance() { return instance; }
+#ifndef SWIG
eEPGCache();
~eEPGCache();
+#endif
// called from main thread
inline void Lock();
inline void Unlock();
+#ifdef ENABLE_PRIVATE_EPG
+ void PMTready(eDVBServicePMTHandler *pmthandler);
+#else
+ void PMTready(eDVBServicePMTHandler *pmthandler) {}
+#endif
// at moment just for one service..
RESULT startTimeQuery(const eServiceReference &service, time_t begin=-1, int minutes=-1);
+#ifndef SWIG
// eventData's are plain entrys out of the cache.. it's not safe to use them after cache unlock
// but its faster in use... its not allowed to delete this pointers via delete or free..
SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, const eventData *&SWIG_OUTPUT);
- SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, const eventData *&SWIG_OUTPUT);
+ SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, const eventData *&SWIG_OUTPUT, int direction=0);
SWIG_VOID(RESULT) getNextTimeEntry(const eventData *&SWIG_OUTPUT);
-#ifndef SWIG
// eit_event_struct's are plain dvb eit_events .. it's not safe to use them after cache unlock
// its not allowed to delete this pointers via delete or free..
RESULT lookupEventId(const eServiceReference &service, int event_id, const eit_event_struct *&);
- RESULT lookupEventTime(const eServiceReference &service, time_t , const eit_event_struct *&);
+ RESULT lookupEventTime(const eServiceReference &service, time_t , const eit_event_struct *&, int direction=0);
RESULT getNextTimeEntry(const eit_event_struct *&);
// Event's are parsed epg events.. it's safe to use them after cache unlock
// after use this Events must be deleted (memleaks)
RESULT lookupEventId(const eServiceReference &service, int event_id, Event* &);
- RESULT lookupEventTime(const eServiceReference &service, time_t, Event* &);
+ RESULT lookupEventTime(const eServiceReference &service, time_t, Event* &, int direction=0);
RESULT getNextTimeEntry(Event *&);
#endif
+ enum {
+ SIMILAR_BROADCASTINGS_SEARCH,
+ EXAKT_TITLE_SEARCH,
+ PARTIAL_TITLE_SEARCH
+ };
+ enum {
+ CASE_CHECK,
+ NO_CASE_CHECK
+ };
+ PyObject *lookupEvent(PyObject *list, PyObject *convertFunc=NULL);
+ PyObject *search(PyObject *);
// eServiceEvent are parsed epg events.. it's safe to use them after cache unlock
// for use from python ( members: m_start_time, m_duration, m_short_description, m_extended_description )
- SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, ePtr<eServiceEvent> &);
- SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, ePtr<eServiceEvent> &);
+ SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, ePtr<eServiceEvent> &SWIG_OUTPUT);
+ SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, ePtr<eServiceEvent> &SWIG_OUTPUT, int direction=0);
SWIG_VOID(RESULT) getNextTimeEntry(ePtr<eServiceEvent> &SWIG_OUTPUT);
};
git.cweiske.de / enigma2.git / blobdiff