1 files changed, 2 insertions, 33 deletions
diff --git a/eepg.c b/eepg.c
index 22ee520..2ed8f2f 100644
--- a/eepg.c
+++ b/eepg.c
@@ -40,6 +40,7 @@
 #include "dish.h"
 #include "epghandler.h"
 #include "log.h"
+#include "setupeepg.h"
 
 #include <map>
 #include <string>
@@ -75,8 +76,6 @@ static const char *DESCRIPTION = trNOOP ("Parses Extended EPG data");
 
 using namespace std;
 
-// --- cSetupEEPG -------------------------------------------------------
-
 const char *optPats[] = {
   "%s",
   "%s (Option %d)",
@@ -101,38 +100,8 @@ char *cs_hexdump (int m, const uchar * buf, int n)
   return (dump);
 }
 
-class cSetupEEPG
-{
-public:
-  int OptPat;
-  int OrderInfo;
-  int RatingInfo;
-  int FixEpg;
-  int DisplayMessage;
-  int ProcessEIT;
-#ifdef DEBUG
-  int LogLevel;
-#endif
-
-public:
-  cSetupEEPG (void);
-};
-
-cSetupEEPG SetupPE;
+cSetupEEPG SetupPE = *cSetupEEPG::getInstance();
 
-cSetupEEPG::cSetupEEPG (void)
-{
-  OptPat = 1;
-  OrderInfo = 1;
-  RatingInfo = 1;
-  FixEpg = 0;
-  DisplayMessage = 1;
-  ProcessEIT = 0;
-#ifdef DEBUG
-  LogLevel = 0;
-#endif
-
-}
 
 // --- cMenuSetupPremiereEpg ------------------------------------------------------------