summaryrefslogtreecommitdiff
path: root/dish.h
diff options
context:
space:
mode:
authorDimitar Petrovski <dimeptr@gmail.com>2011-10-29 10:54:47 (GMT)
committerDimitar Petrovski <dimeptr@gmail.com>2011-10-29 10:54:47 (GMT)
commite593a990f708d73ca5c1ad7636e39662722bcf05 (patch)
tree411500a6c33d56932b5478d875d63e27a63b9fb2 /dish.h
parent726d99a3ed5c12242e0e3c6416b3175c18dbedfd (diff)
parentb4da1b8b6dfec941cb97cc14c7fc14040a7695ff (diff)
downloadvdr-plugin-eepg-e593a990f708d73ca5c1ad7636e39662722bcf05.tar.gz
vdr-plugin-eepg-e593a990f708d73ca5c1ad7636e39662722bcf05.tar.bz2
Merge branch 'test-naepg2' into eit_test
use Tid to resolve conflicts with VDR
Diffstat (limited to 'dish.h')
-rw-r--r--dish.h21
1 files changed, 10 insertions, 11 deletions
diff --git a/dish.h b/dish.h
index 07f0547..369a4fd 100644
--- a/dish.h
+++ b/dish.h
@@ -243,12 +243,12 @@ namespace SI
#define SIZE_TABLE_128 128
#define SIZE_TABLE_255 255
-class UnimplementedDescriptor;
+using namespace std;
class DishDescriptor {
public:
DishDescriptor();
- virtual ~DishDescriptor();
+ virtual ~DishDescriptor();
const char* getName(void) const { return name; }
const char* getShortText(void);
const char *getDescription(void);
@@ -285,15 +285,14 @@ protected:
char* seriesId;
char* programId;
-
- struct HuffmanTable {
- unsigned int startingAddress;
- unsigned char character;
- unsigned char numberOfBits;
- };
- static HuffmanTable Table128[SIZE_TABLE_128];
- static HuffmanTable Table255[SIZE_TABLE_255];
-
+ struct HuffmanTable
+ {
+ unsigned int startingAddress;
+ unsigned char character;
+ unsigned char numberOfBits;
+ };
+ static HuffmanTable Table128[SIZE_TABLE_128];
+ static HuffmanTable Table255[SIZE_TABLE_255];
};
} /* namespace SI */