From 45aa02d117af1e6f0b5584de8b06827c4b5fd301 Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Sun, 2 Oct 2011 20:06:49 +0200 Subject: enable EIT scan in eepg --- eepg.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'eepg.h') diff --git a/eepg.h b/eepg.h index 503e800..d306ca0 100644 --- a/eepg.h +++ b/eepg.h @@ -30,14 +30,15 @@ enum EFormat { PREMIERE , FREEVIEW , DISH_BEV , + EIT , //the highest number of EPG-formats that is supported by this plugin - HIGHEST_FORMAT = DISH_BEV + HIGHEST_FORMAT = EIT } Format; #define NAGRA_TABLE_ID 0x55 //the lower the table Id, the more "current" it is; table_id 0x00 never gets overwritten, now/next are at 0x4e or 0x4f! #define DEFAULT_TABLE_ID 0x30 -const char *FormatName[]= {"MediaHighWay 1","MediaHighWay 2","Sky Italy","Sky UK","NagraGuide","Premiere","FreeView","Dish/Bev"}; +const char *FormatName[]= {"MediaHighWay 1","MediaHighWay 2","Sky Italy","Sky UK","NagraGuide","Premiere","FreeView","Dish/Bev","EIT"}; struct sNode { -- cgit v1.2.3 From 8f360572204b983ee963678359498a0ad2b8848a Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Fri, 18 May 2012 16:53:52 +0200 Subject: use equivalents map for all equivalents --- eepg.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'eepg.h') diff --git a/eepg.h b/eepg.h index d306ca0..b661809 100644 --- a/eepg.h +++ b/eepg.h @@ -7,7 +7,7 @@ #define MAX_CHANNELS 2048 #define MAX_TITLES 262144 -#define MAX_EQUIVALENCES 8 //the number of equivalences one channel can have +//#define MAX_EQUIVALENCES 8 //the number of equivalences one channel can have //Formats (need to be consecutively numbered): //#define PREMIERE 0 @@ -53,11 +53,11 @@ typedef struct { unsigned short int ChannelId; unsigned short int SkyNumber; - unsigned short int NumberOfEquivalences;//original channel sets this value to 1, every equivalent channel adds 1 - unsigned int Src[MAX_EQUIVALENCES]; - unsigned short int Nid[MAX_EQUIVALENCES]; - unsigned short int Tid[MAX_EQUIVALENCES]; - unsigned short int Sid[MAX_EQUIVALENCES]; + //unsigned short int NumberOfEquivalences;//original channel sets this value to 1, every equivalent channel adds 1 + unsigned int Src;//[MAX_EQUIVALENCES]; + unsigned short int Nid;//[MAX_EQUIVALENCES]; + unsigned short int Tid;//[MAX_EQUIVALENCES]; + unsigned short int Sid;//[MAX_EQUIVALENCES]; unsigned char Name[64]; } sChannel; -- cgit v1.2.3 From 61eded224bc4660b41f6754e83b91a262af3f8ce Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Wed, 23 May 2012 21:36:14 +0200 Subject: move equivalence to separate file/class --- eepg.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'eepg.h') diff --git a/eepg.h b/eepg.h index b661809..18690de 100644 --- a/eepg.h +++ b/eepg.h @@ -1,8 +1,6 @@ //#define DEBUG false //#define DEBUG_STARTTIME false -#define EEPG_FILE_EQUIV "eepg.equiv" - #define MAX_THEMES 2046 //this should always be >=256, or Nagra will go wrong!! #define MAX_CHANNELS 2048 #define MAX_TITLES 262144 -- 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 --- eepg.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'eepg.h') diff --git a/eepg.h b/eepg.h index 18690de..7e1cc74 100644 --- a/eepg.h +++ b/eepg.h @@ -17,21 +17,6 @@ //#define NAGRA 6 //#define HIGHEST_FORMAT 6 -enum EFormat { -//First all batchmode, load ONCE protocols: - MHW1 = 0, - MHW2 , - SKY_IT , - SKY_UK , - NAGRA , -//Than all CONTinuous protocols, so they will be processed LAST: - PREMIERE , - FREEVIEW , - DISH_BEV , - EIT , -//the highest number of EPG-formats that is supported by this plugin - HIGHEST_FORMAT = EIT -} Format; #define NAGRA_TABLE_ID 0x55 //the lower the table Id, the more "current" it is; table_id 0x00 never gets overwritten, now/next are at 0x4e or 0x4f! #define DEFAULT_TABLE_ID 0x30 -- cgit v1.2.3