From 7de1003a14fb4b41920896c550db4e58f53aea8d Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Tue, 16 Oct 2012 19:40:59 +0200 Subject: Drop unmanaged Disable Double EPG entry. EEPG tries to handle this anyway Drop unmanaged NOEPG support, there is a separate plugin for that Move cEIT2 in a separate file and try to use it in epghandler also --- eit2.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 eit2.h (limited to 'eit2.h') diff --git a/eit2.h b/eit2.h new file mode 100644 index 0000000..5d2e4bb --- /dev/null +++ b/eit2.h @@ -0,0 +1,49 @@ +#ifndef CEIT2_H_ +#define CEIT2_H_ +#include +#include +#include + +namespace SI +{ + enum DescriptorTagExt { + DishRatingDescriptorTag = 0x89, + DishShortEventDescriptorTag = 0x91, + DishExtendedEventDescriptorTag = 0x92, + DishSeriesDescriptorTag = 0x96, + }; + +// typedef InheritEnum< DescriptorTagExt, SI::DescriptorTag > ExtendedDescriptorTag; + +/*extern const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte = NULL); +extern bool convertCharacterTable(const char *from, size_t fromLength, char *to, size_t toLength, const char *fromCode); +extern bool SystemCharacterTableIsSingleByte;*/ +class cEIT2:public SI::EIT +{ +public: + cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Data, bool isEITPid = false, bool OnlyRunningStatus = false); + cEIT2 (cSchedule * Schedule); +//protected: +// void updateEquivalent(cSchedules * Schedules, tChannelID channelID, cEvent *pEvent); + cEvent* ProcessEitEvent(cSchedule *Schedule, const SI::EIT::Event *EitEvent, uchar TableID, uchar Version); + +private: + void + ProcessEventDescriptors(bool ExternalData, + int Source, u_char Tid, const SI::EIT::Event* SiEitEvent, cEvent* pEvent, + cSchedules* Schedules, cChannel* channel); + +private: + bool Empty; + bool Modified; +// bool HasExternalData = false; + time_t SegmentStart; + time_t SegmentEnd; + cSchedules* Schedules; + cChannel* channel; + + bool OnlyRunningStatus; + }; +} //end namespace SI + +#endif /* CEIT2_H_ */ -- cgit v1.2.3 From cee549473dacfa3e82cb13bd9bbe1c8f0e8c1a6a Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Tue, 16 Oct 2012 21:01:06 +0200 Subject: fix some includes --- eit2.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'eit2.h') diff --git a/eit2.h b/eit2.h index 5d2e4bb..e052b2d 100644 --- a/eit2.h +++ b/eit2.h @@ -3,6 +3,7 @@ #include #include #include +#include namespace SI { @@ -28,10 +29,9 @@ public: cEvent* ProcessEitEvent(cSchedule *Schedule, const SI::EIT::Event *EitEvent, uchar TableID, uchar Version); private: - void - ProcessEventDescriptors(bool ExternalData, - int Source, u_char Tid, const SI::EIT::Event* SiEitEvent, cEvent* pEvent, - cSchedules* Schedules, cChannel* channel); + void ProcessEventDescriptors(bool ExternalData, + int Source, u_char Tid, const SI::EIT::Event* SiEitEvent, cEvent* pEvent, + cSchedules* Schedules, cChannel* channel); private: bool Empty; -- cgit v1.2.3 From 6810f79e1b5f78a0b3d2389714924738295a6497 Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Thu, 18 Oct 2012 14:32:04 +0200 Subject: fix compile --- eit2.h | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'eit2.h') diff --git a/eit2.h b/eit2.h index e052b2d..7686672 100644 --- a/eit2.h +++ b/eit2.h @@ -7,12 +7,12 @@ namespace SI { - enum DescriptorTagExt { - DishRatingDescriptorTag = 0x89, - DishShortEventDescriptorTag = 0x91, - DishExtendedEventDescriptorTag = 0x92, - DishSeriesDescriptorTag = 0x96, - }; +enum DescriptorTagExt { + DishRatingDescriptorTag = 0x89, + DishShortEventDescriptorTag = 0x91, + DishExtendedEventDescriptorTag = 0x92, + DishSeriesDescriptorTag = 0x96, +}; // typedef InheritEnum< DescriptorTagExt, SI::DescriptorTag > ExtendedDescriptorTag; @@ -22,28 +22,29 @@ extern bool SystemCharacterTableIsSingleByte;*/ class cEIT2:public SI::EIT { public: - cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Data, bool isEITPid = false, bool OnlyRunningStatus = false); + cEIT2(cSchedules * Schedules, int Source, u_char Tid, const u_char * Data, bool isEITPid = false, + bool OnlyRunningStatus = false); cEIT2 (cSchedule * Schedule); -//protected: -// void updateEquivalent(cSchedules * Schedules, tChannelID channelID, cEvent *pEvent); + //protected: + // void updateEquivalent(cSchedules * Schedules, tChannelID channelID, cEvent *pEvent); cEvent* ProcessEitEvent(cSchedule *Schedule, const SI::EIT::Event *EitEvent, uchar TableID, uchar Version); private: - void ProcessEventDescriptors(bool ExternalData, - int Source, u_char Tid, const SI::EIT::Event* SiEitEvent, cEvent* pEvent, - cSchedules* Schedules, cChannel* channel); + void ProcessEventDescriptors(bool ExternalData, int Source, u_char Tid, + const SI::EIT::Event* SiEitEvent, cEvent* pEvent, + cSchedules* Schedules, cChannel* channel); private: - bool Empty; - bool Modified; -// bool HasExternalData = false; - time_t SegmentStart; - time_t SegmentEnd; - cSchedules* Schedules; - cChannel* channel; + bool Empty; + bool Modified; + // bool HasExternalData = false; + bool OnlyRunningStatus; + time_t SegmentStart; + time_t SegmentEnd; + cSchedules* Schedules; + cChannel* channel; - bool OnlyRunningStatus; - }; +}; } //end namespace SI #endif /* CEIT2_H_ */ -- cgit v1.2.3