Support for ignoring and copying EPG data. Bug fixes.

Fix character set conversion for selected channels. Fix and improve Makefile (thanks to Ville Skyttä and Rolf Ahrenberg). Fix compiling with g++-4.7.

1 files changed, 4 insertions, 5 deletions

diff --git a/charset.h b/charset.h
index f73a964..cfcee79 100644
--- a/charset.h
+++ b/charset.h
@@ -10,22 +10,21 @@
 
 #include "tools.h"
 #include <vdr/epg.h>
-#include <vdr/tools.h>
-#include <stdio.h>
 
 class cCharSet : public cListItem
 {
 private:
-  char *charset;
+  char *origcharset;
+  char *realcharset;
 public:
   cCharSet();
   virtual ~cCharSet();
+  using cListItem::Apply;
   virtual bool Apply(cEvent *Event);
   void SetFromString(char *string, bool Enabled);
-  virtual void PrintConfigLineToFile(FILE *f);
 };
 
 // Global instance
-extern cEpgfixerList<cCharSet> EpgfixerCharSets;
+extern cEpgfixerList<cCharSet, cEvent> EpgfixerCharSets;
 
 #endif //__EPGFIXER_CHARSET_H_