X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fepgcache.h;h=dca05a52836f7c8c14421485e7e7968f51c7cac2;hp=fe768aee714c701bb00096c2fcd971d660e62220;hb=7709c1d61e799fa06a257f1d6b9c23ae205fe0c9;hpb=c606126c3efaec7e3fdf1283fc37dfb7140bee13 diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h index fe768ae..dca05a5 100644 --- a/lib/dvb/epgcache.h +++ b/lib/dvb/epgcache.h @@ -6,10 +6,23 @@ #ifndef SWIG +/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ +#if defined (__GNUC__) && defined (__GNUC_MINOR__) +#define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else +#define __GNUC_PREREQ(maj, min) 0 +#endif + #include #include +#if 0 && __GNUC_PREREQ(4,3) +#include +#include +#else #include #include +#endif #include @@ -92,7 +105,14 @@ struct hash_uniqueEPGKey }; #define tidMap std::set<__u32> -#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ == 4 ) // check if gcc version >= 3.1 +#if 0 && __GNUC_PREREQ(4,3) + #define eventCache std::unordered_map, hash_uniqueEPGKey, uniqueEPGKey::equal> + #ifdef ENABLE_PRIVATE_EPG + #define contentTimeMap std::unordered_map > + #define contentMap std::unordered_map + #define contentMaps std::unordered_map + #endif +#elif __GNUC_PREREQ(3,1) #define eventCache __gnu_cxx::hash_map, hash_uniqueEPGKey, uniqueEPGKey::equal> #ifdef ENABLE_PRIVATE_EPG #define contentTimeMap __gnu_cxx::hash_map > @@ -155,15 +175,15 @@ class eEPGCache: public eMainloop, private eThread, public Object pthread_mutex_t channel_active; channel_data(eEPGCache*); eEPGCache *cache; - eTimer abortTimer, zapTimer; + ePtr abortTimer, zapTimer; int prevChannelState; __u8 state, isRunning, haveData; ePtr channel; - ePtr m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn; - ePtr m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader; - tidMap seenSections[3], calcedSections[3]; + ePtr m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn, m_ViasatConn; + ePtr m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader, m_ViasatReader; + tidMap seenSections[4], calcedSections[4]; #ifdef ENABLE_PRIVATE_EPG - eTimer startPrivateTimer; + ePtr startPrivateTimer; int m_PrevVersion; int m_PrivatePid; uniqueEPGKey m_PrivateService; @@ -177,11 +197,12 @@ class eEPGCache: public eMainloop, private eThread, public Object std::vector m_channels; std::map<__u8, mhw_theme_name_t> m_themes; std::map<__u32, mhw_title_t> m_titles; - std::map<__u32, __u32> m_program_ids; + std::multimap<__u32, __u32> m_program_ids; ePtr m_MHWConn, m_MHWConn2; ePtr m_MHWReader, m_MHWReader2; eDVBSectionFilterMask m_MHWFilterMask, m_MHWFilterMask2; - eTimer m_MHWTimeoutTimer; + ePtr m_MHWTimeoutTimer; + __u16 m_mhw2_channel_pid, m_mhw2_title_pid, m_mhw2_summary_pid; bool m_MHWTimeoutet; void MHWTimeout() { m_MHWTimeoutet=true; } void readMHWData(const __u8 *data); @@ -198,18 +219,20 @@ class eEPGCache: public eMainloop, private eThread, public Object void storeTitle(std::map<__u32, mhw_title_t>::iterator itTitle, std::string sumText, const __u8 *data); #endif void readData(const __u8 *data); + void readDataViasat(const __u8 *data); void startChannel(); void startEPG(); bool finishEPG(); void abortEPG(); void abortNonAvail(); }; - void FixOverlapping(std::pair &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service); + bool FixOverlapping(std::pair &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service); public: enum {PRIVATE=0, NOWNEXT=1, SCHEDULE=2, SCHEDULE_OTHER=4 #ifdef ENABLE_MHW_EPG ,MHW=8 #endif + ,VIASAT=16 }; struct Message { @@ -218,12 +241,11 @@ public: flush, startChannel, leaveChannel, - pause, - restart, - updated, - isavail, quit, got_private_pid, + got_mhw2_channel_pid, + got_mhw2_title_pid, + got_mhw2_summary_pid, timeChanged }; int type; @@ -253,7 +275,7 @@ private: friend class channel_data; static eEPGCache *instance; - eTimer cleanTimer; + ePtr cleanTimer; std::map m_knownChannels; ePtr m_chanAddedConn; @@ -268,6 +290,7 @@ private: void thread(); // thread function // called from epgcache thread + char m_filename[1024]; void save(); void load(); #ifdef ENABLE_PRIVATE_EPG @@ -313,9 +336,9 @@ public: #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, int direction=0); - SWIG_VOID(RESULT) getNextTimeEntry(const eventData *&SWIG_OUTPUT); + RESULT lookupEventId(const eServiceReference &service, int event_id, const eventData *&); + RESULT lookupEventTime(const eServiceReference &service, time_t, const eventData *&, int direction=0); + RESULT getNextTimeEntry(const eventData *&); // 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.. @@ -338,8 +361,8 @@ public: CASE_CHECK, NO_CASE_CHECK }; - PyObject *lookupEvent(PyObject *list, PyObject *convertFunc=NULL); - PyObject *search(PyObject *); + PyObject *lookupEvent(SWIG_PYOBJECT(ePyObject) list, SWIG_PYOBJECT(ePyObject) convertFunc=(PyObject*)0); + PyObject *search(SWIG_PYOBJECT(ePyObject)); // 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 )