moved dish descriptor to separate files

added dish theme/category

3 files changed, 636 insertions, 300 deletions

diff --git a/dish.c b/dish.c
new file mode 100644
index 0000000..f20faf1
--- /dev/null
+++ b/dish.c
@@ -0,0 +1,323 @@
+/***************************************************************************
+ *                                                                         *
+ *   These routines decompress Huffman coded Dish Network EIT data.        *
+ *   The implementation is based on the algorithm presentend in            *
+ *                                                                         *
+ *     "A memory-efficient Huffman decoding algorithm"                     *
+ *     Pi-Chung Wang, Yuan-Rung Yang, Chun-Liang Lee, Hung-Yi Chang        *
+ *     Proceedings of the 19th International Conference on Advanced        *
+ *     Information Networking and Applications (AINA'05)                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "dish.h"
+#include <libsi/si.h>
+#include <string.h>
+#include <stdlib.h>
+
+namespace SI
+{
+
+  // returns the value of a sequence of bits in the byte array
+  static unsigned int getBits(int bitIndex, int bitCount, const unsigned char *byteptr, int length)
+  {
+     union {
+        unsigned char b[4];
+        unsigned long val;
+     } chunk;
+
+     int offset = bitIndex >> 3;
+     int bitnum = bitIndex - (offset << 3);
+     int rightend = 32 - bitnum - bitCount;
+
+     chunk.b[3] = byteptr[offset];
+     chunk.b[2] = (offset+1 < length) ? byteptr[offset+1] : 0;
+     chunk.b[1] = (offset+2 < length) ? byteptr[offset+2] : 0;
+     chunk.b[0] = 0; // Never need to look this far ahead.
+
+     return (unsigned int)(((chunk.val & (0xFFFFFFFF >> bitnum)) >> rightend));
+    }
+
+    DishDescriptor::DishDescriptor(UnimplementedDescriptor *unimplementedDesc)
+    {
+        text = NULL;
+        shortText = NULL;
+        decompressed = NULL;
+        this->unimplementedDesc = unimplementedDesc;
+    }
+
+    DishDescriptor::~DishDescriptor()
+    {
+        delete [] decompressed;
+        decompressed = NULL;
+        delete unimplementedDesc;
+    }
+
+    const char *DishDescriptor::getTheme(int contentNibleLvl2)
+    {
+      const char* theme;
+      using namespace DISH_THEMES;
+
+      eDishThemes t;
+      switch (t) {
+        case Movie:
+          theme = "Movie";
+          break;
+        case Sports:
+          theme = "Sports";
+            break;
+        case News_Business:
+          theme = "News/Business";
+            break;
+        case Family_Children:
+          theme = "Family/Children";
+            break;
+        case Education:
+          theme = "Education";
+            break;
+        case Series_Special:
+          theme = "Series/Special";
+            break;
+        case Music_Art:
+          theme = "Music/Art";
+            break;
+        case Religious:
+          theme = "Religious";
+            break;
+        default:
+          theme = "";
+          break;
+      }
+      return theme;
+    }
+
+    const char *DishDescriptor::getCategory(int userNible)
+    {
+      using namespace DISH_CATEGORIES;
+
+      switch (userNible) {
+      case Action: return "Action";
+      case ActionSports:              return "Action Sports";
+      case Adults_only:               return "Adults only";
+      case Adventure:                 return "Adventure";
+      case Agriculture:               return "Agriculture";
+      case AirRacing:                 return "Air racing";
+      case Animals:                   return "Animals";
+      case Animated:                  return "Animated";
+      case Anime:                     return "Anime";
+      case Anthology:                 return "Anthology";
+      case ArmWrestling:              return "Arm wrestling";
+      case Art:                       return "Art";
+      case Arts_crafts:               return "Arts/crafts";
+      case Auction:                   return "Auction";
+      case Auto:                      return "Auto";
+      case AutoRacing:                return "Auto racing";
+      case Awards:                    return "Awards";
+      case Badminton:                 return "Badminton";
+      case Ballet:                    return "Ballet";
+      case Baseball:                  return "Baseball";
+      case Basketball:                return "Basketball";
+      case BicycleRacing:             return "Bicycle racing";
+      case Biography:                 return "Biography";
+      case Boat:                      return "Boat";
+      case BoatRacing:                return "Boat racing";
+      case Bowling:                   return "Bowling";
+      case Boxing:                    return "Boxing";
+      case Bus_financial:             return "Bus./financial";
+      case CardGames:                 return "Card games";
+      case Children:                  return "Children";
+      case ChildrenMusic:             return "Children music";
+      case ChildrenNews:              return "Children news";
+      case ChildrenSpecial:           return "Children special";
+      case Collectibles:              return "Collectibles";
+      case Comedy:                    return "Comedy";
+      case ComedyDrama:               return "Comedy-drama";
+      case Community:                 return "Community";
+      case Computers:                 return "Computers";
+      case Consumer:                  return "Consumer";
+      case Cooking:                   return "Cooking";
+      case Crime:                     return "Crime";
+      case CrimeDrama:                return "Crime drama";
+      case Dance:                     return "Dance";
+      case Debate:                    return "Debate";
+      case DishNetwork:               return "Dish Network";
+      case Docudrama:                 return "Docudrama";
+      case Documentary:               return "Documentary";
+      case DogShow:                   return "DogShow";
+      case DragRacing:                return "DragRacing";
+      case Drama:                     return "Drama";
+      case Educational:               return "Educational";
+      case Entertainment:             return "Entertainment";
+      case Environment:               return "Environment";
+      case Equestrian:                return "Equestrian";
+      case Excercise:                 return "Excercise";
+      case Fantasy:                   return "Fantasy";
+      case Fashion:                   return "Fashion";
+      case FieldHockey:               return "Field hockey";
+      case Fishing:                   return "Fishing";
+      case Football:
+      case Football2:                 return "Football";
+      case French:                    return "French";
+      case Fundraiser:                return "Fundraiser";
+      case GameShow:                  return "GameShow";
+      case Gay_lesbian:               return "Gay/lesbian";
+      case Golf:                      return "Golf";
+      case Gymnastics:                return "Gymnastics";
+      case Handball:                  return "Handball";
+      case Health:                    return "Health";
+      case HistoricalDrama:           return "Historical drama";
+      case History:                   return "History";
+      case Hockey:                    return "Hockey";
+      case Holiday:                   return "Holiday";
+      case HolidayChildren:           return "Holiday children";
+      case HolidayChildrenSpecial:    return "Holiday children special";
+      case HolidaySpecial:            return "Holiday special";
+      case HomeImprovement:           return "Home improvement";
+      case Horror:                    return "Horror";
+      case HorseRacing:               return "Horse racing";
+      case House_garden:              return "House/garden";
+      case HowTo:                     return "HowTo";
+      case Hunting:                   return "Hunting";
+      case HydroplaneRacing:          return "Hydroplane racing";
+      case Interview:                 return "Interview";
+      case Lacrosse:                  return "Lacrosse";
+      case Law:                       return "Law";
+      case MartialArts:               return "Martial arts";
+      case Medical:                   return "Medical";
+      case Military:                  return "Military";
+      case Miniseries:                return "Miniseries";
+      case MixedMartialArts:          return "Mixed martial arts";
+      case Motorcycle:                return "Motorcycle";
+      case MotorcycleRacing:          return "Motorcycle racing";
+      case Motorsports:               return "Motorsports";
+      case Music:                     return "Music";
+      case MusicSpecial:              return "Music special";
+      case MusicTalk:                 return "Music talk";
+      case Musical:                   return "Musical";
+      case MusicalComedy:             return "Musical comedy";
+      case Mystery:                   return "Mystery";
+      case Nature:                    return "Nature";
+      case News:                      return "News";
+      case Newsmagazine:              return "Newsmagazine";
+      case Opera:                     return "Opera";
+      case Outdoors:                  return "Outdoors";
+      case Paranormal:                return "Paranormal";
+      case Parenting:                 return "Parenting";
+      case PerformingArts:            return "Performing arts";
+      case Poker:                     return "Poker";
+      case Politics:                  return "Politics";
+      case ProWrestling:              return "Pro wrestling";
+      case PublicAffairs:             return "Public affairs";
+      case Reality:                   return "Reality";
+      case Religious:                 return "Religious";
+      case Rodeo:                     return "Rodeo";
+      case Romance:                   return "Romance";
+      case RomanceComedy:             return "Romance comedy";
+      case Rugby:                     return "Rugby";
+      case Running:                   return "Running";
+      case Sailing:                   return "Sailing";
+      case Science:                   return "Science";
+      case ScienceFiction:            return "Science fiction";
+      case SelfImprovement:           return "Self improvement";
+      case Shooting:                  return "Shooting";
+      case Shopping:                  return "Shopping";
+      case Sitcom:                    return "Sitcom";
+      case Skateboarding:             return "Skateboarding";
+      case Skiing:                    return "Skiing";
+      case Snowboarding:              return "Snowboarding";
+      case Soap:                      return "Soap";
+      case Soccor:                    return "Soccor";
+      case Softball:                  return "Softball";
+      case Spanish:                   return "Spanish";
+      case Special:                   return "Special";
+      case SportsNonEvent:            return "SportsNonEvent";
+      case SportsTalk:                return "SportsTalk";
+      case Standup:                   return "Standup";
+      case Surfing:                   return "Surfing";
+      case Suspense:                  return "Suspense";
+      case Swimming:                  return "Swimming";
+      case Talk:                      return "Talk";
+      case Technology:                return "Technology";
+      case Tennis:
+      case Tennis2:                   return "Tennis";
+      case Track_field:               return "Track/field";
+      case Travel:                    return "Travel";
+      case Triathlon:                 return "Triathlon";
+      case Variety:                   return "Variety";
+      case Volleyball:                return "Volleyball";
+      case War:                       return "War";
+      case Watersports:               return "Watersports";
+      case Weather:                   return "Weather";
+      case Western:                   return "Western";
+      case Wrestling:                 return "Wrestling";
+      case Yoga:                      return "Yoga";
+      default: return "";
+      }
+
+    }
+
+    void DishDescriptor::Decompress(unsigned char Tid)
+    {
+        const unsigned char *str = unimplementedDesc->getData().getData();
+        const unsigned char *cmp = NULL; // Compressed data
+        int length = 0; // Length of compressed data
+        unsigned int dLength = 0; // Length of decompressed data
+        if((str[3] & 0xFC) == 0x80){
+            length = str[1] - 2;
+            dLength = (str[2] & 0x40) ? ((str[3] << 6) & 0xFF) | (str[2] & 0x3F) : str[2] & 0x3F;
+            cmp = str + 4;
+        }else{
+            length = str[1] - 1;
+            dLength = str[2] & 0x7F;
+            cmp = str + 3;
+        }
+        if(length <= 0 || !dLength)
+            return;
+
+        decompressed = new unsigned char[dLength + 1];
+        HuffmanTable *table;
+        unsigned int tableSize, numBits;
+        if (Tid > 0x80) {
+        table = Table255;
+        tableSize = SIZE_TABLE_255;
+        numBits = 13;
+     }
+     else {
+        table = Table128;
+        tableSize = SIZE_TABLE_128;
+        numBits = 11;
+     }
+        unsigned int bLength = length << 3; // number of bits
+        unsigned int currentBit = 0, count = 0;
+        while(currentBit < bLength - 1 && count < dLength){
+            // Find the interval containing the sequence of length numBits starting
+            // at currentBit. The corresponding character will  be the one encoded
+            // at the begin of the sequence.
+            unsigned int code = getBits(currentBit, numBits, cmp, length);
+            // We could use a binary search, but in practice this linear search is faster.
+            unsigned int index = 0;
+            while(table[index].startingAddress <= code && index < tableSize){
+                index++;
+            }
+            index--;
+            decompressed[count++] = table[index].character;
+            currentBit += table[index].numberOfBits;
+        }
+
+        decompressed[count] = 0;
+        char *split = strchr((char*)(decompressed), 0x0D); // Look for carriage return
+        //LogD(2, prep("dLength:%d, length:%d, count:%d, decompressed: %s"), dLength, length, count, decompressed);
+        if(split){
+            *split = 0;
+            shortText = (char*)(decompressed);
+            text = (split[1] == 0x20) ? split + 2 : split + 1;
+        }else{
+            text = (char*)(decompressed);
+        }
+    }
+
+    struct DishDescriptor::HuffmanTable DishDescriptor::Table128[SIZE_TABLE_128] = {{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}};
+    struct DishDescriptor::HuffmanTable DishDescriptor::Table255[SIZE_TABLE_255] = {{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}
+  };
+
+} /* namespace SI */
diff --git a/dish.h b/dish.h
new file mode 100644
index 0000000..80d2c6a
--- /dev/null
+++ b/dish.h
@@ -0,0 +1,272 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef LIBSI_DISH_H
+#define LIBSI_DISH_H
+
+namespace SI
+{
+
+#define SIZE_TABLE_128 128
+#define SIZE_TABLE_255 255
+
+class UnimplementedDescriptor;
+
+class DishDescriptor {
+public:
+   DishDescriptor(UnimplementedDescriptor*);
+   virtual ~DishDescriptor();
+   const char* getText(void) const { return text; }
+
+   const char* getShortText(void) const { return shortText; }
+   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);
+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;
+      unsigned char character;
+      unsigned char numberOfBits;
+   };
+   static HuffmanTable Table128[SIZE_TABLE_128];
+   static HuffmanTable Table255[SIZE_TABLE_255];
+
+   namespace DISH_THEMES {
+     enum eDishThemes {
+      Movie           = 0x01,
+      Sports          = 0x02,
+      News_Business   = 0x03,
+      Family_Children = 0x04,
+      Education       = 0x05,
+      Series_Special  = 0x06,
+      Music_Art       = 0x07,
+      Religious       = 0x08
+     };
+   };
+
+   namespace DISH_CATEGORIES {
+     enum eDishCategories {
+        Action                   = 0x01,
+        Adults_only              = 0x02,
+        Adventure                = 0x03,
+        Animals                  = 0x04,
+        Animated                 = 0x05,
+     //  Anime
+        Anthology                = 0x07,
+        Art                      = 0x08,
+        Auto                     = 0x09,
+        Awards                   = 0x0a,
+        Ballet                   = 0x0b,
+        Baseball                 = 0x0c,
+        Basketball               = 0x0d,
+     //  Beach soccer
+     //  Beach volleyball
+     //  Biathlon
+        Biography                = 0x11,
+        Boat                     = 0x12,
+     //  Boat racing
+        Bowling                  = 0x14,
+        Boxing                   = 0x15,
+        Bus_financial            = 0x16,
+        Children                 = 0x1a,
+        ChildrenSpecial          = 0x1b,
+        ChildrenNews             = 0x1c,
+        ChildrenMusic            = 0x1d,
+        Collectibles             = 0x1f,
+        Comedy                   = 0x20,
+        ComedyDrama              = 0x21,
+        Computers                = 0x22,
+        Cooking                  = 0x23,
+        Crime                    = 0x24,
+        CrimeDrama               = 0x25,
+     //  Curling
+        Dance                    = 0x27,
+     //  Dark comedy
+        Docudrama                = 0x29,
+        Documentary              = 0x2a,
+        Drama                    = 0x2b,
+        Educational              = 0x2c,
+     //  Erotic
+        Excercise                = 0x2f,
+        Fantasy                  = 0x31,
+        Fashion                   = 0x32,
+     //  Fencing
+        Fishing                  = 0x34,
+        Football                 = 0x35,
+        French                   = 0x36,
+        Fundraiser               = 0x37,
+        GameShow                 = 0x38,
+        Golf                     = 0x39,
+        Gymnastics               = 0x3a,
+        Health                   = 0x3b,
+        History                  = 0x3c,
+        HistoricalDrama          = 0x3d,
+        Hockey                   = 0x3e,
+        Holiday                  = 0x3f,
+        HolidayChildren          = 0x40,
+        HolidayChildrenSpecial   = 0x41,
+     //  Holiday music
+     //  Holiday music special
+        HolidaySpecial           = 0x44,
+        Horror                   = 0x45,
+        HorseRacing              = 0x46,
+        House_garden             = 0x47,
+        HowTo                    = 0x49,
+        Interview                = 0x4b,
+        Lacrosse                 = 0x4d,
+        MartialArts              = 0x4f,
+        Medical                  = 0x50,
+        Miniseries               = 0x51,
+        Motorsports              = 0x52,
+        Motorcycle               = 0x53,
+        Music                    = 0x54,
+        MusicSpecial             = 0x55,
+        MusicTalk                = 0x56,
+        Musical                  = 0x57,
+        MusicalComedy            = 0x58,
+        Mystery                  = 0x5a,
+        Nature                   = 0x5b,
+        News                     = 0x5c,
+     //  Olympics
+        Opera                    = 0x5f,
+        Outdoors                 = 0x60,
+     //  Parade
+     //  Politics                =  0x62,
+        PublicAffairs            = 0x63,
+        Reality                  = 0x66,
+        Religious                = 0x67,
+        Rodeo                    = 0x68,
+        Romance                  = 0x69,
+        RomanceComedy            = 0x6a,
+        Rugby                    = 0x6b,
+        Running                  = 0x6c,
+        Science                  = 0x6e,
+        ScienceFiction           = 0x6f,
+        SelfImprovement          = 0x70,
+        Shopping                 = 0x71,
+        Skiing                   = 0x74,
+        Soap                     = 0x77,
+     //  Soap special
+     //  Soap talk
+        Soccor                   = 0x7b,
+        Softball                 = 0x7c,
+        Spanish                  = 0x7d,
+        Special                  = 0x7e,
+     //  Speedskating
+     //  Sports event
+        SportsNonEvent           = 0x81,
+        SportsTalk               = 0x82,
+        Suspense                 = 0x83,
+        Swimming                 = 0x85,
+        Talk                     = 0x86,
+        Tennis                   = 0x87,
+     //  Theater
+     //  Thriller
+        Track_field              = 0x89,
+        Travel                   = 0x8a,
+        Variety                  = 0x8b,
+        Volleyball               = 0x8c,
+        War                      = 0x8d,
+        Watersports              = 0x8e,
+        Weather                  = 0x8f,
+        Western                  = 0x90,
+        Wrestling                = 0x92,
+        Yoga                     = 0x93,
+        Agriculture              = 0x94,
+        Anime                    = 0x95,
+        ArmWrestling             = 0x97,
+        Arts_crafts              = 0x98,
+        Auction                  = 0x99,
+        AutoRacing               = 0x9a,
+        AirRacing                = 0x9b,
+        Badminton                = 0x9c,
+     //  Bicycle
+        BicycleRacing            = 0xa0,
+        BoatRacing               = 0xa1,
+     //  Bobsled
+     //  Bodybilding
+     //  Canoe
+     //  Cheerleading
+        Community                = 0xa6,
+        Consumer                 = 0xa7,
+     //  Darts
+        Debate                   = 0xaa,
+     //  Diving
+        DogShow                  = 0xac,
+        DragRacing               = 0xad,
+        Entertainment            = 0xae,
+        Environment              = 0xaf,
+        Equestrian               = 0xb0,
+     //  Event
+        FieldHockey              = 0xb3,
+     //  Figure skating
+        Football2                = 0xb5,
+        Gay_lesbian              = 0xb6,
+        Handball                 = 0xb7,
+        HomeImprovement          = 0xb8,
+        Hunting                  = 0xb9,
+     //  Hurling
+        HydroplaneRacing         = 0xbb,
+     //  Indoor soccer
+     //  Intl hockey
+     //  Intl soccer
+     //  Kayaking
+        Law                      = 0xc1,
+     //  Luge
+     //  Mountain biking
+        MotorcycleRacing         = 0xc3,
+        Newsmagazine             = 0xc5,
+        Paranormal               = 0xc7,
+        Parenting                = 0xc8,
+        PerformingArts           = 0xca,
+     //  Playoff sports
+        Politics                 = 0xcc,
+     //  Polo
+     //  Pool
+        ProWrestling             = 0xcf,
+     //  Ringuette
+     //  Roller derby
+     //  Rowing
+        Sailing                  = 0xd3,
+        Shooting                 = 0xd4,
+        Sitcom                   = 0xd5,
+        Skateboarding            = 0xd6,
+     //  Skating
+     //  Skeleton
+        Snowboarding             = 0xd9,
+     //  Snowmobile              =  0xda,
+        Standup                  = 0xdd,
+     //  Sumo wrestling
+        Surfing                  = 0xdf,
+        Tennis2                  = 0xe0,
+        Triathlon                = 0xe1,
+     //  Water polo
+     //  Water skiing
+     //  Weightlifting
+     //  Yacht racing
+        CardGames                = 0xe6 ,
+        Poker                    = 0xe7 ,
+     //  Musical                 =  0xe9,
+        Military                 = 0xea,
+        Technology               = 0xeb,
+        MixedMartialArts         = 0xec,
+        ActionSports             = 0xed,
+        DishNetwork              = 0xff
+     };
+   };
+};
+
+} /* namespace SI */
+#endif /* LIBSI_DISH_H */
diff --git a/eepg.c b/eepg.c
index 69b9c92..0183e12 100644
--- a/eepg.c
+++ b/eepg.c
@@ -37,6 +37,7 @@
 #include <libsi/descriptor.h>
 #include <libsi/si.h>
 #include "eepg.h"
+#include "dish.h"
 
 #include <map>
 #include <string>
@@ -288,7 +289,7 @@ private:
   bool EndChannels, EndThemes; //only used for ??
   int MHWStartTime; //only used for MHW1
   bool ChannelsOk;
-  int Format; //the format that this filter currently is processing
+  //int Format; //the format that this filter currently is processing
   std::map < int, int >ChannelSeq; // ChannelSeq[ChannelId] returns the recordnumber of the channel
 
   Summary_t *Summaries[MAX_TITLES];
@@ -2677,7 +2678,8 @@ void cFilterEEPG::LoadIntoSchedule (void)
 
       if (!foundtitle)  //no more titles with summaries
         break;
-      if ((T->EventId == S->EventId) && (T->MjdTime == S->Replays[0].MjdTime) && ((T->ChannelId == S->Replays[0].ChannelId) || ((Format != SKY_IT) && (Format != SKY_UK)))) { //should always be true, titles and summaries are broadcasted in order...
+      if ((T->EventId == S->EventId) && (T->MjdTime == S->Replays[0].MjdTime)
+          && ((T->ChannelId == S->Replays[0].ChannelId) || ((Format != SKY_IT) && (Format != SKY_UK)))) { //should always be true, titles and summaries are broadcasted in order...
         LogD(3, prep("T->EventId == S->EventId"));
         //MjdTime = 0 for all but SKY
         //S->ChannelId must be equal to T->ChannelId only for SKY; in MHW1 S->ChannelId overrides T->ChannelId when NumReplays > 1
@@ -2816,57 +2818,28 @@ namespace SI
 
   // typedef InheritEnum< DescriptorTagExt, SI::DescriptorTag > ExtendedDescriptorTag;
 
-#ifndef LIBSI_DISH_H
-#define LIBSI_DISH_H
-
-#define SIZE_TABLE_128 128
-#define SIZE_TABLE_255 255
-
-class DishDescriptor {
-public:
-   DishDescriptor(UnimplementedDescriptor*);
-   virtual ~DishDescriptor();
-   const char* getText(void) const { return text; }
-   const char* getShortText(void) const { return shortText; }
-   // Decompress the byte arrary and stores the result to a text string
-   void Decompress(unsigned char Tid);
-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;
-      unsigned char character;
-      unsigned char numberOfBits;
-   };
-   static HuffmanTable Table128[SIZE_TABLE_128];
-   static HuffmanTable Table255[SIZE_TABLE_255];
-};
-
-#endif //LIBSI_DISH_H
-
 /*extern const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte = NULL);
 extern bool convertCharacterTable(const char *from, size_t fromLength, char *to, size_t toLength, const char *fromCode);
 extern bool SystemCharacterTableIsSingleByte;*/
 class cEIT2:public SI::EIT
 {
 public:
-  cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Data,
-        bool searchOtherSatPositions = false, bool OnlyRunningStatus = false);
+  cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Data, bool OnlyRunningStatus = false);
 };
 
-cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Data, bool searchOtherSatPositions, bool OnlyRunningStatus)
+cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Data, bool OnlyRunningStatus)
     :  SI::EIT (Data, false)
 {
   //LogD(2, prep("cEIT2::cEIT2"));
+  if (Tid > 0 && Format == DISH_BEV) Tid--;
 
   if (!CheckCRCAndParse ()) {
     LogD(2, prep("!CheckCRCAndParse ()"));
     return;
   }
 
+  bool searchOtherSatPositions = Format == DISH_BEV;
+
   tChannelID channelID (Source, getOriginalNetworkId (), getTransportStreamId (), getServiceId ());
   cChannel *channel = GetChannelByID (channelID, searchOtherSatPositions);
   if (!channel) {
@@ -2874,6 +2847,8 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
     return; // only collect data for known channels
   }
 
+  LogD(4, prep("channelID: %s"), *channel->GetChannelID().ToString());
+
 #ifdef USE_NOEPG
   // only use epg from channels not blocked by noEPG-patch
   tChannelID kanalID;
@@ -3003,7 +2978,7 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
       // the actual Premiere transponder and the Sat.1/Pro7 transponder), but use different version numbers on
       // each of them :-( So if one DVB card is tuned to the Premiere transponder, while an other one is tuned
       // to the Sat.1/Pro7 transponder, events will keep toggling because of the bogus version numbers.
-      else if (Tid == pEvent->TableID () && pEvent->Version () == getVersionNumber ())
+      else if (Tid == pEvent->TableID() && pEvent->Version() == getVersionNumber())
         continue;
     }
     if (!ExternalData) {
@@ -3024,7 +2999,7 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
     }
     if (OnlyRunningStatus)
       continue;  // do this before setting the version, so that the full update can be done later
-    pEvent->SetVersion (getVersionNumber ());
+    pEvent->SetVersion (getVersionNumber());
 
     int LanguagePreferenceShort = -1;
     int LanguagePreferenceExt = -1;
@@ -3034,6 +3009,7 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
     SI::ShortEventDescriptor * ShortEventDescriptor = NULL;
     SI::DishDescriptor *DishExtendedEventDescriptor = NULL;
     SI::DishDescriptor *DishShortEventDescriptor = NULL;
+    uchar DishTheme = -1, DishCategory = -1;
 
 
     cLinkChannels *LinkChannels = NULL;
@@ -3085,6 +3061,10 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
             Contents[NumContents] = ((Nibble.getContentNibbleLevel1() & 0xF) << 4) | (Nibble.getContentNibbleLevel2() & 0xF);
             NumContents++;
           }
+          if (Format == DISH_BEV && DishTheme == -1) {
+            DishTheme = Nibble.getContentNibbleLevel2() & 0xF;
+            DishCategory = ((Nibble.getUserNibble1() & 0xF) << 4) | (Nibble.getUserNibble2() & 0xF);
+          }
         }
         pEvent->SetContents(Contents);
       }
@@ -3269,11 +3249,19 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
 
       if (DishShortEventDescriptor) {
          pEvent->SetTitle(DishShortEventDescriptor->getText());
-         //LogD(2, prep("DishTitle: %s"), DishShortEventDescriptor->getText());
+         //LogD(2, prep("channelID: %s DishTitle: %s"), *channel->GetChannelID().ToString(), DishShortEventDescriptor->getText());
       }
       if (DishExtendedEventDescriptor) {
          pEvent->SetDescription(DishExtendedEventDescriptor->getText());
-         pEvent->SetShortText(DishExtendedEventDescriptor->getShortText());
+         char *tmp;
+         if (DishTheme >= 0) {
+           Asprintf (&tmp, "%s - %s ~ %s", DishExtendedEventDescriptor->getShortText()
+               , DishExtendedEventDescriptor->getTheme(DishTheme)
+               , DishExtendedEventDescriptor->getCategory(DishCategory));
+           pEvent->SetShortText(tmp);
+           free tmp;
+         } else
+           pEvent->SetShortText(DishExtendedEventDescriptor->getShortText());
          //LogD(2, prep("DishDescription: %s"), DishExtendedEventDescriptor->getText());
          //LogD(2, prep("DishShortText: %s"), DishExtendedEventDescriptor->getShortText());
       }
@@ -3285,9 +3273,11 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
 
     pEvent->SetComponents (Components);
 
-    if (pEvent->ChannelID() == tChannelID::FromString("S119.0W-4100-6-110-110")) {
-      LogD(2, prep("ID: %d Title: %s Time: %d Tid: 0x%x"), pEvent->EventID(), pEvent->Title(), pEvent->StartTime(), pEvent->TableID());
-    }
+//    LogD(2, prep("channelID: %s Title: %s"), *channel->GetChannelID().ToString(), pEvent->Title());
+
+//    if (pEvent->ChannelID() == tChannelID::FromString("S119.0W-4100-6-110-110")) {
+//      LogD(2, prep("ID: %d Title: %s Time: %d Tid: 0x%x"), pEvent->EventID(), pEvent->Title(), pEvent->StartTime(), pEvent->TableID());
+//    }
 
     if (!HasExternalData)
       pEvent->FixEpgBugs ();
@@ -3375,253 +3365,6 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
 }
 //end of cEIT2
 
-/***************************************************************************
- *                                                                         *
- *   These routines decompress Huffman coded Dish Network EIT data.        *
- *   The implementation is based on the algorithm presentend in            *
- *                                                                         *
- *     "A memory-efficient Huffman decoding algorithm"                     *
- *     Pi-Chung Wang, Yuan-Rung Yang, Chun-Liang Lee, Hung-Yi Chang        *
- *     Proceedings of the 19th International Conference on Advanced        *
- *     Information Networking and Applications (AINA'05)                   *
- *                                                                         *
- ***************************************************************************/
-
-// returns the value of a sequence of bits in the byte array
-static unsigned int getBits(int bitIndex, int bitCount, const unsigned char *byteptr, int length)
-{
-   union {
-      unsigned char b[4];
-      unsigned long val;
-   } chunk;
-
-   int offset = bitIndex >> 3;
-   int bitnum = bitIndex - (offset << 3);
-   int rightend = 32 - bitnum - bitCount;
-
-   chunk.b[3] = byteptr[offset];
-   chunk.b[2] = (offset+1 < length) ? byteptr[offset+1] : 0;
-   chunk.b[1] = (offset+2 < length) ? byteptr[offset+2] : 0;
-   chunk.b[0] = 0; // Never need to look this far ahead.
-
-   return (unsigned int)((chunk.val & (0xFFFFFFFF >> bitnum)) >> rightend);
-}
-
-DishDescriptor::DishDescriptor(UnimplementedDescriptor* unimplementedDesc)
-{
-   text = NULL;
-   shortText = NULL;
-   decompressed = NULL;
-   this->unimplementedDesc = unimplementedDesc;
-}
-
-DishDescriptor::~DishDescriptor()
-{
-   delete[] decompressed;
-   decompressed = NULL;
-   delete unimplementedDesc;
-}
-
-void DishDescriptor::Decompress(unsigned char Tid)
-{
-   const unsigned char *str = unimplementedDesc->getData().getData();
-   const unsigned char *cmp = NULL; // Compressed data
-   int length = 0;  // Length of compressed data
-   unsigned int dLength = 0; // Length of decompressed data
-
-   if ((str[3] & 0xFC) == 0x80) {
-      length = str[1] - 2;
-      dLength = (str[2]&0x40) ? ((str[3] << 6)&0xFF) | (str[2]&0x3F) : str[2]&0x3F;
-      cmp = str + 4;
-   }
-   else {
-      length = str[1] - 1;
-      dLength = str[2] & 0x7F;
-      cmp = str + 3;
-   }
-
-   if (length <= 0 || !dLength)
-     return;
-
-   decompressed = new unsigned char[dLength+1];
-
-   HuffmanTable *table;
-   unsigned int tableSize, numBits;
-
-   if (Tid > 0x80) {
-      table = Table255;
-      tableSize = SIZE_TABLE_255;
-      numBits = 13;
-   }
-   else {
-      table = Table128;
-      tableSize = SIZE_TABLE_128;
-      numBits = 11;
-   }
-
-   unsigned int bLength = length << 3; // number of bits
-   unsigned int currentBit = 0, count = 0;
-   while (currentBit < bLength - 1 && count < dLength) {
-      // Find the interval containing the sequence of length numBits starting
-      // at currentBit. The corresponding character will  be the one encoded
-      // at the begin of the sequence.
-      unsigned int code = getBits(currentBit, numBits, cmp, length);
-      // We could use a binary search, but in practice this linear search is faster.
-      unsigned int index = 0;
-      while (table[index].startingAddress <= code && index < tableSize) { index++; }
-      index--;
-      decompressed[count++] = table[index].character;
-      currentBit += table[index].numberOfBits;
-   }
-   decompressed[count] = 0;
-
-   char* split = strchr((char*)decompressed, 0x0D); // Look for carriage return
-   //LogD(2, prep("dLength:%d, length:%d, count:%d, decompressed: %s"), dLength, length, count, decompressed);
-   if (split) {
-      *split = 0;
-      shortText = (char*) decompressed;
-      text = (split[1]==0x20) ? split+2 : split+1;
-   }
-   else {
-      text = (char*) decompressed;
-   }
-}
-
-
-struct DishDescriptor::HuffmanTable DishDescriptor::Table128[SIZE_TABLE_128] = {
-   { 0x0000, 0x20, 0x03 }, { 0x0100, 0x65, 0x04 }, { 0x0180, 0x74, 0x04 },
-   { 0x0200, 0x61, 0x04 }, { 0x0280, 0x6F, 0x04 }, { 0x0300, 0x73, 0x04 },
-   { 0x0380, 0x6E, 0x04 }, { 0x0400, 0x72, 0x06 }, { 0x0420, 0x69, 0x06 },
-   { 0x0440, 0x6C, 0x06 }, { 0x0460, 0x63, 0x06 }, { 0x0480, 0x68, 0x06 },
-   { 0x04A0, 0x75, 0x06 }, { 0x04C0, 0x64, 0x06 }, { 0x04E0, 0x70, 0x06 },
-   { 0x0500, 0x6D, 0x06 }, { 0x0520, 0x67, 0x06 }, { 0x0540, 0x79, 0x06 },
-   { 0x0560, 0x76, 0x06 }, { 0x0580, 0x0A, 0x06 }, { 0x05A0, 0x2E, 0x06 },
-   { 0x05C0, 0x77, 0x06 }, { 0x05E0, 0x66, 0x06 }, { 0x0600, 0x53, 0x07 },
-   { 0x0610, 0x62, 0x07 }, { 0x0620, 0x54, 0x07 }, { 0x0630, 0x22, 0x07 },
-   { 0x0640, 0x6B, 0x07 }, { 0x0650, 0x50, 0x07 }, { 0x0660, 0x41, 0x07 },
-   { 0x0670, 0x43, 0x07 }, { 0x0680, 0x44, 0x07 }, { 0x0690, 0x4C, 0x07 },
-   { 0x06A0, 0x4D, 0x07 }, { 0x06B0, 0x49, 0x07 }, { 0x06C0, 0x4E, 0x07 },
-   { 0x06D0, 0x3A, 0x07 }, { 0x06E0, 0x52, 0x07 }, { 0x06F0, 0x2C, 0x07 },
-   { 0x0700, 0x45, 0x08 }, { 0x0708, 0x55, 0x08 }, { 0x0710, 0x46, 0x08 },
-   { 0x0718, 0x48, 0x08 }, { 0x0720, 0x59, 0x08 }, { 0x0728, 0x56, 0x08 },
-   { 0x0730, 0x2D, 0x08 }, { 0x0738, 0x7A, 0x08 }, { 0x0740, 0x78, 0x08 },
-   { 0x0748, 0x2F, 0x08 }, { 0x0750, 0x4F, 0x08 }, { 0x0758, 0x3F, 0x08 },
-   { 0x0760, 0x57, 0x08 }, { 0x0768, 0x47, 0x08 }, { 0x0770, 0x42, 0x08 },
-   { 0x0778, 0x33, 0x08 }, { 0x0780, 0x31, 0x09 }, { 0x0784, 0x71, 0x09 },
-   { 0x0788, 0x30, 0x09 }, { 0x078C, 0x21, 0x09 }, { 0x0790, 0x6A, 0x09 },
-   { 0x0794, 0x5A, 0x09 }, { 0x0798, 0x39, 0x09 }, { 0x079C, 0x34, 0x09 },
-   { 0x07A0, 0x4B, 0x09 }, { 0x07A4, 0x2A, 0x09 }, { 0x07A8, 0x37, 0x09 },
-   { 0x07AC, 0x36, 0x09 }, { 0x07B0, 0x35, 0x09 }, { 0x07B4, 0x4A, 0x09 },
-   { 0x07B8, 0x38, 0x09 }, { 0x07BC, 0x29, 0x09 }, { 0x07C0, 0x28, 0x0A },
-   { 0x07C2, 0x58, 0x0A }, { 0x07C4, 0x51, 0x0A }, { 0x07C6, 0x3C, 0x0A },
-   { 0x07C8, 0x32, 0x0A }, { 0x07CA, 0x27, 0x0A }, { 0x07CC, 0x26, 0x0A },
-   { 0x07CE, 0x7F, 0x0B }, { 0x07CF, 0x7E, 0x0B }, { 0x07D0, 0x7D, 0x0B },
-   { 0x07D1, 0x7C, 0x0B }, { 0x07D2, 0x7B, 0x0B }, { 0x07D3, 0x60, 0x0B },
-   { 0x07D4, 0x5F, 0x0B }, { 0x07D5, 0x5E, 0x0B }, { 0x07D6, 0x5D, 0x0B },
-   { 0x07D7, 0x5C, 0x0B }, { 0x07D8, 0x5B, 0x0B }, { 0x07D9, 0x40, 0x0B },
-   { 0x07DA, 0x3E, 0x0B }, { 0x07DB, 0x3D, 0x0B }, { 0x07DC, 0x3B, 0x0B },
-   { 0x07DD, 0x2B, 0x0B }, { 0x07DE, 0x25, 0x0B }, { 0x07DF, 0x24, 0x0B },
-   { 0x07E0, 0x23, 0x0B }, { 0x07E1, 0x1F, 0x0B }, { 0x07E2, 0x1E, 0x0B },
-   { 0x07E3, 0x1D, 0x0B }, { 0x07E4, 0x1C, 0x0B }, { 0x07E5, 0x1B, 0x0B },
-   { 0x07E6, 0x1A, 0x0B }, { 0x07E7, 0x19, 0x0B }, { 0x07E8, 0x18, 0x0B },
-   { 0x07E9, 0x17, 0x0B }, { 0x07EA, 0x16, 0x0B }, { 0x07EB, 0x15, 0x0B },
-   { 0x07EC, 0x14, 0x0B }, { 0x07ED, 0x13, 0x0B }, { 0x07EE, 0x12, 0x0B },
-   { 0x07EF, 0x11, 0x0B }, { 0x07F0, 0x10, 0x0B }, { 0x07F1, 0x0F, 0x0B },
-   { 0x07F2, 0x0E, 0x0B }, { 0x07F3, 0x0D, 0x0B }, { 0x07F4, 0x0C, 0x0B },
-   { 0x07F5, 0x0B, 0x0B }, { 0x07F6, 0x09, 0x0B }, { 0x07F7, 0x08, 0x0B },
-   { 0x07F8, 0x07, 0x0B }, { 0x07F9, 0x06, 0x0B }, { 0x07FA, 0x05, 0x0B },
-   { 0x07FB, 0x04, 0x0B }, { 0x07FC, 0x03, 0x0B }, { 0x07FD, 0x02, 0x0B },
-   { 0x07FE, 0x01, 0x0B }, { 0x07FF, 0x00, 0x0B }
-};
-
-struct DishDescriptor::HuffmanTable DishDescriptor::Table255[SIZE_TABLE_255] = {
-   { 0x0000, 0x20, 0x02 }, { 0x0800, 0x65, 0x04 }, { 0x0A00, 0x72, 0x04 },
-   { 0x0C00, 0x6E, 0x04 }, { 0x0E00, 0x61, 0x04 }, { 0x1000, 0x74, 0x05 },
-   { 0x1100, 0x6F, 0x05 }, { 0x1200, 0x73, 0x05 }, { 0x1300, 0x69, 0x05 },
-   { 0x1400, 0x6C, 0x05 }, { 0x1500, 0x75, 0x05 }, { 0x1600, 0x63, 0x05 },
-   { 0x1700, 0x64, 0x05 }, { 0x1800, 0x70, 0x07 }, { 0x1840, 0x6D, 0x07 },
-   { 0x1880, 0x76, 0x07 }, { 0x18C0, 0x67, 0x07 }, { 0x1900, 0x68, 0x07 },
-   { 0x1940, 0x2E, 0x07 }, { 0x1980, 0x66, 0x07 }, { 0x19C0, 0x0A, 0x07 },
-   { 0x1A00, 0x53, 0x07 }, { 0x1A40, 0x41, 0x07 }, { 0x1A80, 0x45, 0x07 },
-   { 0x1AC0, 0x43, 0x07 }, { 0x1B00, 0x27, 0x07 }, { 0x1B40, 0x7A, 0x07 },
-   { 0x1B80, 0x52, 0x07 }, { 0x1BC0, 0x22, 0x07 }, { 0x1C00, 0x4C, 0x08 },
-   { 0x1C20, 0x49, 0x08 }, { 0x1C40, 0x4F, 0x08 }, { 0x1C60, 0x62, 0x08 },
-   { 0x1C80, 0x54, 0x08 }, { 0x1CA0, 0x4E, 0x08 }, { 0x1CC0, 0x55, 0x08 },
-   { 0x1CE0, 0x79, 0x08 }, { 0x1D00, 0x44, 0x08 }, { 0x1D20, 0x50, 0x08 },
-   { 0x1D40, 0x71, 0x08 }, { 0x1D60, 0x56, 0x08 }, { 0x1D80, 0x2D, 0x08 },
-   { 0x1DA0, 0x3A, 0x08 }, { 0x1DC0, 0x2C, 0x08 }, { 0x1DE0, 0x48, 0x08 },
-   { 0x1E00, 0x4D, 0x09 }, { 0x1E10, 0x78, 0x09 }, { 0x1E20, 0x77, 0x09 },
-   { 0x1E30, 0x42, 0x09 }, { 0x1E40, 0x47, 0x09 }, { 0x1E50, 0x46, 0x09 },
-   { 0x1E60, 0x30, 0x09 }, { 0x1E70, 0x3F, 0x09 }, { 0x1E80, 0x33, 0x09 },
-   { 0x1E90, 0x2F, 0x09 }, { 0x1EA0, 0x39, 0x09 }, { 0x1EB0, 0x31, 0x09 },
-   { 0x1EC0, 0x38, 0x09 }, { 0x1ED0, 0x6B, 0x09 }, { 0x1EE0, 0x6A, 0x09 },
-   { 0x1EF0, 0x21, 0x09 }, { 0x1F00, 0x36, 0x0A }, { 0x1F08, 0x35, 0x0A },
-   { 0x1F10, 0x59, 0x0A }, { 0x1F18, 0x51, 0x0A }, { 0x1F20, 0x34, 0x0B },
-   { 0x1F24, 0x58, 0x0B }, { 0x1F28, 0x32, 0x0B }, { 0x1F2C, 0x2B, 0x0B },
-   { 0x1F30, 0x2A, 0x0B }, { 0x1F34, 0x5A, 0x0B }, { 0x1F38, 0x4A, 0x0B },
-   { 0x1F3C, 0x29, 0x0B }, { 0x1F40, 0x28, 0x0C }, { 0x1F42, 0x23, 0x0C },
-   { 0x1F44, 0x57, 0x0C }, { 0x1F46, 0x4B, 0x0C }, { 0x1F48, 0x3C, 0x0C },
-   { 0x1F4A, 0x37, 0x0C }, { 0x1F4C, 0x7D, 0x0C }, { 0x1F4E, 0x7B, 0x0C },
-   { 0x1F50, 0x60, 0x0C }, { 0x1F52, 0x26, 0x0C }, { 0x1F54, 0xFE, 0x0D },
-   { 0x1F55, 0xFD, 0x0D }, { 0x1F56, 0xFC, 0x0D }, { 0x1F57, 0xFB, 0x0D },
-   { 0x1F58, 0xFA, 0x0D }, { 0x1F59, 0xF9, 0x0D }, { 0x1F5A, 0xF8, 0x0D },
-   { 0x1F5B, 0xF7, 0x0D }, { 0x1F5C, 0xF6, 0x0D }, { 0x1F5D, 0xF5, 0x0D },
-   { 0x1F5E, 0xF4, 0x0D }, { 0x1F5F, 0xF3, 0x0D }, { 0x1F60, 0xF2, 0x0D },
-   { 0x1F61, 0xF1, 0x0D }, { 0x1F62, 0xF0, 0x0D }, { 0x1F63, 0xEF, 0x0D },
-   { 0x1F64, 0xEE, 0x0D }, { 0x1F65, 0xED, 0x0D }, { 0x1F66, 0xEC, 0x0D },
-   { 0x1F67, 0xEB, 0x0D }, { 0x1F68, 0xEA, 0x0D }, { 0x1F69, 0xE9, 0x0D },
-   { 0x1F6A, 0xE8, 0x0D }, { 0x1F6B, 0xE7, 0x0D }, { 0x1F6C, 0xE6, 0x0D },
-   { 0x1F6D, 0xE5, 0x0D }, { 0x1F6E, 0xE4, 0x0D }, { 0x1F6F, 0xE3, 0x0D },
-   { 0x1F70, 0xE2, 0x0D }, { 0x1F71, 0xE1, 0x0D }, { 0x1F72, 0xE0, 0x0D },
-   { 0x1F73, 0xDF, 0x0D }, { 0x1F74, 0xDE, 0x0D }, { 0x1F75, 0xDD, 0x0D },
-   { 0x1F76, 0xDC, 0x0D }, { 0x1F77, 0xDB, 0x0D }, { 0x1F78, 0xDA, 0x0D },
-   { 0x1F79, 0xD9, 0x0D }, { 0x1F7A, 0xD8, 0x0D }, { 0x1F7B, 0xD7, 0x0D },
-   { 0x1F7C, 0xD6, 0x0D }, { 0x1F7D, 0xD5, 0x0D }, { 0x1F7E, 0xD4, 0x0D },
-   { 0x1F7F, 0xD3, 0x0D }, { 0x1F80, 0xD2, 0x0D }, { 0x1F81, 0xD1, 0x0D },
-   { 0x1F82, 0xD0, 0x0D }, { 0x1F83, 0xCF, 0x0D }, { 0x1F84, 0xCE, 0x0D },
-   { 0x1F85, 0xCD, 0x0D }, { 0x1F86, 0xCC, 0x0D }, { 0x1F87, 0xCB, 0x0D },
-   { 0x1F88, 0xCA, 0x0D }, { 0x1F89, 0xC9, 0x0D }, { 0x1F8A, 0xC8, 0x0D },
-   { 0x1F8B, 0xC7, 0x0D }, { 0x1F8C, 0xC6, 0x0D }, { 0x1F8D, 0xC5, 0x0D },
-   { 0x1F8E, 0xC4, 0x0D }, { 0x1F8F, 0xC3, 0x0D }, { 0x1F90, 0xC2, 0x0D },
-   { 0x1F91, 0xC1, 0x0D }, { 0x1F92, 0xC0, 0x0D }, { 0x1F93, 0xBF, 0x0D },
-   { 0x1F94, 0xBE, 0x0D }, { 0x1F95, 0xBD, 0x0D }, { 0x1F96, 0xBC, 0x0D },
-   { 0x1F97, 0xBB, 0x0D }, { 0x1F98, 0xBA, 0x0D }, { 0x1F99, 0xB9, 0x0D },
-   { 0x1F9A, 0xB8, 0x0D }, { 0x1F9B, 0xB7, 0x0D }, { 0x1F9C, 0xB6, 0x0D },
-   { 0x1F9D, 0xB5, 0x0D }, { 0x1F9E, 0xB4, 0x0D }, { 0x1F9F, 0xB3, 0x0D },
-   { 0x1FA0, 0xB2, 0x0D }, { 0x1FA1, 0xB1, 0x0D }, { 0x1FA2, 0xB0, 0x0D },
-   { 0x1FA3, 0xAF, 0x0D }, { 0x1FA4, 0xAE, 0x0D }, { 0x1FA5, 0xAD, 0x0D },
-   { 0x1FA6, 0xAC, 0x0D }, { 0x1FA7, 0xAB, 0x0D }, { 0x1FA8, 0xAA, 0x0D },
-   { 0x1FA9, 0xA9, 0x0D }, { 0x1FAA, 0xA8, 0x0D }, { 0x1FAB, 0xA7, 0x0D },
-   { 0x1FAC, 0xA6, 0x0D }, { 0x1FAD, 0xA5, 0x0D }, { 0x1FAE, 0xA4, 0x0D },
-   { 0x1FAF, 0xA3, 0x0D }, { 0x1FB0, 0xA2, 0x0D }, { 0x1FB1, 0xA1, 0x0D },
-   { 0x1FB2, 0xA0, 0x0D }, { 0x1FB3, 0x9F, 0x0D }, { 0x1FB4, 0x9E, 0x0D },
-   { 0x1FB5, 0x9D, 0x0D }, { 0x1FB6, 0x9C, 0x0D }, { 0x1FB7, 0x9B, 0x0D },
-   { 0x1FB8, 0x9A, 0x0D }, { 0x1FB9, 0x99, 0x0D }, { 0x1FBA, 0x98, 0x0D },
-   { 0x1FBB, 0x97, 0x0D }, { 0x1FBC, 0x96, 0x0D }, { 0x1FBD, 0x95, 0x0D },
-   { 0x1FBE, 0x94, 0x0D }, { 0x1FBF, 0x93, 0x0D }, { 0x1FC0, 0x92, 0x0D },
-   { 0x1FC1, 0x91, 0x0D }, { 0x1FC2, 0x90, 0x0D }, { 0x1FC3, 0x8F, 0x0D },
-   { 0x1FC4, 0x8E, 0x0D }, { 0x1FC5, 0x8D, 0x0D }, { 0x1FC6, 0x8C, 0x0D },
-   { 0x1FC7, 0x8B, 0x0D }, { 0x1FC8, 0x8A, 0x0D }, { 0x1FC9, 0x89, 0x0D },
-   { 0x1FCA, 0x88, 0x0D }, { 0x1FCB, 0x87, 0x0D }, { 0x1FCC, 0x86, 0x0D },
-   { 0x1FCD, 0x85, 0x0D }, { 0x1FCE, 0x84, 0x0D }, { 0x1FCF, 0x83, 0x0D },
-   { 0x1FD0, 0x82, 0x0D }, { 0x1FD1, 0x81, 0x0D }, { 0x1FD2, 0x80, 0x0D },
-   { 0x1FD3, 0x7F, 0x0D }, { 0x1FD4, 0x7E, 0x0D }, { 0x1FD5, 0x7C, 0x0D },
-   { 0x1FD6, 0x5F, 0x0D }, { 0x1FD7, 0x5E, 0x0D }, { 0x1FD8, 0x5D, 0x0D },
-   { 0x1FD9, 0x5C, 0x0D }, { 0x1FDA, 0x5B, 0x0D }, { 0x1FDB, 0x40, 0x0D },
-   { 0x1FDC, 0x3E, 0x0D }, { 0x1FDD, 0x3D, 0x0D }, { 0x1FDE, 0x3B, 0x0D },
-   { 0x1FDF, 0x25, 0x0D }, { 0x1FE0, 0x24, 0x0D }, { 0x1FE1, 0x1F, 0x0D },
-   { 0x1FE2, 0x1E, 0x0D }, { 0x1FE3, 0x1D, 0x0D }, { 0x1FE4, 0x1C, 0x0D },
-   { 0x1FE5, 0x1B, 0x0D }, { 0x1FE6, 0x1A, 0x0D }, { 0x1FE7, 0x19, 0x0D },
-   { 0x1FE8, 0x18, 0x0D }, { 0x1FE9, 0x17, 0x0D }, { 0x1FEA, 0x16, 0x0D },
-   { 0x1FEB, 0x15, 0x0D }, { 0x1FEC, 0x14, 0x0D }, { 0x1FED, 0x13, 0x0D },
-   { 0x1FEE, 0x12, 0x0D }, { 0x1FEF, 0x11, 0x0D }, { 0x1FF0, 0x10, 0x0D },
-   { 0x1FF1, 0x0F, 0x0D }, { 0x1FF2, 0x0E, 0x0D }, { 0x1FF3, 0x0D, 0x0D },
-   { 0x1FF4, 0x0C, 0x0D }, { 0x1FF5, 0x0B, 0x0D }, { 0x1FF6, 0x09, 0x0D },
-   { 0x1FF7, 0x08, 0x0D }, { 0x1FF8, 0x07, 0x0D }, { 0x1FF9, 0x06, 0x0D },
-   { 0x1FFA, 0x05, 0x0D }, { 0x1FFB, 0x04, 0x0D }, { 0x1FFC, 0x03, 0x0D },
-   { 0x1FFD, 0x02, 0x0D }, { 0x1FFE, 0x01, 0x0D }, { 0x1FFF, 0x00, 0x0D }
-};
-
 } //end namespace SI
 
 void cFilterEEPG::ProcessNextFormat (bool FirstTime = false)
@@ -3670,8 +3413,7 @@ void cFilterEEPG::ProcessNextFormat (bool FirstTime = false)
 
   //now start looking for next format to process
   int pid;
-  Format = -1; //unused value
-  for (int i = 0; i <= HIGHEST_FORMAT; i++) //find first format that is detected
+  for (int i = 0; i <= HIGHEST_FORMAT; i++){ //find first format that is detected
     if (UnprocessedFormat[i]) {
       isyslog ("EEPG: %s Extended EPG detected on pid %x.", FormatName[i], UnprocessedFormat[i]);
       Format = i;
@@ -3680,10 +3422,10 @@ void cFilterEEPG::ProcessNextFormat (bool FirstTime = false)
       // AFTER ONCE protocols like MHW, SKY and NAGRA
       break;
     }
-
-  if (Format == -1) { //there are no formats left to process
-    isyslog ("EEPG: Ended all processing");
-    return;
+    if (i == HIGHEST_FORMAT) { //there are no formats left to process
+      isyslog ("EEPG: Ended all processing");
+      return;
+    }
   }
 
   pid = UnprocessedFormat[Format]; //and reinstall its pid
@@ -3739,13 +3481,12 @@ void cFilterEEPG::ProcessNextFormat (bool FirstTime = false)
 void cFilterEEPG::ProccessContinuous(u_short Pid, u_char Tid, int Length, const u_char *Data)
 {
     //0x39 Viasat, 0x0300 Dish Network EEPG, 0x0441 Bell ExpressVU EEPG
-    LogD(2, prep("Pid: 0x%02x Tid: %d Length: %d"), Pid, Tid, Length);
+    LogD(4, prep("Pid: 0x%02x Tid: %d Length: %d"), Pid, Tid, Length);
     cSchedulesLock SchedulesLock(true, 10);
     cSchedules *Schedules = (cSchedules*)(cSchedules::Schedules(SchedulesLock));
     //Look for other satelite positions only if Dish/Bell ExpressVU for the moment hardcoded pid check
-    bool searchOtherSatPositions = Pid == 0x0300 || Pid == 0x0441;
     if(Schedules)
-        SI::cEIT2 EIT(Schedules, Source(), Tid, Data, searchOtherSatPositions);
+        SI::cEIT2 EIT(Schedules, Source(), Tid, Data);
 
     else//cEIT EIT (Schedules, Source (), Tid, Data);
     {
@@ -3756,7 +3497,7 @@ void cFilterEEPG::ProccessContinuous(u_short Pid, u_char Tid, int Length, const
         cSchedulesLock SchedulesLock;
         cSchedules *Schedules = (cSchedules*)(cSchedules::Schedules(SchedulesLock));
         if(Schedules)
-            SI::cEIT2 EIT(Schedules, Source(), Tid, Data, searchOtherSatPositions, true);
+            SI::cEIT2 EIT(Schedules, Source(), Tid, Data, true);
 
         //cEIT EIT (Schedules, Source (), Tid, Data, true);
     }