From 079b90c7d5eb112a3876d005303a0e4caffe5921 Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Sun, 24 Apr 2011 20:10:42 +0200 Subject: modified formating --- eepg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'eepg.h') diff --git a/eepg.h b/eepg.h index 19bb9de..3581ad9 100644 --- a/eepg.h +++ b/eepg.h @@ -22,7 +22,7 @@ #define HIGHEST_FORMAT 6 //the highest number of EPG-formats that is supported by this plugin #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 0x60 +#define DEFAULT_TABLE_ID 0x30 const char *FormatName[]= {"Premiere","FreeView","MediaHighWay 1","MediaHighWay 2","Sky Italy","Sky UK","NagraGuide"}; -- cgit v1.2.3 From d202a909ef2601729f81e8f4720a3d384092652a Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Sun, 15 May 2011 01:51:54 +0200 Subject: Changed loging so that in can be modified (decorated) in the future Removed warnings Refactored some code fixed MHW1 so all summaries that are present are included --- eepg.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'eepg.h') diff --git a/eepg.h b/eepg.h index 3581ad9..01fa877 100644 --- a/eepg.h +++ b/eepg.h @@ -1,4 +1,4 @@ -#define DEBUG false +//#define DEBUG false //#define DEBUG_STARTTIME false #define EEPG_FILE_EQUIV "eepg.equiv" @@ -60,6 +60,7 @@ typedef struct { unsigned char Unknown2;//FIXME unsigned char Unknown3;//FIXME unsigned char Rating; + unsigned short int TableId; } Title_t; typedef struct { -- cgit v1.2.3 From d5e15ce71cd5cb0dda3dc3b4c3a9b4c057950bf6 Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Fri, 26 Aug 2011 11:43:24 +0200 Subject: Test support for Dish Network EEPG and Bell ExpressVU EEPG --- eepg.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'eepg.h') diff --git a/eepg.h b/eepg.h index 01fa877..0cda8cc 100644 --- a/eepg.h +++ b/eepg.h @@ -75,6 +75,37 @@ typedef struct { unsigned char * Text; } Summary_t; + +// -- InheritEnum.h +template +class InheritEnum +{ +public: + InheritEnum() {} + InheritEnum(EnumT e) + : enum_(e) + {} + + InheritEnum(BaseEnumT e) + : baseEnum_(e) + {} + + explicit InheritEnum( int val ) + : enum_(static_cast(val)) + {} + + operator EnumT() const { return enum_; } +private: + // Note - the value is declared as a union mainly for as a debugging aid. If + // the union is undesired and you have other methods of debugging, change it + // to either of EnumT and do a cast for the constructor that accepts BaseEnumT. + union + { + EnumT enum_; + BaseEnumT baseEnum_; + }; +}; + static const char *FileEquivalences[] = { "#", "# Simply add a list of the channels in this file with the following format:", -- cgit v1.2.3 From 42656ea682424e78b6f07fa43e22dc3207386ece Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Mon, 29 Aug 2011 10:40:26 +0200 Subject: add dish bev format and make sure it is always on for test --- eepg.h | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) (limited to 'eepg.h') diff --git a/eepg.h b/eepg.h index 0cda8cc..77577f8 100644 --- a/eepg.h +++ b/eepg.h @@ -10,21 +10,34 @@ #define MAX_EQUIVALENCES 8 //the number of equivalences one channel can have //Formats (need to be consecutively numbered): -//First all CONTinuous protocols, so they will be processed LAST: -#define PREMIERE 0 -#define FREEVIEW 1 -//Then all batchmode, load ONCE protocols: -#define MHW1 2 -#define MHW2 3 -#define SKY_IT 4 -#define SKY_UK 5 -#define NAGRA 6 -#define HIGHEST_FORMAT 6 //the highest number of EPG-formats that is supported by this plugin +//#define PREMIERE 0 +//#define FREEVIEW 1 +//#define MHW1 2 +//#define MHW2 3 +//#define SKY_IT 4 +//#define SKY_UK 5 +//#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 , +//the highest number of EPG-formats that is supported by this plugin + HIGHEST_FORMAT = DISH_BEV +} 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[]= {"Premiere","FreeView","MediaHighWay 1","MediaHighWay 2","Sky Italy","Sky UK","NagraGuide"}; +const char *FormatName[]= {"Premiere","FreeView","MediaHighWay 1","MediaHighWay 2","Sky Italy","Sky UK","NagraGuide","Dish/Bev"}; struct sNode { -- cgit v1.2.3 From fc9bad17bb4b9c4b85bda84ea8e76dbe19d0cca2 Mon Sep 17 00:00:00 2001 From: Dimitar Petrovski Date: Sat, 10 Sep 2011 11:00:45 +0200 Subject: fix format names since the order is changed --- eepg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'eepg.h') diff --git a/eepg.h b/eepg.h index 77577f8..503e800 100644 --- a/eepg.h +++ b/eepg.h @@ -37,7 +37,7 @@ enum EFormat { #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[]= {"Premiere","FreeView","MediaHighWay 1","MediaHighWay 2","Sky Italy","Sky UK","NagraGuide","Dish/Bev"}; +const char *FormatName[]= {"MediaHighWay 1","MediaHighWay 2","Sky Italy","Sky UK","NagraGuide","Premiere","FreeView","Dish/Bev"}; struct sNode { -- cgit v1.2.3