From 8bab540df87c3f38369c772fd956f85cd655cf6e Mon Sep 17 00:00:00 2001
From: Dimitar Petrovski <dimeptr@gmail.com>
Date: Thu, 13 Oct 2011 20:40:14 +0200
Subject: test merge branches

---
 dish.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'dish.h')

diff --git a/dish.h b/dish.h
index fb1689c..963fb42 100644
--- a/dish.h
+++ b/dish.h
@@ -10,6 +10,8 @@
 #ifndef LIBSI_DISH_H
 #define LIBSI_DISH_H
 
+#include <vdr/tools.h>
+
 namespace SI
 {
 
@@ -243,7 +245,7 @@ class UnimplementedDescriptor;
 
 class DishDescriptor {
 public:
-   DishDescriptor(UnimplementedDescriptor*);
+    DishDescriptor();
    virtual ~DishDescriptor();
    const char* getText(void) const { return text; }
 
@@ -251,12 +253,11 @@ public:
    const char* getTheme(int contentNibleLvl2);
    const char* getCategory(int userNible);
    // Decompress the byte arrary and stores the result to a text string
-   void Decompress(unsigned char Tid);
+   void Decompress(unsigned char Tid, CharArray data);
 protected:
    const char* text; // name or description of the event
    const char* shortText; // usually the episode name
    unsigned char* decompressed;
-   UnimplementedDescriptor* unimplementedDesc;
 
    struct HuffmanTable {
       unsigned int  startingAddress;
-- 
cgit v1.2.3