Merge branch 'experimental' into epg_short_text

5 files changed, 8 insertions, 9 deletions

diff --git a/README b/README
index 20a9f89..edde5b7 100644
--- a/README
+++ b/README
@@ -83,7 +83,7 @@ Currently known transponders that send EEPG data:
 * Digital+         S19.2E:10847V (Mediahighway 2)
 * Premiere         Sport Portal, Premiere Direkt Portal
 * Freesat          all freesat channels
-* Dish and BEV	  S119.0W:12472H S91.0W12224R
+* Dish and BEV     S119.0W:12472H S91.0W12224R
 
 Please note that the NagraGuide broadcasts of Canal DigitaalNL are stil in betatest; 
 therefore its information is not always reliable. It seems that sometimes, when no summaries 
@@ -112,7 +112,7 @@ This code is based on:
 * Dish/BEV patch written by 
 * cAddEventThread from EPGFixer plugin by Matti Lehtimaki matti.lehtimaki /at/ gmail.com
 Thanks to mrgandalf, and the others who helped map NA eit.
-Thanks to VDR User for testing and providing <> script.
+Thanks to VDR User for testing and providing makequiv.sh script for S72.7W channels.
 
 We wish to thank all authors for the great work they have been doing, decoding
 this EEPG data; this plugin tries to combine the best of all worlds.
diff --git a/dish.c b/dish.c
index 662e170..d257d91 100644
--- a/dish.c
+++ b/dish.c
@@ -56,6 +56,7 @@ namespace SI
         originalAirDate = 0;
         programId = NULL;
         seriesId = NULL;
+        ratingStr = NULL;
     }
 
     DishDescriptor::~DishDescriptor()
@@ -418,7 +419,9 @@ namespace SI
          str += "]";
        }
 
-      return str.c_str();
+      if (!ratingStr) ratingStr = new char[19];
+      if (ratingStr) strcpy(ratingStr,str.c_str());
+      return ratingStr;
 
 //      return isempty(buffer) ? "" : buffer;
     }
diff --git a/dish.h b/dish.h
index 369a4fd..f891d7b 100644
--- a/dish.h
+++ b/dish.h
@@ -284,6 +284,7 @@ protected:
     time_t originalAirDate;
     char* seriesId;
     char* programId;
+    char* ratingStr;
 
     struct HuffmanTable
     {
diff --git a/eepg.c b/eepg.c
index 7239c23..7060168 100644
--- a/eepg.c
+++ b/eepg.c
@@ -3404,11 +3404,6 @@ void cFilterEEPG::ProcessPremiere(const u_char *& Data)
           }
           tChannelID channelID (Source (), nid, tid, sid);
           cChannel *channel = Channels.GetByChannelID (channelID, true);
-#ifdef USE_NOEPG
-          // only use epg from channels not blocked by noEPG-patch
-          if (!allowedEPG (channelID))
-            continue;
-#endif /* NOEPG */
 
           if (!channel)
             continue;
diff --git a/setupeepg.h b/setupeepg.h
index eb3c53e..089eb82 100644
--- a/setupeepg.h
+++ b/setupeepg.h
@@ -34,7 +34,7 @@ public:
   void  setConfDir(char* confDir)
   {
     if (ConfDir)
-      delete ConfDir;
+      delete [] ConfDir;
     ConfDir = new char[strlen(confDir)+1];
     strcpy(ConfDir, confDir);
   }