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, 23 insertions, 8 deletions

diff --git a/README b/README
index 68ddf32..4211d60 100644
--- a/README
+++ b/README
@@ -23,9 +23,11 @@ Features:
 - Modifying EPG data using regular expressions. Correctly named back references
   are placed to the named EPG field.
 - Character set conversions for channel using incorrect encoding.
-- Both regular expressions and character set conversions can be applied to 
+- Blacklists for ignoring EPG data from stream.
+- Regular expressions, character set conversions and blacklists can be applied to 
   either all channels or only to selected channels.
-- Editing regular expressions and character set conversions through setup menu.
+- Cloning EPG data from one channel to another.
+- Editing all settings through setup menu.
 - EPG bug fixes included in VDR individually selectable from
   setup menu.
 
@@ -42,10 +44,11 @@ make plugins
 
 Configuration:
 
-Regular expressions and character set conversions are defined in regexp.conf
-and charset.conf, respectively, located in VDR's configuration directory for
-plugins. Check the example configuration files under "epgfixer" subdirectory
-for further information.
+Regular expressions, character set conversions, blacklists and EPG clonings
+are defined in regexp.conf, charset.conf, blacklist.conf and epgclone.conf,
+respectively, located in "epgfixer" subdirectory of VDR's configuration 
+directory for plugins. Check the example configuration files under "epgfixer"
+subdirectory for further information.
 
 General syntax of configuration files:
 - Lines beginning with # are regarded as comments.
@@ -65,5 +68,17 @@ Syntax of regexp.conf line is "Channel_list:Parsed_epg_field=Regexp" with:
   content of the target EPG field, respectively.
 - Several regular expressions may be applied to same field.
 
-Syntax of charset.conf line is "Channel_list:OriginalCharSet" with:
-- OriginalCharSet is a name of a character set (e.g. iso8859-1).
+Syntax of charset.conf line is "Channel_list:BroadcastCharset=OriginalCharSet"
+with:
+- OriginalCharSet and BroadcastCharset are names of a character set
+  (e.g. iso8859-1).
+- OriginalCharSet is the real character set of EPG data.
+- BroadcastCharset is the optional incorrect character set received in data
+  stream.
+- If no BroadcastCharset is defined ISO6937 is assumed.
+
+Syntax of blacklist.conf line is "Channel_list" with:
+- Only comma separated list of channel to be ignored.
+
+Syntax of epgclone.conf line is "FromChannel=ToChannel" with:
+- Copy EPG data of FromChannel into ToChannel.