Merge branch 'experimental' of ssh://192.168.1.138/home/dime/VDR/PLUGINS/src/eepg into experimental

Conflicts:
	eepg.c

2 files changed, 7 insertions, 9 deletions

diff --git a/HISTORY b/HISTORY
index 4fd3590..a7b7626 100644
--- a/HISTORY
+++ b/HISTORY
@@ -14,6 +14,7 @@ Release 0.0.6pre:
 - moved Premiere code in separate method
 - Added setup option to display message after finish of writing epg
 - Added Dish Network and Bell ExpressVU support, thanks to the VDR patch, Mrgandalf and VDR User
+- Applied patch to Load Huffman dictionaries only on first use, thanks to Torsten Lang
 
 
 Release 0.0.5:
diff --git a/eepg.c b/eepg.c
index bbf4557..cdfe90b 100644
--- a/eepg.c
+++ b/eepg.c
@@ -1015,22 +1015,22 @@ bool cFilterEEPG::InitDictionary (void)
   case SKY_IT:
     if (sky_tables[0] == NULL) {
       FileName += "/sky_it.dict";
-      LogD (1, prep("EEPGDebug: loading sky_it.dict"));
+      LogD (4, prep("EEPGDebug: loading sky_it.dict"));
       return load_sky_file(FileName.c_str());
     } else
-        LogD (1, prep("EEPGDebug: sky_it.dict already loaded"));
+        LogD (4, prep("EEPGDebug: sky_it.dict already loaded"));
     break;
   case SKY_UK:
     if (sky_tables[1] == NULL) {
       FileName += "/sky_uk.dict";
-      LogD (1, prep("EEPGDebug: loading sky_uk.dict"));
+      LogD (4, prep("EEPGDebug: loading sky_uk.dict"));
       return load_sky_file(FileName.c_str());
     } else
-        LogD (1, prep("EEPGDebug: sky_uk.dict already loaded"));
+        LogD (4, prep("EEPGDebug: sky_uk.dict already loaded"));
     break;
   case FREEVIEW:
     if (tables[0][0] == NULL) {
-      LogD (1, prep("EEPGDebug: loading freesat.dict"));
+      LogD (4, prep("EEPGDebug: loading freesat.dict"));
       FileName += "/freesat.t1";
       if (!load_freesat_file (1, FileName.c_str()))
 	return false;
@@ -1038,15 +1038,12 @@ bool cFilterEEPG::InitDictionary (void)
       FileName += "/freesat.t2";
       return load_freesat_file (2, FileName.c_str());
     } else
-        LogD (1, prep("EEPGDebug: freesat.dict already loaded"));
+        LogD (4, prep("EEPGDebug: freesat.dict already loaded"));
     break;
   default:
     LogE (0 ,prep("Error, wrong format detected in ReadFileDictionary. Format = %i."), Format);
     return false;
   }
-//  if ((Format == SKY_IT) || (Format == SKY_UK)) { //SKY
-//	  return load_sky_file(FileName.c_str());
-//  } //if Format == 3 || Format == 4
   return true;
 }