From e806e6ac89fa61fc6683bb14ac73d3173450226a Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Wed, 21 Nov 2012 15:38:48 +0100 Subject: change table ID numbers to enums vdr or extended --- eit2.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'eit2.h') diff --git a/eit2.h b/eit2.h index 7686672..c6251fe 100644 --- a/eit2.h +++ b/eit2.h @@ -7,11 +7,38 @@ namespace SI { + +enum TableIdExt { + TableIdSKYChannels = TableIdBAT, //SKYBOX channels information section 0x4A same as TableIdBAT + TableIdMHW1TitlesSummaries = 0x90, //MHW1 titles and summaries information section + TableIdMHW1Channels = 0x91, //MHW1 channels information section + TableIdMHW1Themes = 0x92, //MHW1 themes information section + TableIdMHW2Summaries = 0x96, //MHW2 summaries information section + //SKYBOX Titles range from 0xA0 to 0xA3. 0xA0 is also TableIdPremiereCIT + TableIdSKYTitlesA0 = TableIdPremiereCIT, //SKYBOX titles information section start + TableIdSKYTitles_first = 0xA1, //SKYBOX titles information section start + TableIdSKYTitles_last = 0xA3, //SKYBOX titles information section end + //SKYBOX Summaries range from 0xA8 to 0xAB. + TableIdSKYSummaries_first = 0xA8, //SKYBOX Summaries information section start + TableIdSKYSummaries_last = 0xAB, //SKYBOX Summaries information section end + TableIdNagraCIT = 0xB0, //NagraGuide content information section + TableIdMHW2ChannelsThemes = 0xC8, //MHW1 channels and themes information section + TableIdMHW2Titles = 0xE6 //MHW2 titles information section + +}; + + enum DescriptorTagExt { DishRatingDescriptorTag = 0x89, + SkyOTVDescriptorTag = 0x90, DishShortEventDescriptorTag = 0x91, DishExtendedEventDescriptorTag = 0x92, DishSeriesDescriptorTag = 0x96, + MHW1DescriptorTag = 0xC1, + MHW1_2DescriptorTag = 0xC2, + FreeviewDescriptorTag = 0xD1, + PremiereOrderInfoDescriptorTag = 0xF0, + PremiereRatingInfoDescriptorTag = 0xF1, }; // typedef InheritEnum< DescriptorTagExt, SI::DescriptorTag > ExtendedDescriptorTag; -- cgit v1.2.3 From 7f7ec60c3654f318fc4ec918a29b8b95c8c4a25e Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Fri, 17 Jun 2016 21:04:11 +0200 Subject: vdr 2.3.1 compatibility --- eit2.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'eit2.h') diff --git a/eit2.h b/eit2.h index 0cfd6e6..b9e6298 100644 --- a/eit2.h +++ b/eit2.h @@ -62,7 +62,7 @@ public: private: void ProcessEventDescriptors(bool ExternalData, int Source, u_char Tid, const SI::EIT::Event* SiEitEvent, cEvent* pEvent, - cSchedules* Schedules, cChannel* channel); + cSchedules* Schedules, const tChannelID& channelID); private: bool Empty; @@ -73,8 +73,7 @@ private: time_t SegmentEnd; cSchedules* Schedules; EFormat Format; - cChannel* channel; - + const cChannel* channel; }; } //end namespace SI -- cgit v1.2.3 From 7e30f7b7c80d41883ec9b0187dc9c47b6765a4d1 Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Sat, 11 Aug 2018 14:27:23 +0200 Subject: fix wrong lock sequence thanks to Matthias Feistel --- eit2.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'eit2.h') diff --git a/eit2.h b/eit2.h index b9e6298..65d4b82 100644 --- a/eit2.h +++ b/eit2.h @@ -51,7 +51,7 @@ extern bool SystemCharacterTableIsSingleByte;*/ class cEIT2:public SI::EIT { public: - cEIT2(cSchedules * Schedules, int Source, u_char Tid, const u_char * Data, + cEIT2(cChannels* Channels, cSchedules * Schedules, int Source, u_char Tid, const u_char * Data, EFormat format, bool isEITPid = false, bool OnlyRunningStatus = false); cEIT2 (cSchedule * Schedule, EFormat format); @@ -71,6 +71,7 @@ private: bool OnlyRunningStatus; time_t SegmentStart; time_t SegmentEnd; + cChannels* Channels; cSchedules* Schedules; EFormat Format; const cChannel* channel; -- cgit v1.2.3