Remove obsolete VDR < 1.5.3 font patching support.

3 files changed, 0 insertions, 232 deletions

diff --git a/epgsearchtools.c b/epgsearchtools.c
index 3bc4932..6a58b51 100644
--- a/epgsearchtools.c
+++ b/epgsearchtools.c
@@ -85,225 +85,6 @@ char* IndentMenuItem(const char* szString, int indentions)
    return szIndented;
 }
 
-// based on Nordlicht's EPG-Plugin
-void PatchFont(eDvbFont DvbFont)
-{
-#if VDRVERSNUM < 10503
-   const cFont *font = cFont::GetFont(DvbFont);
-   int num_rows_global = font->Height();
-   int num_rows = num_rows_global+2;
-   int i,j,num_char;
- 
-   cFont::tPixelData* font_data = new cFont::tPixelData[225*(num_rows)];
- 
-   for (i = 0; i < 225; i++)
-      for (j = 0; j < num_rows; j++)
-         font_data[(i*num_rows)+j]=0x0000000000000000;
-   
-   font_data[0+0]=6;//font->CharData(0)->width;
-   font_data[0+1]=num_rows_global;
- 
-   for(num_char=33, i = 1; num_char<256; i++, num_char++)
-   {
-      const cFont::tCharData* char_data = font->CharData(num_char);
-      font_data[i*num_rows+0] = (num_char>=127 && num_char<=129)?6:char_data->width;
-      font_data[i*num_rows+1] = char_data->height;
-
-      if(num_char==130)
-      {
-         if(DvbFont==fontOsd)
-         {
-            font_data[i*num_rows+ 0]=6;
-            font_data[i*num_rows+ 1]=23;
-            font_data[i*num_rows+ 8]=0x3f; // ## ####
-            font_data[i*num_rows+ 9]=0x3f; // ## ####
-            font_data[i*num_rows+10]=0x30; // ## ....
-            font_data[i*num_rows+11]=0x30; // ## ....
-            font_data[i*num_rows+12]=0x30; // ## ....
-            font_data[i*num_rows+13]=0x30; // ## ....
-            font_data[i*num_rows+14]=0x30; // ## ....
-            font_data[i*num_rows+15]=0x30; // ## ....
-            font_data[i*num_rows+16]=0x30; // ## ....
-            font_data[i*num_rows+17]=0x30; // ## ....
-            font_data[i*num_rows+18]=0x30; // ## ....
-            font_data[i*num_rows+19]=0x30; // ## ....
-            font_data[i*num_rows+20]=0x30; // ## ....
-            font_data[i*num_rows+21]=0x30; // ## ....
-            font_data[i*num_rows+22]=0x30; // ## ....
-            font_data[i*num_rows+23]=0x3f; // ## ####
-            font_data[i*num_rows+24]=0x3f; // ## ####
-         }
-         else
-         {
-            font_data[i*num_rows+ 0]=5;
-            font_data[i*num_rows+ 1]=19;
-            font_data[i*num_rows+ 6]=0x1f; // # ####
-            font_data[i*num_rows+ 7]=0x1f; // # ####
-            font_data[i*num_rows+ 8]=0x18; // # #...
-            font_data[i*num_rows+ 9]=0x18; // # #...
-            font_data[i*num_rows+10]=0x18; // # #...
-            font_data[i*num_rows+11]=0x18; // # #...
-            font_data[i*num_rows+12]=0x18; // # #...
-            font_data[i*num_rows+13]=0x18; // # #...
-            font_data[i*num_rows+14]=0x18; // # #...
-            font_data[i*num_rows+15]=0x18; // # #...
-            font_data[i*num_rows+16]=0x18; // # #...
-            font_data[i*num_rows+17]=0x18; // # #...
-            font_data[i*num_rows+18]=0x18; // # #...
-            font_data[i*num_rows+19]=0x1f; // # #...
-            font_data[i*num_rows+20]=0x1f; // # ####
-         }
-      }
-      else if(num_char==131)
-      {
-         if(DvbFont==fontOsd)
-         {
-            font_data[i*num_rows+ 0]=6;
-            font_data[i*num_rows+ 1]=23;
-            font_data[i*num_rows+ 8]=0x3f; // ## ####
-            font_data[i*num_rows+ 9]=0x3f; // ## ####
-            font_data[i*num_rows+10]=0x0;  // .. ....
-            font_data[i*num_rows+11]=0x0;  // .. ....
-            font_data[i*num_rows+12]=0x0;  // .. ....
-            font_data[i*num_rows+13]=0x0;  // .. ....
-            font_data[i*num_rows+14]=0x0;  // .. ....
-            font_data[i*num_rows+15]=0x0;  // .. ....
-            font_data[i*num_rows+16]=0x0;  // .. ....
-            font_data[i*num_rows+17]=0x0;  // .. ....
-            font_data[i*num_rows+18]=0x0;  // .. ....
-            font_data[i*num_rows+19]=0x0;  // .. ....
-            font_data[i*num_rows+20]=0x0;  // .. ....
-            font_data[i*num_rows+21]=0x0;  // .. ....
-            font_data[i*num_rows+22]=0x0;  // .. ....
-            font_data[i*num_rows+23]=0x3f; // ## ####
-            font_data[i*num_rows+24]=0x3f; // ## ####
-         }
-         else
-         {
-            font_data[i*num_rows+ 0]=5;
-            font_data[i*num_rows+ 1]=19;
-            font_data[i*num_rows+ 6]=0x1f; // # ####
-            font_data[i*num_rows+ 7]=0x1f; // # ####
-            font_data[i*num_rows+ 8]=0x0;  // . ....
-            font_data[i*num_rows+ 9]=0x0;  // . ....
-            font_data[i*num_rows+10]=0x0;  // . ....
-            font_data[i*num_rows+11]=0x0;  // . ....
-            font_data[i*num_rows+12]=0x0;  // . ....
-            font_data[i*num_rows+13]=0x0;  // . ....
-            font_data[i*num_rows+14]=0x0;  // . ....
-            font_data[i*num_rows+15]=0x0;  // . ....
-            font_data[i*num_rows+16]=0x0;  // . ....
-            font_data[i*num_rows+17]=0x0;  // . ....
-            font_data[i*num_rows+18]=0x0;  // . ....
-            font_data[i*num_rows+19]=0x1f; // # ####
-            font_data[i*num_rows+20]=0x1f; // # ####
-         }
-      }
-      else if(num_char==132)
-      {
-         if(DvbFont==fontOsd)
-         {
-            font_data[i*num_rows+ 0]=6;
-            font_data[i*num_rows+ 1]=23;
-            font_data[i*num_rows+ 8]=0x3f; // ## ####
-            font_data[i*num_rows+ 9]=0x3f; // ## ####
-            font_data[i*num_rows+10]=0x03; // .. ..##
-            font_data[i*num_rows+11]=0x03; // .. ..##
-            font_data[i*num_rows+12]=0x03; // .. ..##
-            font_data[i*num_rows+13]=0x03; // .. ..##
-            font_data[i*num_rows+14]=0x03; // .. ..##
-            font_data[i*num_rows+15]=0x03; // .. ..##
-            font_data[i*num_rows+16]=0x03; // .. ..##
-            font_data[i*num_rows+17]=0x03; // .. ..##
-            font_data[i*num_rows+18]=0x03; // .. ..##
-            font_data[i*num_rows+19]=0x03; // .. ..##
-            font_data[i*num_rows+20]=0x03; // .. ..##
-            font_data[i*num_rows+21]=0x03; // .. ..##
-            font_data[i*num_rows+22]=0x03; // .. ..##
-            font_data[i*num_rows+23]=0x3f; // ## ####
-            font_data[i*num_rows+24]=0x3f; // ## ####
-         }
-         else
-         {
-            font_data[i*num_rows+ 0]=5;
-            font_data[i*num_rows+ 1]=19;
-            font_data[i*num_rows+ 6]=0x1f; // # ####
-            font_data[i*num_rows+ 7]=0x1f; // # ####
-            font_data[i*num_rows+ 8]=0x03; // . ..##
-            font_data[i*num_rows+ 9]=0x03; // . ..##
-            font_data[i*num_rows+10]=0x03; // . ..##
-            font_data[i*num_rows+11]=0x03; // . ..##
-            font_data[i*num_rows+12]=0x03; // . ..##
-            font_data[i*num_rows+13]=0x03; // . ..##
-            font_data[i*num_rows+14]=0x03; // . ..##
-            font_data[i*num_rows+15]=0x03; // . ..##
-            font_data[i*num_rows+16]=0x03; // . ..##
-            font_data[i*num_rows+17]=0x03; // . ..##
-            font_data[i*num_rows+18]=0x03; // . ..##
-            font_data[i*num_rows+19]=0x1f; // # ####
-            font_data[i*num_rows+20]=0x1f; // # ####
-         }
-      }
-      else if(num_char==127)
-      {
-         if(DvbFont==fontOsd)
-         {
-            font_data[i*num_rows+ 0]=6;
-            font_data[i*num_rows+ 1]=23;
-            font_data[i*num_rows+ 8]=0x3f; // ## ####
-            font_data[i*num_rows+ 9]=0x3f; // ## ####
-            font_data[i*num_rows+10]=0x3f; // ## ####
-            font_data[i*num_rows+11]=0x3f; // ## ####
-            font_data[i*num_rows+12]=0x3f; // ## ####
-            font_data[i*num_rows+13]=0x3f; // ## ####
-            font_data[i*num_rows+14]=0x3f; // ## ####
-            font_data[i*num_rows+15]=0x3f; // ## ####
-            font_data[i*num_rows+16]=0x3f; // ## ####
-            font_data[i*num_rows+17]=0x3f; // ## ####
-            font_data[i*num_rows+18]=0x3f; // ## ####
-            font_data[i*num_rows+19]=0x3f; // ## ####
-            font_data[i*num_rows+20]=0x3f; // ## ####
-            font_data[i*num_rows+21]=0x3f; // ## ####
-            font_data[i*num_rows+22]=0x3f; // ## ####
-            font_data[i*num_rows+23]=0x3f; // ## ####
-            font_data[i*num_rows+24]=0x3f; // ## ####
-         }
-         else
-         {
-            font_data[i*num_rows+ 0]=5;
-            font_data[i*num_rows+ 1]=19;
-            font_data[i*num_rows+ 6]=0x1f; // ######
-            font_data[i*num_rows+ 7]=0x1f; // # ####
-            font_data[i*num_rows+ 8]=0x1f; // # ####
-            font_data[i*num_rows+ 9]=0x1f; // # ####
-            font_data[i*num_rows+10]=0x1f; // # ####
-            font_data[i*num_rows+11]=0x1f; // # ####
-            font_data[i*num_rows+12]=0x1f; // # ####
-            font_data[i*num_rows+13]=0x1f; // # ####
-            font_data[i*num_rows+14]=0x1f; // # ####
-            font_data[i*num_rows+15]=0x1f; // # ####
-            font_data[i*num_rows+16]=0x1f; // # ####
-            font_data[i*num_rows+17]=0x1f; // # ####
-            font_data[i*num_rows+18]=0x1f; // # ####
-            font_data[i*num_rows+19]=0x1f; // # ####
-            font_data[i*num_rows+20]=0x1f; // # ####
-         }
-      }
-      else if (char_data->width > 0)
-      {
-         for(j = 0; j<(int)char_data->height; j++)
-         {
-            cFont::tPixelData Data = (cFont::tPixelData)char_data->lines[j];    
-            font_data[(i*num_rows)+2+j] = Data;
-         }
-      }
-   }
- 
-   cFont::SetFont(DvbFont, font_data);
-#endif
-}
-
-
 bool MatchesSearchMode(const char* szTest, const char* searchText, int mode, const char* delim, int tolerance)
 {
    if (szTest && *szTest)
diff --git a/epgsearchtools.h b/epgsearchtools.h
index dd8899c..6077553 100644
--- a/epgsearchtools.h
+++ b/epgsearchtools.h
@@ -26,7 +26,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 
 #include <string>
 #include <vdr/config.h> // For VDRVERSNUM only
-#include <vdr/font.h>
 #include "epgsearchext.h"
 #include "recdone.h"
 
@@ -129,7 +128,6 @@ class cSearchExtCat;
 class cEvent;
 
 char* IndentMenuItem(const char*, int indentions=1);
-void PatchFont(eDvbFont);
 bool MatchesSearchMode(const char* test, const char* values, int searchmode, const char* delim, int tolerance);
 char* GetExtEPGValue(const cEvent* e, cSearchExtCat* SearchExtCat);
 char* GetExtEPGValue(const char* description, const char* catname);
diff --git a/menu_whatson.c b/menu_whatson.c
index aea7fd8..4fd232a 100644
--- a/menu_whatson.c
+++ b/menu_whatson.c
@@ -34,7 +34,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include "menu_search.h" 
 #include "menu_commands.h"
 #include "epgsearchcfg.h"
-#include "epgsearchtools.h"
 #include "switchtimer.h"
 #include "epgsearchcats.h"
 #include "conflictcheck.h"
@@ -264,16 +263,6 @@ cMenuWhatsOnSearch::cMenuWhatsOnSearch(const cSchedules *Schedules, int CurrentC
   shiftTime = 0;
   schedules = Schedules;
   
-  // do a font patch, if necessary
-  if (strcasestr(cTemplFile::GetTemplateByName("MenuWhatsOnNow")->MenuTemplate(), "%progr%") ||
-      strcasestr(cTemplFile::GetTemplateByName("MenuWhatsOnNext")->MenuTemplate(), "%progr%"))
-    {
-      if(Setup.UseSmallFont==2)  
-	PatchFont(fontSml);
-      else
-	PatchFont(fontOsd);	
-    }
-  
   CreateShowModes();
   
   LoadSchedules();