Source dir structure changed.

21 files changed, 0 insertions, 1894 deletions

diff --git a/block/.gitignore b/block/.gitignore
deleted file mode 100644
index 73d327d..0000000
--- a/block/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#ignore backup files
-*~
\ No newline at end of file
diff --git a/block/COPYING b/block/COPYING
deleted file mode 100644
index 5b6e7c6..0000000
--- a/block/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/block/HISTORY b/block/HISTORY
deleted file mode 100644
index 5e8e44e..0000000
--- a/block/HISTORY
+++ /dev/null
@@ -1,71 +0,0 @@
-VDR Plugin 'block' Revision History
------------------------------------
-
-2010/04/20: Version 0.0.1b
-
-Initial release.
-
-Fix: 'Ok' now in fact unlocks a blocked broadcast reliably
-     (switch function was moved to destructor of control.c)
-
-
-**************************************************************************
-2010/04/19: Version 0.0.1
-
-First version.
-
-This version is based on a cvs checkout (20100113) of the orphaned
-vdr-plugin taste originally coded by LordJaxom aka Sascha Volkenandt.
-Unfortunately the taste plugin did not work on vdr machines lacking a full
-feature dvb card. So i tried to change some code  to achieve compatibility
-with a broader range of configs and finally came up with a new version that
-does the job on machines with a ff-card as well as on budget solutions (in
-my case the dxr3) and state-of-the-art softdevice configurations. This patch
-can be found here:
-http://www.vdr-portal.de/board/thread.php?threadid=92550
-
-Tobi then kindly offered me the opportunity to continue the development of
-the taste plugin on projects.vdr-developer.org and i asked Sascha how he
-feels about that, but he did not answer. So i decided to publish the new 
-version as a fork called 'block'. This way Saschas work will remain 
-untouched and i am completely free to continue my work on the plugin.
-
-
-Differences in the block plugin
--------------------------------
-
-** New features:
-
--Compatibility with non-ff output including budget and state-of-the-art
-softdevice configurations added (channel switch analysis changed)
--Implementation of syslog functions (BLOCK_LOGGING in the Makefile set
-	to 1 or 0 respectively will switch logging on/off)
-	ATTENTION: This will add lots of entries to your syslog!
-
-
-** Patches:
-
-Patches by tomg and mapovi which were written for the taste plugin were
-applied to a  were applied to a clean cvs checkout of the taste plugin
-on 2010/01/13 so that they are permanently build in the block plugin now.
-
-Locale patch:
-  - fixed clean target of Makefile
-  - adapted Makefile to current newplugin template
-  - use translations of main vdr
-  - exclude old i18n parts by ifdefs
-Version compatibility:
-  Changes for VDR >= 1.5.0 (applicable to VDR >= 1.4.5)
-Makefile fix:
-  added -fPIC to compiler options to prevent FTBFS
-
-Some additional information can be found here:
-http://www.vdr-portal.de/board/thread.php?threadid=90293
-Thanks to tomg and mapovi for their kind permission to use the patches.
-
-
-** WWW:
-
-Project homepage: http://projects.vdr-developer.org/projects/plg-block/news
-
-Author contact: Michael Schneider <vdrportal_midas at gmx dot de>
diff --git a/block/Makefile b/block/Makefile
deleted file mode 100644
index 6d52c44..0000000
--- a/block/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# Makefile for a Video Disk Recorder plugin
-#
-# $Id: Makefile,v 1.2 2006/07/05 20:19:56 thomas Exp $
-
-#turn on/off syslog messages
-BLOCK_LOGGING=0
-
-
-# The official name of this plugin.
-# This name will be used in the '-P...' option of VDR to load the plugin.
-# By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
-PLUGIN = block
-
-### The version number of this plugin (taken from the main source file):
-
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
-
-### The directory environment:
-
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
-
-### Allow user defined options to overwrite defaults:
-
--include $(VDRDIR)/Make.config
-
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
-
-### The name of the distribution archive:
-
-ARCHIVE = $(PLUGIN)-$(VERSION)
-PACKAGE = vdr-$(ARCHIVE)
-
-### Includes and Defines (add further entries here):
-
-INCLUDES += -I$(VDRDIR)/include
-
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-
-ifdef BLOCK_LOGGING
-DEFINES += -DLOGGING
-endif
-
-### The object files (add further files here):
-
-OBJS = $(PLUGIN).o status.o control.o event.o setup.o config.o i18n.o
-
-### The main target:
-
-all: libvdr-$(PLUGIN).so i18n
-
-### Implicit rules:
-
-%.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
-
-### Dependencies:
-
-MAKEDEP = $(CXX) -MM -MG
-DEPFILE = .dependencies
-$(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-
--include $(DEPFILE)
-
-### Internationalization (I18N):
-
-PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
-I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
-I18Npot   = $(PODIR)/$(PLUGIN).pot
-
-%.mo: %.po
-	msgfmt -c -o $@ $<
-
-$(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<sascha@akv-soft.de>' -o $@ $^
-
-%.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
-	@touch $@
-
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
-
-.PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
-
-### Targets:
-
-libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
-dist: clean
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@mkdir $(TMPDIR)/$(ARCHIVE)
-	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) --exclude debian --exclude CVS --exclude .svn $(ARCHIVE)
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution package created as $(PACKAGE).tgz
-
-clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
diff --git a/block/README b/block/README
deleted file mode 100644
index 05108b9..0000000
--- a/block/README
+++ /dev/null
@@ -1,49 +0,0 @@
-This is a "plugin" for the Video Disk Recorder (VDR).
-
-The block plugin is a fork of the orphaned taste plugin 0.0.2d which was
-originally coded by LordJaxom aka Sascha Volkenandt.
-Please do not install both plugins (taste AND block)!
-Apart from that this probably won't work it simply does not make any sense
-at all ;).
-
-Contact information (block plugin):
-Developer/Maintainer: Michael Schneider <vdrportal_midas at gmx dot de>
-Project homepage: http://projects.vdr-developer.org/projects/plg-block/news
-
-
-Contact information (taste plugin):
-Written by: Sascha Volkenandt <sascha at akv-soft dot de>
-Project homepage: http://www.magoa.net/linux/index.php?view=taste
-
-See the file COPYING for license information.
-
-Description:
-
-This plugin prevents you from being bothered by unwanted broadcasts. Instead
-of those the screen will stay black, the sound muted, an info message
-appears in the OSD and after a configurable pause the vdr switches to
-another channel.
-
-Unwanted shows are identified by their EPG title in a predefined blacklist.
-You can add the current title to the block plugin blacklist by choosing
-'Block Broadcast' from the main VDR menu or by editing the blacklist in the
-setup of the plugin. In the latter case make sure you close the submenus as
-well as the setup menu by 'ok' to properly save your changes. This would
-also be the right place to remove entries from the blacklist.
-
-Every time the VDR switches to another channel the block plugin checks if
-the EPG title of the current show matches with a blacklist entry and if so
-the show won't be displayed and after a configurable pause (default 2s) the
-VDR switches to another channel automatically. Usually this will be the next
-possible lower channel number if you were coming from a higher one or
-vice-versa. If this is not possible, the vdr switches to the last channel
-displayed. Of course you can zap to another channel yourself as well.
-
-In case you unexpectedly want to watch a blacklisted show you can override
-the block rule by pressing 'Ok' while the message is displayed.
-
-For VDR versions <= 1.3.16 you will have to apply the included patch to the
-VDR source in order to have multiple channels being blocked in a row.
-Otherwise the block plugin will only skip the first channel. The patch
-originates from the taste plugin and was written by Sascha Volkenandt.
-
diff --git a/block/block.c b/block/block.c
deleted file mode 100644
index 0e3cf37..0000000
--- a/block/block.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * block.c: A plugin for the Video Disk Recorder
- *
- * based on taste.c v 1.1.1.1 2006/02/26 14:11:02 by lordjaxom
- *
- * See the README file for copyright and contact information.
- *
- * version by Midas
- *
- */
-
-#include <vdr/plugin.h>
-
-#include "status.h"
-#include "event.h"
-#include "setup.h"
-#include "config.h"
-#include "i18n.h"
-
-static const char *VERSION        = "0.0.1b";
-static const char *DESCRIPTION    = trNOOP("Lock unwanted shows by keywords");
-static const char *MAINMENUENTRY  = trNOOP("Schedule not acceptable");
-
-class cPluginBlock : public cPlugin {
-private:
-  cStatusBlock *mStatus;
-
-public:
-  cPluginBlock(void);
-  virtual ~cPluginBlock();
-  virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return tr(DESCRIPTION); }
-  virtual bool Initialize(void);
-  virtual bool Start(void);
-  virtual const char *MainMenuEntry(void) { return SetupBlock.HideMenuEntry ? NULL : tr(MAINMENUENTRY); }
-  virtual cOsdObject *MainMenuAction(void);
-  virtual cMenuSetupPage *SetupMenu(void);
-  virtual bool SetupParse(const char *Name, const char *Value);
-  };
-
-cPluginBlock::cPluginBlock(void):
-    cPlugin(),
-    mStatus(NULL)
-{
-}
-
-cPluginBlock::~cPluginBlock()
-{
-  delete mStatus;
-}
-
-bool cPluginBlock::Initialize(void)
-{
-  return EventsBlock.Load(AddDirectory(cPlugin::ConfigDirectory(), "block.conf"), true, false);
-}
-
-bool cPluginBlock::Start(void)
-{
-#if VDRVERSNUM < 10507 
-  RegisterI18n(Phrases);
-#endif 
-  mStatus = new cStatusBlock();
-  return true;
-}
-
-cOsdObject *cPluginBlock::MainMenuAction(void)
-{
-  const cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-  if (channel != NULL && !channel->GroupSep()) { 
-    cSchedulesLock schedLock;
-    const cSchedules *scheds = cSchedules::Schedules(schedLock);
-    if (scheds == NULL)
-      return NULL;
-
-    const cSchedule *sched = scheds->GetSchedule(channel->GetChannelID());
-    if (sched == NULL)
-      return NULL;
-
-    const cEvent *present = sched->GetPresentEvent();
-    EventsBlock.Add(new cEventBlock(present->Title()));
-    EventsBlock.Save();
-  }
-  return NULL;
-}
-
-cMenuSetupPage *cPluginBlock::SetupMenu(void)
-{
-  return new cMenuSetupBlock();
-}
-
-bool cPluginBlock::SetupParse(const char *Name, const char *Value)
-{
-  return SetupBlock.Parse(Name, Value);
-}
-
-VDRPLUGINCREATOR(cPluginBlock); // Don't touch this!
diff --git a/block/common.h b/block/common.h
deleted file mode 100644
index c93d643..0000000
--- a/block/common.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * based on common.h,v 1.2 2007/06/18 17:58:52 lordjaxom
- *
- * version by Midas
- *
- */
-
-#ifndef VDR_BLOCK_COMMON_H
-#define VDR_BLOCK_COMMON_H
-
-#include <stdint.h>
-#include <vdr/tools.h>
-
-#if VDRVERSNUM >= 10318
-inline uint64_t time_ms() { return cTimeMs::Now(); }
-#endif
-
-#endif // VDR_BLOCK_COMMON_H
diff --git a/block/config.c b/block/config.c
deleted file mode 100644
index 3b0a6f5..0000000
--- a/block/config.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * based on config.c,v 1.1.1.1 2006/02/26 14:11:02 lordjaxom
- *
- * version by Midas
- *
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-cSetupBlock SetupBlock;
-
-cSetupBlock::cSetupBlock(void):
-	HideMenuEntry(0),
-	MessageTimeout(2)
-{
-}
-
-bool cSetupBlock::Parse(const char *Name, const char *Value)
-{
-  if (strcmp(Name, "HideMenuEntry")  == 0) HideMenuEntry  = atoi(Value);
-  else if (strcmp(Name, "MessageTimeout") == 0) MessageTimeout = atoi(Value);
-  else return false;
-  return true;
-}
diff --git a/block/config.h b/block/config.h
deleted file mode 100644
index 5273220..0000000
--- a/block/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * based on config.h,v 1.1.1.1 2006/02/26 14:11:02 lordjaxom
- *
- * version by Midas
- *
- */
-
-#ifndef VDR_BLOCK_CONFIG_H
-#define VDR_BLOCK_CONFIG_H
-
-class cSetupBlock {
-public:
-  int  HideMenuEntry;
-  int  MessageTimeout;
-
-  cSetupBlock(void);
-  bool Parse(const char *Name, const char *Value);
-};
-
-extern cSetupBlock SetupBlock;
-
-#endif // VDR_BLOCK_CONFIG_H
diff --git a/block/control.c b/block/control.c
deleted file mode 100644
index d6acd7e..0000000
--- a/block/control.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * based on control.c,v 1.4 2007/06/18 17:58:52 lordjaxom
- *
- * version by Midas
- *
- */
-
-#include "control.h"
-#include "config.h"
-#include "common.h"
-
-#include <vdr/remote.h>
-
-inline uint64_t BlockTimeout() { return SetupBlock.MessageTimeout * 1000; }
-
-bool cControlBlock::mRequested = false;
-
-cControlBlock::cControlBlock(int LastChannel, const cChannel *Channel, const cEvent *Present, const cEvent *Following):
-    cControl(new cPlayer),
-    mLastChannel(LastChannel),
-		mChannel(Channel),
-		mPresent(Present),
-		mFollowing(Following),
-		mStart(0),
-		mSwitch(true),
-		mOsd(NULL)
-{
-#if APIVERSNUM >= 10500
-	SetNeedsFastResponse(true);
-#else
-	needsFastResponse = true;
-#endif
-	cRemote::Put(kOk, true); // Hide OSD
-}
-
-cControlBlock::~cControlBlock()
-{
-	if (mOsd != NULL)
-		delete mOsd;
-        if (mRequested)
-        {
-#ifdef LOGGING
-          dsyslog("plugin-block: userint user requested to watch blocked channel");
-#endif  
-          //if (mChannel!=0)
-          if (mChannel != NULL)
-          {
-            cDevice::PrimaryDevice()->SwitchChannel(mChannel, true);
-          }
-          else
-          {
-             //don't know if this is necessary - just taken from plugin taste
-             //seems that mChannel cannot be 0 because it is an object reference
-             //changed that to NULL
-             dsyslog("plugin-block: userint Cannot switch - channel unknown!");
-          }
-        }
-
-	if (mSwitch) {
-		// possibly first or last available channel, fall back to old channel
-		int direction = mChannel->Number() - mLastChannel;
-		if (direction == 0)
-			direction = 1;
-		if (!cDevice::SwitchChannel(direction) && (mLastChannel != 0))
-			Channels.SwitchTo(mLastChannel);
-	}
-}
-
-void cControlBlock::Show(void)
-{
-	if (mOsd == NULL)
-		mOsd = Skins.Current()->DisplayChannel(true);
-
-	mOsd->SetChannel(mChannel, 0);
-	mOsd->SetEvents(mPresent, mFollowing);
-	mOsd->SetMessage(mtError, tr("Channel not acceptable!"));
-	mOsd->Flush();
-
-	mStart = time_ms();
-}
-
-eOSState cControlBlock::ProcessKey(eKeys Key)
-{
-#ifdef LOGGING
-	dsyslog("plugin-block: userint cControlBlock::ProcessKey(%d) this = %p", Key, this);
-#endif
-
-  switch (Key) {
-
-	case kOk:
-#ifdef LOGGING
-		dsyslog("plugin-block: userint Processing 'Ok' event");
-#endif		
-		mRequested = true;
-		mSwitch = false;
-		return osEnd;
-
-	case kNone:
-#ifdef LOGGING
-dsyslog("plugin-block: userint Processing kNone (no user interaction)");
-#endif
-		if (mStart == 0)
-			Show();
-		else if (time_ms() - mStart > BlockTimeout()) {
-			mSwitch = true;
-			return osEnd;
-		}
-	  return osContinue;
-
-		
-
-	case kUp:
-	case kDown:
-	case kChanUp:
-	case kChanDn:
-#ifdef LOGGING
-dsyslog("plugin-block: userint Processing k(Ch)Up/(Ch)Down event.");
-#endif
-		mRequested = false;
-		mSwitch = true;
-		return osEnd;
-		break;
-
-  default:
-    break;
-  }
-  return osContinue;
-}
-
diff --git a/block/control.h b/block/control.h
deleted file mode 100644
index 8029c52..0000000
--- a/block/control.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * based on control.h,v 1.2 2007/06/18 17:58:52 lordjaxom
- *
- * version by Midas
- *
- */
-
-#ifndef VDR_BLOCK_CONTROL_H
-#define VDR_BLOCK_CONTROL_H
-
-#include <stdint.h>
-#include <vdr/player.h>
-
-class cControlBlock : public cControl {
-private:
-	static bool           mRequested;
-
-  int                   mLastChannel;
-	const cChannel       *mChannel;
-	const cEvent         *mPresent;
-	const cEvent         *mFollowing;
-	uint64_t              mStart;
-	bool                  mSwitch;
-  cSkinDisplayChannel  *mOsd;
-
-protected:
-	virtual void Show(void);
-  virtual void Hide(void) {}
-
-public:
-  cControlBlock(int Direction, const cChannel *Channel, const cEvent *Present, const cEvent *Following);
-  ~cControlBlock();
-
-  virtual eOSState ProcessKey(eKeys Key);
-
-	static bool IsRequested(void) { bool r = mRequested; mRequested = false; return r; }
-};
-
-#endif // VDR_BLOCK_CONTROL_H
diff --git a/block/event.c b/block/event.c
deleted file mode 100644
index d06040a..0000000
--- a/block/event.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * based on event.c,v 1.1.1.1 2006/02/26 14:11:02 lordjaxom
- *
- * version by Midas
- *
- */
-
-#include "event.h"
-
-#include <ctype.h>
-
-static char *duptolower(const char *s) {
-	char *c = strdup(s);
-	char *p = c;
-	for (; *p; ++p)
-		*p = tolower(*p);
-	return c;
-}
-
-cEventsBlock EventsBlock;
-
-cEventBlock::cEventBlock(void):
-		mRegularExp(false),
-		mIgnoreCase(false),
-		mCompiled(false)
-{
-  strncpy(mPattern, tr("New Entry"), sizeof(mPattern));
-}
-
-cEventBlock::cEventBlock(const char *Pattern):
-		mRegularExp(false),
-		mIgnoreCase(false),
-		mCompiled(false)
-{
-  strncpy(mPattern, Pattern, sizeof(mPattern));
-}
-
-cEventBlock::cEventBlock(const cEventBlock &Src)
-{
-	operator=(Src);
-}
-
-cEventBlock &cEventBlock::operator=(const cEventBlock &Src)
-{
-	printf("copy construct\n");
-	strcpy(mPattern, Src.mPattern);
-	mRegularExp = Src.mRegularExp;
-	mIgnoreCase = Src.mIgnoreCase;
-	mCompiled   = false;
-	Compile();
-	return *this;
-}
-
-cEventBlock::~cEventBlock()
-{
-	if (mRegularExp)
-		regfree(&mExpression);
-}
-
-bool cEventBlock::Acceptable(const char *Event) const 
-{
-	if (mRegularExp)
-		return regexec(&mExpression, Event, 0, NULL, 0) != 0;
-	else if (mIgnoreCase) {
-		char *ev = duptolower(Event);
-		char *pa = duptolower(mPattern);
-		printf("check for %s in %s\n", pa, ev);
-		bool res = strstr(ev, pa) == NULL;
-		free(ev); free(pa);
-		return res;
-	} else
-		return strstr(Event, mPattern) == NULL;
-}
-
-bool cEventBlock::Parse(char *s) {
-	char *patternbuf = NULL;
-	int fields = sscanf(s, "%d:%d:%a[^\n]", &mRegularExp, &mIgnoreCase, &patternbuf);
-
-	if (fields == 3) {
-		strncpy(mPattern, skipspace(stripspace(patternbuf)), sizeof(mPattern));
-		free(patternbuf);
-	} else { // backward compatibility
-		strncpy(mPattern, skipspace(stripspace(s)), sizeof(mPattern));
-		mRegularExp = false;
-		mIgnoreCase = false;
-	}
-
-  return Compile();
-}
-
-bool cEventBlock::Compile(void) {
-	mCompiled = false;
-	if (mRegularExp) {
-		if (regcomp(&mExpression, mPattern, REG_EXTENDED | (mIgnoreCase ? REG_ICASE : 0)) != 0) {
-			esyslog("ERROR: malformed regular expression: %s", mPattern);
-			return false;
-		} else
-			mCompiled = true;
-	}
-	return true;
-}
-
-bool cEventBlock::Save(FILE *f) {
-  return fprintf(f, "%d:%d:%s\n", mRegularExp, mIgnoreCase, mPattern) > 0;
-}
-
-bool cEventsBlock::Acceptable(const char *Event) {
-  const cEventBlock *event = First();
-  while (event != NULL) {
-    if (!event->Acceptable(Event))
-      return false;
-    event = Next(event);
-  }
-  return true;
-}
-
-cEventsBlock &cEventsBlock::operator=(const cEventsBlock &Source) {
-  cList<cEventBlock>::Clear();
-  
-  const cEventBlock *event = Source.First();
-  while (event != NULL) {
-    printf("transfering %p\n", event);
-    Add(new cEventBlock(*event));
-    event = Source.Next(event);
-  }
-  return *this;
-}
diff --git a/block/event.h b/block/event.h
deleted file mode 100644
index 3b8c34c..0000000
--- a/block/event.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * based on event.h,v 1.1.1.1 2006/02/26 14:11:02 lordjaxom
- *
- * version by Midas
- *
- */
-
-#ifndef VDR_BLOCK_EVENT_H
-#define VDR_BLOCK_EVENT_H
-
-#include <sys/types.h>
-#include <regex.h>
-							
-#include <vdr/tools.h>
-#include <vdr/config.h>
-
-#define EVLINELENGTH 256
-
-class cEventBlock : public cListObject {
-  friend class cMenuSetupEditBlock;
-
-private:
-  char mPattern[EVLINELENGTH];
-	int  mRegularExp;
-	int  mIgnoreCase;
-	bool mCompiled;
-
-	regex_t mExpression;
-
-public:
-  cEventBlock(void);
-  cEventBlock(const char *Pattern);
-	cEventBlock(const cEventBlock &Src);
-	~cEventBlock();
-
-	cEventBlock &operator=(const cEventBlock &Src);
-
-  bool Acceptable(const char *Event) const ;
-
-  bool Parse(char *s);
-	bool Compile(void);
-  bool Save(FILE *f);
-
-  const char *Pattern(void) const { return mPattern; }
-};
-
-class cEventsBlock : public cConfig<cEventBlock> {
-public:
-  bool Acceptable(const char *Event);
-  cEventsBlock &operator=(const cEventsBlock &Source);
-};
-
-extern cEventsBlock EventsBlock;
-
-#endif // VDR_BLOCK_EVENT_H
diff --git a/block/i18n.c b/block/i18n.c
deleted file mode 100644
index f2e5496..0000000
--- a/block/i18n.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/**
- * based on i18n.c,v 1.2 2006/07/05 20:19:56 thomas
- *
- * version by Midas
- */
-
-#include "i18n.h"
-
-#if VDRVERSNUM < 10507
-
-const tI18nPhrase Phrases[] = {
-	/*
-  { "English",
-    "Deutsch",
-    "Slovenski",
-    "Italiano",
-    "Nederlands",
-    "Português",
-    "Français",
-    "Norsk",
-    "suomi", // this is not a typo - it's really lowercase!
-    "Polski",
-    "Español",
-    "ÅëëçíéêÜ", // Greek
-    "Svenska",
-    "Românã",
-    "Magyar",
-    "Català",
-    "ÀãááÚØÙ", // Russian
-    "Hrvatski",
-    "Eesti",
-    "Dansk",
-  },
-	*/
-  { "Block broadcast",
-    "Sendung sperren",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-  { "Block unwanted shows by EPG title",
-    "Sendung/EPG-Titel sperren",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-  { "Channel not acceptable!",
-    "Aktuelle Sendung unzumutbar!",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-  { "New Entry",
-    "Neuer Eintrag",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-  { "Hide Mainmenu Entry",
-    "Hauptmenüeintrag verstecken",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-  { "Edit",
-    "Editieren",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-  { "Delete",
-    "Löschen",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-	{ "New",
-    "Neu",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-	{ "Delete keyword?",
-    "Schlagwort löschen?",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-	{ "Pattern",
-    "Suchmuster",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-	{ "--- Keywords -------------------------------------------------------------------",
-    "--- Schlagworte ----------------------------------------------------------------",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-	{ "Regular Expression",
-    "Regulärer Ausdruck",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-	{ "Ignore Case",
-    "Groß/Kleinschreibung ignorieren",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-	{ "Malformed regular expression!",
-    "Ungültiger regulärer Ausdruck!",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-	{ "Message Timeout [s]",
-    "Wartezeit bis Umschalten [s]",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-#if VDRVERSNUM >= 10313
-    "",
-#endif
-#if VDRVERSNUM >= 10316
-    "",
-#endif
-  },
-	{ NULL }
-};
-
-#endif
diff --git a/block/i18n.h b/block/i18n.h
deleted file mode 100644
index 73401f1..0000000
--- a/block/i18n.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * based on i18n.h,v 1.1.1.1 2006/02/26 14:11:02 lordjaxom
- *
- * version by Midas
- *
- */
-
-#ifndef VDR_BLOCK_I18N_H
-#define VDR_BLOCK_I18N_H
-
-#include <vdr/i18n.h>
-#include <vdr/config.h>
-
-#if VDRVERSNUM < 10507
-
-#define trNOOP(s) (s)
-#define trVDR(s) tr(s)
-
-extern const tI18nPhrase Phrases[];
-
-#endif
-
-#endif // VDR_BLOCK_I18N_H
diff --git a/block/patches/vdr-1.3.x-player.diff b/block/patches/vdr-1.3.x-player.diff
deleted file mode 100644
index ea35bf6..0000000
--- a/block/patches/vdr-1.3.x-player.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- player.c.orig	2004-11-16 20:10:27.661038144 +0100
-+++ player.c	2004-11-16 16:58:04.149918576 +0100
-@@ -88,6 +88,8 @@
- 
- void cControl::Shutdown(void)
- {
--  delete control;
-+  cControl *c = control;
-   control = NULL;
-+  if (c)
-+     delete c;
- }
diff --git a/block/po/empty b/block/po/empty
deleted file mode 100644
index e69de29..0000000
--- a/block/po/empty
+++ /dev/null
diff --git a/block/setup.c b/block/setup.c
deleted file mode 100644
index 4f48739..0000000
--- a/block/setup.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * based on setup.c,v 1.1.1.1 2006/02/26 14:11:02 lordjaxom
- *
- * version by Midas
- *
- */
-
-#include "setup.h"
-
-#include <vdr/interface.h>
-
-cMenuSetupBlock::cMenuSetupBlock():
-    cMenuSetupPage()
-{
-  mEventsData = EventsBlock; // need to use copy constructor
-  mSetupData  = SetupBlock;
-  Set();
-}
-
-void cMenuSetupBlock::Set(void) {
-  int current = Current();
-  cOsdItem *item;
-
-  Clear();
-
-  Add(new cMenuEditBoolItem(tr("Hide Mainmenu Entry"), &mSetupData.HideMenuEntry));
-  Add(new cMenuEditIntItem(tr("Message Timeout [s]"),  &mSetupData.MessageTimeout, 0, 10));
-
-  item = new cOsdItem("");
-  item->SetSelectable(false);
-  Add(item);
-
-  item = new cOsdItem(tr("--- Keywords -------------------------------------------------------------------"));
-  item->SetSelectable(false);
-  Add(item);
-
-#define NONKEYWORDITEMS 4
-
-  int index = 0;
-  cEventBlock *event = mEventsData.First();
-  while (event != NULL) {
-    Add(new cOsdItem(event->Pattern()));
-    event = mEventsData.Next(event);
-    ++index;
-  }
-
-  SetCurrent(Get(current));
-  SetHelpKeys();
-  Display();
-}
-
-void cMenuSetupBlock::SetHelpKeys(void)
-{
-  const char *red    = NULL;
-  const char *yellow = NULL;
-
-  printf("sethelpkeys, current = %d\n", Current());
-
-  if (Current() >= NONKEYWORDITEMS) {
-	red    = trVDR("Button$Edit");
-	yellow = trVDR("Button$Delete");
-  }
-  SetHelp(red, trVDR("Button$New"), yellow, NULL);
-}
-
-void cMenuSetupBlock::Store(void) 
-{
-  EventsBlock = mEventsData;
-  EventsBlock.Save();
-
-  SetupBlock  = mSetupData;
-  SetupStore("HideMenuEntry",  SetupBlock.HideMenuEntry);
-  SetupStore("MessageTimeout", SetupBlock.MessageTimeout);
-}
-
-eOSState cMenuSetupBlock::Edit(void)
-{
-  if (HasSubMenu() || Current() < NONKEYWORDITEMS)
-    return osContinue;
-
-  cEventBlock *event = mEventsData.Get(Current() - NONKEYWORDITEMS);
-  if (event != NULL)
-    return AddSubMenu(new cMenuSetupEditBlock(event));
-  return osContinue;
-}
-
-eOSState cMenuSetupBlock::New(void)
-{
-  if (HasSubMenu())
-    return osContinue;
-
-  mEventsData.Add(new cEventBlock());
-  Set();
-  return osContinue;
-}
-
-eOSState cMenuSetupBlock::Delete(void)
-{
-  if (HasSubMenu() || Current() < NONKEYWORDITEMS)
-    return osContinue;
-        
-  cEventBlock *event = mEventsData.Get(Current() - NONKEYWORDITEMS);
-  if (event != NULL) {
-	if (Interface->Confirm(tr("Delete keyword?")))
-	  mEventsData.Del(event);
-  }
-  Set();
-  return osContinue;
-}
-
-eOSState cMenuSetupBlock::ProcessKey(eKeys Key) {
-  bool hadSubMenu = HasSubMenu();
-  eOSState state = cMenuSetupPage::ProcessKey(Key);
-
-  if (hadSubMenu && !HasSubMenu()) {
-		Set();
-		return state;
-  }
-
-  switch (state) {
-  case osUnknown: // normal key handling
-    switch (Key) {
-    case kRed:    return Edit();
-    case kGreen:  return New();
-    case kYellow: return Delete();
-
-    default:
-      break;
-    }
-    break;
-
-  default:
-    break;
-  }
-	
-	if (!HasSubMenu())
-		Set();
-
-  return state;
-}
-
-static const char *ALLOWEDCHARS = "$ abcdefghijklmnopqrstuvwxyz0123456789-_.#~/[]{}()+*^$";
-
-cMenuSetupEditBlock::cMenuSetupEditBlock(cEventBlock *Event):
-    cOsdMenu("", 33),
-    mEvent(Event),
-    mData(*Event)
-{
-  char buf[80];
-  snprintf(buf, sizeof(buf), "%s - %s '%s'", trVDR("Setup"), trVDR("Plugin"), "block");
-  SetTitle(buf);
-  Add(new cMenuEditStrItem(tr("Pattern"), mData.mPattern, sizeof(mData.mPattern), tr(ALLOWEDCHARS)));
-	Add(new cMenuEditBoolItem(tr("Regular Expression"), &mData.mRegularExp));
-	Add(new cMenuEditBoolItem(tr("Ignore Case"), &mData.mIgnoreCase));
-}
-
-eOSState cMenuSetupEditBlock::ProcessKey(eKeys Key)
-{
-  eOSState state = cOsdMenu::ProcessKey(Key);
-
-  if (state == osUnknown) {
-    switch (Key) {
-    case kOk:
-			if (!mData.Compile()) {
-				Skins.Message(mtError, tr("Malformed regular expression!"));
-				state = osContinue;
-			} else {
-				*mEvent = mData;
-				state = osBack;
-			}
-      break;
-
-    default:
-      break;
-    }
-  }
-  return state;
-}
diff --git a/block/setup.h b/block/setup.h
deleted file mode 100644
index 1bbc7c6..0000000
--- a/block/setup.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * based on setup.h,v 1.1.1.1 2006/02/26 14:11:02 lordjaxom
- *
- * version by Midas
- *
- */
-
-#ifndef VDR_BLOCK_SETUP_H
-#define VDR_BLOCK_SETUP_H
-
-#include <vdr/menuitems.h>
-
-#include "event.h"
-#include "config.h"
-
-class cMenuSetupBlock : public cMenuSetupPage {
-private:
-  cEventsBlock mEventsData;
-  cSetupBlock  mSetupData;
-
-protected:
-  virtual void Store(void);
-  virtual eOSState ProcessKey(eKeys Key);
-
-  void Set(void);
-  void SetHelpKeys(void);
-
-  eOSState Edit(void);
-  eOSState New(void);
-  eOSState Delete(void);
-
-public:
-  cMenuSetupBlock();
-};
-
-class cMenuSetupEditBlock : public cOsdMenu {
-private:
-  cEventBlock *mEvent;
-  cEventBlock  mData;
-
-protected:
-  eOSState ProcessKey(eKeys Key);
-
-public:
-  cMenuSetupEditBlock(cEventBlock *Event);
-};
-
-#endif // VDR_BLOCK_SETUP_H
diff --git a/block/status.c b/block/status.c
deleted file mode 100644
index 64b9d85..0000000
--- a/block/status.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * based on status.c,v 1.2 2007/05/08 10:16:23 thomas
- *
- * version by Midas
- *
- */
-
-#include <vdr/channels.h>
-
-#include "status.h"
-#include "control.h"
-#include "event.h"
-
-cStatusBlock::cStatusBlock(void):
-    cStatus(),
-    mLastChannel(0) // int
-{
-}
-
-void cStatusBlock::ChannelSwitch(const cDevice *Device, int ChannelNumber)
-{
-  printf("cStatusBlock::ChannelSwitch(%p, %d)\n", Device, ChannelNumber);
-
-#ifdef LOGGING
-  dsyslog("plugin-block: cStatusBlock was informed about channel switch at device %d, channel no %d",Device->DeviceNumber(),ChannelNumber);
-  dsyslog("plugin-block: cDevice::CurrentChannel %d",cDevice::CurrentChannel());
-  dsyslog("plugin-block: Device %d, ActualDevice %d, primary Device %d",Device->DeviceNumber(),cDevice::ActualDevice()->DeviceNumber(),cDevice::PrimaryDevice()->DeviceNumber());
-  for (int ii=0;ii<cDevice::NumDevices();ii++)
-  {
-    cDevice* tmpdev=cDevice::GetDevice(ii);
-    dsyslog("plugin-block: cDevice %d replaying: %d, transferring %d",ii,tmpdev->Replaying(),tmpdev->Transferring());
-  }
-#endif
-
-
-  if (Device->DeviceNumber()!=cDevice::PrimaryDevice()->DeviceNumber())
-  {
-#ifdef LOGGING
-    dsyslog("plugin-block: Did nothing cause ChannelSwitch not on active livedevice.");
-#endif
-    return;
-  }
-
-  if (mLastChannel==0)
-  {
-#ifdef LOGGING
-    dsyslog("plugin-block: Did nothing cause mLastChannel=0 (set to %d)",cDevice::CurrentChannel());
-#endif
-    mLastChannel=cDevice::CurrentChannel();
-    return;
-  }
-  
-  if (ChannelNumber==0) 
-  {
-    mLastChannel=cDevice::CurrentChannel(); 
-#ifdef LOGGING
-    dsyslog("plugin-block: Did nothing because ChannelNumber=0 (some switch is in progress)"); 
-#endif
-    return; //seems that switching is in progress
-  }
-  
-  if (ChannelNumber!=cDevice::CurrentChannel())
-  {
-#ifdef LOGGING
-    dsyslog("plugin-block: Did nothing because ChannelNumber!=CurrentChannel (switch still in progress)");
-#endif
-    return;
-  }
-  
-  if (Device->Replaying()) 
-  {
-#ifdef LOGGING
-    dsyslog("plugin-block: Did nothing because Device is Replaying");
-#endif
-    return; 
-  }
-
-              const cChannel *channel = Channels.GetByNumber(ChannelNumber);
-              if (channel != NULL && !channel->GroupSep()) {
-                      cSchedulesLock schedLock;
-                      const cSchedules *scheds = cSchedules::Schedules(schedLock);
-                      if (scheds == NULL)
-		              return;
-
-			const cSchedule *sched = scheds->GetSchedule(channel->GetChannelID());
-			if (sched == NULL)
-				return;
-
-			const cEvent *present = sched->GetPresentEvent();
-			const cEvent *follow  = sched->GetFollowingEvent();
-			if (present == NULL)
-				return;
-          		
-          		if (!cControlBlock::IsRequested() && !EventsBlock.Acceptable(present->Title())) {
-				isyslog("plugin-block: channel %d is not acceptable at present", ChannelNumber);
-				cControl::Launch(new cControlBlock(mLastChannel, channel, present, follow));
-				mLastChannel=0;
-			}
-		}
-
-
-}
-  
diff --git a/block/status.h b/block/status.h
deleted file mode 100644
index 6525c3a..0000000
--- a/block/status.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * based on status.h,v 1.1.1.1 2006/02/26 14:11:02 lordjaxom
- *
- * version by Midas
- *
- */
-
-#ifndef VDR_BLOCK_STATUS_H
-#define VDR_BLOCK_STATUS_H
-
-#include <vdr/status.h>
-
-class cStatusBlock : public cStatus {
-private:
-  int mLastChannel;
-
-protected:
-  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
-
-public:
-  cStatusBlock(void);
-};
-
-#endif // VDR_BLOCK_STATUS_H