Version 1.1.17vdr-1.1.17

- Added new entries to 'ca.conf'.
- Fixed closing unused PID handles (thanks to Stefan Schluenss for reporting this
  one).
- Added more examples to 'diseqc.conf' (thanks to Oliver Endriss).
- Fixed disabling multiple recordings on a single DVB card (comment out the definition
  of the macros DO_REC_AND_PLAY_ON_PRIMARY_DEVICE and DO_MULTIPLE_RECORDINGS in
  dvbdevice.c).
- Plugins can now have their very own OSD setup in the object they return from
  a call to cPlugin::MainMenuAction(). In order to implement this, the return type
  of cPlugin::MainMenuAction() had to be changed from (cOsdMenu *) to (cOsdObject *).
  So in case you are compiling an existing plugin with this version of VDR and you
  get an error message, simply change cOsdMenu to cOsdObject in the plugin's source
  for the MainMenuAction() function.
  Plugin authors who have so far (ab)used the cControl mechanism to implement their
  own raw OSD should take a look at the new demo plugin 'osddemo'. It implements
  a very primitive game that shows how a plugin can have its own raw OSD. Especially
  look into cLineGame and see how it implements the Show() function. See also
  the chapter on "User interaction" in PLUGINS.html.
- Added three new fields to the lines in 'channels.conf': NID, TID and RID. NID and
  TID are the Network and Transport Stream IDs, respectively. RID is an additional ID
  that can be used to tell apart channels that would otherwise be indistinguishable.
  This is typically the case with radio channels, which may have the same NID, TID
  and SID, but different "radio IDs". This new field is therefore called RID ("radio
  ID"). Currently NID and TID are not yet used by VDR and should always be 0. The
  RID is actually used when building the "unique channel ID", so if you have channels
  in your 'channels.conf' file that cause error messages when loading, you can set
  the RIDs of these channels to different values.
  When reading an old 'channels.conf' these new fields will be automatically
  initialized to 0 and once the file is written back to disk they will be appended
  to the channel definitions.
  Thanks to Régis Bossut for pointing out that with some providers the channels can
  only be distinguished through the RID.
- The "unique channel ID" now contains an optional 5th part (the RID). See man vdr(5).
- Updated 'channels.conf.cable' and made some channels unique using the new RID
  (thanks to Andreas Kool for pointing out the problems).
- Made some channels unique in 'channels.conf.terr' using the new RID.
- Extended the '-l' option to allow logging to LOG_LOCALn (n=0..7) by writing, for
  instance, '-l 3.7' (suggested by Jürgen Schmidt).
- Now deleting stale lock files if they have a time stamp that is outside the window
  'now +/- LOCKFILESTALETIME'. This improves things in cases where the system time
  makes far jumps, so that a lock file might end up with a time stamp that lies
  in the distant future (thanks to Oliver Endriss).

38 files changed, 1502 insertions, 573 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6463c53..d8ecbf3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -276,6 +276,7 @@ Hannu Savolainen <hannu@opensound.com>
 
 Jürgen Schmidt <ju@ct.heise.de>
  for fixing a problem with 'in_addr_t' on systems with glibc < 2.2.
+ for suggesting to optionally allow logging to LOG_LOCALn (n=0..7)
 
 Uwe Freese <mail@uwe-freese.de>
  for suggesting to automatically close an empty recordings page after deleting
@@ -433,6 +434,8 @@ Oliver Endriss <o.endriss@gmx.de>
  current remote control
  for reporting a bug in the EPG scanner, which broke 'Transfer Mode' as soon as
  it kicked in
+ for providing examples for 'diseqc.conf'
+ for improving deleting stale lock files
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
@@ -466,3 +469,13 @@ Steffen Barszus <st_barszus@gmx.de>
 Peter Seyringer <e9425234@student.tuwien.ac.at>
  for reporting a bug in saving the polarization parameter of channels that have a
  number in the 'source' parameter
+
+Stefan Schluenss <dxr3_osd@schluenss.de>
+ for reporting a bug where PID handles were not closed correctly
+
+Régis Bossut <rbossut@auchan.com>
+  for pointing out that with some providers the channels can only be distinguished
+  through the RID
+
+Andreas Kool <akool@akool.de>
+  for pointing out problems with non-unique definitions in 'channels.conf.cable'
diff --git a/HISTORY b/HISTORY
index e0a5f11..4d21508 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1767,3 +1767,48 @@ Video Disk Recorder Revision History
   data for NVOD channels.
 - Fixed a compiler warning regarding cMenuChannels::Del() and MenuTimers::Del() hiding
   the base class virtual functions.
+
+2002-11-24: Version 1.1.17
+
+- Added new entries to 'ca.conf'.
+- Fixed closing unused PID handles (thanks to Stefan Schluenss for reporting this
+  one).
+- Added more examples to 'diseqc.conf' (thanks to Oliver Endriss).
+- Fixed disabling multiple recordings on a single DVB card (comment out the definition
+  of the macros DO_REC_AND_PLAY_ON_PRIMARY_DEVICE and DO_MULTIPLE_RECORDINGS in
+  dvbdevice.c).
+- Plugins can now have their very own OSD setup in the object they return from
+  a call to cPlugin::MainMenuAction(). In order to implement this, the return type
+  of cPlugin::MainMenuAction() had to be changed from (cOsdMenu *) to (cOsdObject *).
+  So in case you are compiling an existing plugin with this version of VDR and you
+  get an error message, simply change cOsdMenu to cOsdObject in the plugin's source
+  for the MainMenuAction() function.
+  Plugin authors who have so far (ab)used the cControl mechanism to implement their
+  own raw OSD should take a look at the new demo plugin 'osddemo'. It implements
+  a very primitive game that shows how a plugin can have its own raw OSD. Especially
+  look into cLineGame and see how it implements the Show() function. See also
+  the chapter on "User interaction" in PLUGINS.html.
+- Added three new fields to the lines in 'channels.conf': NID, TID and RID. NID and
+  TID are the Network and Transport Stream IDs, respectively. RID is an additional ID
+  that can be used to tell apart channels that would otherwise be indistinguishable.
+  This is typically the case with radio channels, which may have the same NID, TID
+  and SID, but different "radio IDs". This new field is therefore called RID ("radio
+  ID"). Currently NID and TID are not yet used by VDR and should always be 0. The
+  RID is actually used when building the "unique channel ID", so if you have channels
+  in your 'channels.conf' file that cause error messages when loading, you can set
+  the RIDs of these channels to different values.
+  When reading an old 'channels.conf' these new fields will be automatically
+  initialized to 0 and once the file is written back to disk they will be appended
+  to the channel definitions.
+  Thanks to Régis Bossut for pointing out that with some providers the channels can
+  only be distinguished through the RID.
+- The "unique channel ID" now contains an optional 5th part (the RID). See man vdr(5).
+- Updated 'channels.conf.cable' and made some channels unique using the new RID
+  (thanks to Andreas Kool for pointing out the problems).
+- Made some channels unique in 'channels.conf.terr' using the new RID.
+- Extended the '-l' option to allow logging to LOG_LOCALn (n=0..7) by writing, for
+  instance, '-l 3.7' (suggested by Jürgen Schmidt).
+- Now deleting stale lock files if they have a time stamp that is outside the window
+  'now +/- LOCKFILESTALETIME'. This improves things in cases where the system time
+  makes far jumps, so that a lock file might end up with a time stamp that lies
+  in the distant future (thanks to Oliver Endriss).
diff --git a/INSTALL b/INSTALL
index da99593..841575d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -32,7 +32,7 @@ following values 'make' call to activate the respective control mode:
 
   REMOTE=KBD    control via the PC keyboard (default)
   REMOTE=RCU    control via the "Remote Control Unit" receiver
-                (see http://www.cadsoft.de/people/kls/vdr/remote.htm)
+                (see http://www.cadsoft.de/vdr/remote.htm)
   REMOTE=LIRC   control via the "Linux Infrared Remote Control"
                 (see http://www.lirc.org)
   REMOTE=NONE   no remote control (in case only SVDRP shall be used)
diff --git a/PLUGINS.html b/PLUGINS.html
index ccd3fcf..8aa40f0 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -13,30 +13,68 @@ separate from the core VDR source, without the need of patching the original
 VDR code (and all the problems of correlating various patches).
 <p>
 This document is divided into two parts, the first one describing the
-<a href="#Part I - The Outside Interface"><i>outside</i> interface</a>
+<a href="#Part I - The External Interface"><i>external</i> interface</a>
 of the plugin system, and the second one describing the
-<a href="#Part II - The Inside Interface"><i>inside</i> interface</a>.
-The <i>outside</i> interface handles everything necessary for a plugin to get hooked into the core
+<a href="#Part II - The Internal Interface"><i>internal</i> interface</a>.
+The <i>external</i> interface handles everything necessary for a plugin to get hooked into the core
 VDR program and present itself to the user.
-The <i>inside</i> interface provides the plugin code access to VDR's internal data
+The <i>internal</i> interface provides the plugin code access to VDR's internal data
 structures and allows it to hook itself into specific areas to perform special actions.
 <p>
-<!--X1.1.12--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.12 are marked like this.
-<!--X1.1.12--></td></tr></table>
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.13 are marked like this.
 <!--X1.1.13--></td></tr></table>
-<!--X1.1.14--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.14--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.14 are marked like this.
 <!--X1.1.14--></td></tr></table>
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.15 are marked like this.
 <!--X1.1.15--></td></tr></table>
+<!--X1.1.17--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.17 are marked like this.
+<!--X1.1.17--></td></tr></table>
 
-<a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
+<hr>
+<h1>Table Of Contents</h1>
+<ul>
+<li><a href="#Part I - The External Interface">Part I - The External Interface</a>
+<ul>
+<li><a href="#Quick start">Quick start</a>
+<li><a href="#The name of the plugin">The name of the plugin</a>
+<li><a href="#The plugin directory structure">The plugin directory structure</a>
+<li><a href="#Initializing a new plugin directory">Initializing a new plugin directory</a>
+<li><a href="#The actual implementation">The actual implementation</a>
+<li><a href="#Construction and Destruction">Construction and Destruction</a>
+<li><a href="#Version number">Version number</a>
+<li><a href="#Description">Description</a>
+<li><a href="#Command line arguments">Command line arguments</a>
+<li><a href="#Command line help">Command line help</a>
+<li><a href="#Getting started">Getting started</a>
+<li><a href="#Main menu entry">Main menu entry</a>
+<li><a href="#User interaction">User interaction</a>
+<li><a href="#Housekeeping">Housekeeping</a>
+<li><a href="#Setup parameters">Setup parameters</a>
+<li><a href="#The Setup menu">The Setup menu</a>
+<li><a href="#Configuration files">Configuration files</a>
+<li><a href="#Internationalization">Internationalization</a>
+<li><a href="#Loading plugins into VDR">Loading plugins into VDR</a>
+<li><a href="#Building the distribution package">Building the distribution package</a>
+</ul>
+<li><a href="#Part II - The Internal Interface">Part II - The Internal Interface</a>
+<ul>
+<li><a href="#Status monitor">Status monitor</a>
+<li><a href="#Players">Players</a>
+<li><a href="#Receivers">Receivers</a>
+<li><a href="#The On Screen Display">The On Screen Display</a>
+<li><a href="#Devices">Devices</a>
+<li><a href="#Dolby Digital">Dolby Digital</a>
+<li><a href="#Remote Control">Remote Control</a>
+</ul>
+</ul>
+
+<a name="Part I - The External Interface"><hr><center><h1>Part I - The External Interface</h1></center>
 
-<hr><h2>Quick start</h2>
+<a name="Quick start"><hr><h2>Quick start</h2>
 
 <center><i><b>Can't wait, can't wait!</b></i></center><p>
 
@@ -58,7 +96,7 @@ So, for a quick demonstration of the plugin system, there is a sample plugin cal
 If you enjoyed this brief glimpse into VDR plugin handling, read through the rest of
 this document and eventually write your own VDR plugin.
 
-<hr><h2>The name of the plugin</h2>
+<a name="The name of the plugin"><hr><h2>The name of the plugin</h2>
 
 <center><i><b>Give me some I.D.!</b></i></center><p>
 
@@ -164,7 +202,7 @@ have other plans.
 Add further files and maybe subdirectories to your plugin source directory as
 necessary. Don't forget to adapt the <tt>Makefile</tt> appropriately.
 
-<hr><h2>The actual implementation</h2>
+<a name="The actual implementation"><hr><h2>The actual implementation</h2>
 
 <center><i><b>Use the source, Luke!</b></i></center><p>
 
@@ -231,7 +269,7 @@ and implements a file named <tt>i18n.h</tt>. To make sure it won't clash with VD
 <tt>i18n.h</tt> it uses the macro <tt>_I18N__H</tt> (one underline at the beginning
 and two replacing the dot).
 
-<hr><h2>Construction and Destruction</h2>
+<a name="Construction and Destruction"><hr><h2>Construction and Destruction</h2>
 
 <center><i><b>What goes up, must come down...</b></i></center><p>
 
@@ -256,7 +294,7 @@ take care that any threads the plugin may have created will be stopped.
 Of course, if your plugin doesn't define any member variables that need to be
 initialized (and deleted), you don't need to implement either of these functions.
 
-<hr><h2>Version number</h2>
+<a name="Version number"><hr><h2>Version number</h2>
 
 <center><i><b>Which incarnation is this?</b></i></center><p>
 
@@ -301,7 +339,7 @@ while those with <i>odd</i> release numbers (like <tt>1.1.x</tt>, <tt>1.3.x</tt>
 a version number are not limited to single digits, so a version number of <tt>1.2.15</tt>
 would be acceptable.
 
-<hr><h2>Description</h2>
+<a name="Description"><hr><h2>Description</h2>
 
 <center><i><b>What is it that you do?</b></i></center><p>
 
@@ -325,7 +363,7 @@ virtual const char *Description(void)
 Note the <tt>tr()</tt> around the <tt>DESCRIPTION</tt>, which allows the description
 to be <a href="#Internationalization">internationalized</a>.
 
-<hr><h2>Command line arguments</h2>
+<a name="Command line arguments"><hr><h2>Command line arguments</h2>
 
 <center><i><b>Taking orders</b></i></center><p>
 
@@ -379,7 +417,7 @@ correctly, or <i>false</i> in case of an error. The first plugin that returns
 <i>false</i> from a call to its <tt>ProcessArgs()</tt> function will cause VDR
 to exit.
 
-<hr><h2>Command line help</h2>
+<a name="Command line help"><hr><h2>Command line help</h2>
 
 <center><i><b>Tell me about it...</b></i></center><p>
 
@@ -434,7 +472,7 @@ write a proper error message to the log file. The first plugin that returns
 If the plugin doesn't implement any background functionality or internationalized
 texts, it doesn't need to implement this function.
 
-<hr><h2>Main menu entry</h2>
+<a name="Main menu entry"><hr><h2>Main menu entry</h2>
 
 <center><i><b>Today's special is...</b></i></center><p>
 
@@ -462,25 +500,34 @@ The menu entries of all plugins will be inserted into VDR's main menu right
 after the <i>Recordings</i> item, in the same sequence as they were given
 in the call to VDR.
 
-<hr><h2>User interaction</h2>
+<a name="User interaction"><hr><h2>User interaction</h2>
 
 <center><i><b>It's showtime!</b></i></center><p>
 
 If the user selects the main menu entry of a plugin, VDR calls the function
 
+<!--X1.1.17--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-virtual cOsdMenu *MainMenuAction(void);
+virtual cOsdObject *MainMenuAction(void);
 </pre></td></tr></table><p>
 
-which can do one of two things:
+which can do one of three things:
 <ul>
 <li>Return a pointer to a <tt>cOsdMenu</tt> object which will be displayed
     as a submenu of the main menu (just like the <i>Recordings</i> menu, for instance).
     That menu can then implement further functionality and, for instance, could
     eventually start a custom player to replay a file other than a VDR recording.
+<li>Return a pointer to a <tt>cOsdObject</tt> object which will be displayed
+    instead of the normal menu. The derived <tt>cOsdObject</tt> can open a
+    <a href="#The On Screen Display">raw OSD</a> from within its <tt>Show()</tt>
+    function (it should not attempt to do so from within its constructor, since
+    at that time the OSD is still in use by the main menu).
+    See the 'osddemo' example that comes with VDR for a demonstration of how this
+    is done.
 <li>Perform a specific action and return <tt>NULL</tt>. In that case the main menu
     will be closed after calling <tt>MainMenuAction()</tt>.
 </ul>
+<!--X1.1.17--></td></tr></table>
 <b>
 It is very important that a call to <tt>MainMenuAction()</tt> returns as soon
 as possible! As long as the program stays inside this function, no other user
@@ -488,7 +535,7 @@ interaction is possible. If a specific action takes longer than a few seconds,
 the plugin should launch a separate thread to do this.
 </b>
 
-<hr><h2>Housekeeping</h2>
+<a name="Housekeeping"><hr><h2>Housekeeping</h2>
 
 <center><i><b>Chores, chores...</b></i></center><p>
 
@@ -644,7 +691,7 @@ You can first assign the temporary values to the global variables and then do th
 your setup parameters and use that one to copy all parameters with one single statement
 (like VDR does with its cSetup class).
 
-<hr><h2>Configuration files</h2>
+<a name="Configuration files"><hr><h2>Configuration files</h2>
 
 <center><i><b>I want my own stuff!</b></i></center><p>
 
@@ -832,9 +879,9 @@ vdr-hello-0.0.1.tgz
 in your source directory, where <tt>hello</tt> will be replaced with your actual
 plugin's name, and <tt>0.0.1</tt> will be your plugin's current version number.
 
-<a name="Part II - The Inside Interface"><hr><center><h1>Part II - The Inside Interface</h1></center>
+<a name="Part II - The Internal Interface"><hr><center><h1>Part II - The Internal Interface</h1></center>
 
-<hr><h2>Status monitor</h2>
+<a name="Status monitor"><hr><h2>Status monitor</h2>
 
 <center><i><b>A piece of the action</b></i></center><p>
 
@@ -907,7 +954,7 @@ See the file <tt>status.h</tt> for detailed information on which status monitor
 member functions are available in <tt>cStatus</tt>. You only need to implement
 the functions you actually want to use.
 
-<hr><h2>Players</h2>
+<a name="Players"><hr><h2>Players</h2>
 
 <center><i><b>Play it again, Sam!</b></i></center><p>
 
@@ -964,7 +1011,7 @@ bool DevicePoll(cPoller &amp;Poller, int TimeoutMs = 0);
 </pre></td></tr></table><p>
 
 to determine whether the device is ready for further data.
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p>
 If the player can provide more than a single audio track, it can implement the
 following functions to make them available:
@@ -977,7 +1024,7 @@ virtual void SetAudioTrack(int Index);
 
 <!--X1.1.13--></td></tr></table>
 <p>
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 If there is an additional audio track that has to be replayed with external hardware,
 the player shall call its member function
 
@@ -1085,7 +1132,7 @@ enjoy additional players, since they will be able to control them with actions
 that they already know. If you absolutely want to do things differently, just go
 ahead - it's your show...
 
-<hr><h2>Receivers</h2>
+<a name="Receivers"><hr><h2>Receivers</h2>
 
 <center><i><b>Tapping into the stream...</b></i></center><p>
 
@@ -1139,7 +1186,7 @@ cDevice::PrimaryDevice()-&gt;AttachReceiver(Receiver);
 If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
 and will automatically detach itself from the <tt>cDevice</tt>.
 
-<hr><h2>The On Screen Display</h2>
+<a name="The On Screen Display"><hr><h2>The On Screen Display</h2>
 
 <center><i><b>Express yourself</b></i></center><p>
 
@@ -1169,7 +1216,7 @@ to define an actual OSD drawing area (see VDR/osdbase.h for the declarations
 of these functions, and VDR/osd.c to see how VDR opens the OSD and sets up
 its windows and color depths).
 
-<hr><h2>Devices</h2>
+<a name="Devices"><hr><h2>Devices</h2>
 
 <center><i><b>Expanding the possibilities</b></i></center><p>
 
@@ -1205,9 +1252,7 @@ If the new device can receive, it most likely needs to provide a way of
 selecting which channel it shall tune to:
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
-<!--X1.1.12--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 virtual bool ProvidesSource(int Source) const;
-<!--X1.1.12--></td></tr></table>
 virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1, bool *NeedsDetachReceivers = NULL);
 virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 </pre></td></tr></table><p>
@@ -1215,7 +1260,7 @@ virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
 These functions will be called with the desired source or channel and shall return whether
 this device can provide the requested source or channel and whether tuning to it was successful,
 repectively.
-<!--X1.1.13--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.13--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p>
 <b>Audio selection</b>
 <p>
@@ -1262,7 +1307,7 @@ The functions to implement replaying capabilites are
 
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool HasDecoder(void) const;
-<!--X1.1.14--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.14--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 virtual bool CanReplay(void) const;
 <!--X1.1.14--></td></tr></table>
 virtual bool SetPlayMode(ePlayMode PlayMode);
@@ -1324,8 +1369,8 @@ shut down (delete) all devices when the program terminates. It is therefore
 important that the devices are created on the heap, using the <tt>new</tt>
 operator!
 
-<!--X1.1.15--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
-<hr><h2>Dolby Digital</h2>
+<!--X1.1.15--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<a name="Dolby Digital"><hr><h2>Dolby Digital</h2>
 
 <center><i><b>"The stereo effect may only be experienced if stereo equipment is used!"</b></i></center><p>
 
@@ -1369,7 +1414,7 @@ The <tt>Mute()</tt> and <tt>Clear()</tt> functions will be called whenever the a
 be muted, or any buffered data shall be cleared, respectively.
 <!--X1.1.15--></td></tr></table>
 
-<hr><h2>Remote Control</h2>
+<a name="Remote Control"><hr><h2>Remote Control</h2>
 
 <center><i><b>The joy of zapping!</b></i></center><p>
 
diff --git a/PLUGINS/SRC/hello/HISTORY b/PLUGINS/SRC/hello/HISTORY
index 8639e05..53b620e 100644
--- a/PLUGINS/SRC/hello/HISTORY
+++ b/PLUGINS/SRC/hello/HISTORY
@@ -37,3 +37,7 @@ VDR Plugin 'hello' Revision History
   The NEWSTRUCT compile time switch is now obsolete. The required driver is now
   the CVS HEAD version dated 2002-11-01 or later.
 - Introduced Make.config.
+
+2002-11-23: Version 0.0.9
+
+- Changed return type of MainMenuAction().
diff --git a/PLUGINS/SRC/hello/hello.c b/PLUGINS/SRC/hello/hello.c
index 6583285..b726578 100644
--- a/PLUGINS/SRC/hello/hello.c
+++ b/PLUGINS/SRC/hello/hello.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: hello.c 1.9 2002/11/01 10:16:53 kls Exp $
+ * $Id: hello.c 1.10 2002/11/23 15:07:28 kls Exp $
  */
 
 #include <getopt.h>
@@ -12,7 +12,7 @@
 #include <vdr/plugin.h>
 #include "i18n.h"
 
-static const char *VERSION        = "0.0.8";
+static const char *VERSION        = "0.0.9";
 static const char *DESCRIPTION    = "A friendly greeting";
 static const char *MAINMENUENTRY  = "Hello";
 
@@ -31,7 +31,7 @@ public:
   virtual bool Start(void);
   virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); }
-  virtual cOsdMenu *MainMenuAction(void);
+  virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
   };
@@ -124,7 +124,7 @@ void cPluginHello::Housekeeping(void)
   // Perform any cleanup or other regular tasks.
 }
 
-cOsdMenu *cPluginHello::MainMenuAction(void)
+cOsdObject *cPluginHello::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
   Interface->Confirm(UseAlternateGreeting ? tr("Howdy folks!") : tr("Hello world!"), GreetingTime);
diff --git a/PLUGINS/SRC/osddemo/COPYING b/PLUGINS/SRC/osddemo/COPYING
new file mode 100644
index 0000000..5b6e7c6
--- /dev/null
+++ b/PLUGINS/SRC/osddemo/COPYING
@@ -0,0 +1,340 @@
+		    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/PLUGINS/SRC/osddemo/HISTORY b/PLUGINS/SRC/osddemo/HISTORY
new file mode 100644
index 0000000..8c9d3e1
--- /dev/null
+++ b/PLUGINS/SRC/osddemo/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'osddemo' Revision History
+-------------------------------------
+
+2002-11-23: Version 0.0.1
+
+- Initial revision.
diff --git a/PLUGINS/SRC/osddemo/Makefile b/PLUGINS/SRC/osddemo/Makefile
new file mode 100644
index 0000000..ac56d1f
--- /dev/null
+++ b/PLUGINS/SRC/osddemo/Makefile
@@ -0,0 +1,82 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.1 2002/11/23 14:56:44 kls Exp $
+
+# 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.
+#
+PLUGIN = osddemo
+
+### 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 = -O2 -Wall -Woverloaded-virtual
+
+### The directory environment:
+
+DVBDIR = ../../../../DVB
+VDRDIR = ../../..
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
+### The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+# Dependencies:
+
+MAKEDEP = g++ -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Targets:
+
+all: libvdr-$(PLUGIN).so
+
+libvdr-$(PLUGIN).so: $(OBJS)
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+
+dist: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/PLUGINS/SRC/osddemo/README b/PLUGINS/SRC/osddemo/README
new file mode 100644
index 0000000..cc150ab
--- /dev/null
+++ b/PLUGINS/SRC/osddemo/README
@@ -0,0 +1,18 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  Klaus Schmidinger <kls@cadsoft.de>
+
+Project's homepage:          http://www.cadsoft.de/vdr
+
+Latest version available at: http://www.cadsoft.de/vdr
+
+See the file COPYING for license information.
+
+Description:
+
+Demonstration of how a plugin can have its very own OSD setup.
+
+It's a very primitive game that opens a small window in which the
+user can draw lines with the Up, Down, Left and Right buttons.
+The color buttons are used to switch color.
+Press Ok to close the window.
diff --git a/PLUGINS/SRC/osddemo/osddemo.c b/PLUGINS/SRC/osddemo/osddemo.c
new file mode 100644
index 0000000..f806178
--- /dev/null
+++ b/PLUGINS/SRC/osddemo/osddemo.c
@@ -0,0 +1,153 @@
+/*
+ * osddemo.c: A plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: osddemo.c 1.1 2002/11/24 10:32:59 kls Exp $
+ */
+
+#include <vdr/plugin.h>
+
+static const char *VERSION        = "0.0.1";
+static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
+static const char *MAINMENUENTRY  = "Osd Demo";
+
+// --- cLineGame -------------------------------------------------------------
+
+class cLineGame : public cOsdObject {
+private:
+  cOsdBase *osd;
+  int x;
+  int y;
+  eDvbColor color;
+public:
+  cLineGame(void);
+  ~cLineGame();
+  virtual void Show(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+
+cLineGame::cLineGame(void)
+{
+  osd = NULL;
+  x = y = 50;
+  color = clrRed;
+}
+
+cLineGame::~cLineGame()
+{
+  delete osd;
+}
+
+void cLineGame::Show(void)
+{
+  osd = cOsd::OpenRaw(100, 50);
+  if (osd) {
+     osd->Create(0, 0, 100, 200, 4);
+     osd->AddColor(clrBackground);
+     osd->AddColor(clrRed);
+     osd->AddColor(clrGreen);
+     osd->AddColor(clrYellow);
+     osd->AddColor(clrBlue);
+     osd->Clear();
+     osd->Flush();
+     }
+}
+
+eOSState cLineGame::ProcessKey(eKeys Key)
+{
+  eOSState state = cOsdObject::ProcessKey(Key);
+  if (state == osUnknown) {
+     switch (Key & ~k_Repeat) {
+       case kUp:     if (y > 0)   y--; break;
+       case kDown:   if (y < 196) y++; break;
+       case kLeft:   if (x > 0)   x--; break;
+       case kRight:  if (x < 96)  x++; break;
+       case kRed:    color = clrRed; break;
+       case kGreen:  color = clrGreen; break;
+       case kYellow: color = clrYellow; break;
+       case kBlue:   color = clrBlue; break;
+       case kOk:     return osEnd;
+       default: return state;
+       }
+     osd->Fill(x, y, x + 3, y + 3, color);
+     osd->Flush();
+     state = osContinue;
+     }
+  return state;
+}
+
+// --- cPluginOsddemo --------------------------------------------------------
+
+class cPluginOsddemo : public cPlugin {
+private:
+  // Add any member variables or functions you may need here.
+public:
+  cPluginOsddemo(void);
+  virtual ~cPluginOsddemo();
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual bool Start(void);
+  virtual void Housekeeping(void);
+  virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
+  virtual cOsdObject *MainMenuAction(void);
+  virtual cMenuSetupPage *SetupMenu(void);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  };
+
+cPluginOsddemo::cPluginOsddemo(void)
+{
+  // Initialize any member variables here.
+  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
+  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+}
+
+cPluginOsddemo::~cPluginOsddemo()
+{
+  // Clean up after yourself!
+}
+
+const char *cPluginOsddemo::CommandLineHelp(void)
+{
+  // Return a string that describes all known command line options.
+  return NULL;
+}
+
+bool cPluginOsddemo::ProcessArgs(int argc, char *argv[])
+{
+  // Implement command line argument processing here if applicable.
+  return true;
+}
+
+bool cPluginOsddemo::Start(void)
+{
+  // Start any background activities the plugin shall perform.
+  return true;
+}
+
+void cPluginOsddemo::Housekeeping(void)
+{
+  // Perform any cleanup or other regular tasks.
+}
+
+cOsdObject *cPluginOsddemo::MainMenuAction(void)
+{
+  // Perform the action when selected from the main VDR menu.
+  return new cLineGame;
+}
+
+cMenuSetupPage *cPluginOsddemo::SetupMenu(void)
+{
+  // Return a setup menu in case the plugin supports one.
+  return NULL;
+}
+
+bool cPluginOsddemo::SetupParse(const char *Name, const char *Value)
+{
+  // Parse your own setup parameters and store their values.
+  return false;
+}
+
+VDRPLUGINCREATOR(cPluginOsddemo); // Don't touch this!
diff --git a/PLUGINS/SRC/status/HISTORY b/PLUGINS/SRC/status/HISTORY
index 45d42fb..7d28291 100644
--- a/PLUGINS/SRC/status/HISTORY
+++ b/PLUGINS/SRC/status/HISTORY
@@ -23,3 +23,7 @@ VDR Plugin 'status' Revision History
   The NEWSTRUCT compile time switch is now obsolete. The required driver is now
   the CVS HEAD version dated 2002-11-01 or later.
 - Introduced Make.config.
+
+2002-11-23: Version 0.0.6
+
+- Changed return type of MainMenuAction().
diff --git a/PLUGINS/SRC/status/status.c b/PLUGINS/SRC/status/status.c
index 12e64b7..f5ab5b9 100644
--- a/PLUGINS/SRC/status/status.c
+++ b/PLUGINS/SRC/status/status.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: status.c 1.5 2002/11/01 10:16:59 kls Exp $
+ * $Id: status.c 1.6 2002/11/23 15:07:40 kls Exp $
  */
 
 #include <vdr/plugin.h>
 #include <vdr/status.h>
 
-static const char *VERSION        = "0.0.5";
+static const char *VERSION        = "0.0.6";
 static const char *DESCRIPTION    = "Status monitor test";
 static const char *MAINMENUENTRY  = NULL;
 
@@ -115,7 +115,7 @@ public:
   virtual bool Start(void);
   virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
-  virtual cOsdMenu *MainMenuAction(void);
+  virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
   };
@@ -158,7 +158,7 @@ void cPluginStatus::Housekeeping(void)
   // Perform any cleanup or other regular tasks.
 }
 
-cOsdMenu *cPluginStatus::MainMenuAction(void)
+cOsdObject *cPluginStatus::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
   return NULL;
diff --git a/README b/README
index 6b6e33e..809034f 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ Video Disk Recorder ('VDR')
 These files contain the source code of the "Video Disk Recorder",
 which is based on the DVB driver of the LinuxTV project (http://linuxtv.org).
 For details about the "Video Disk Recorder" project please
-refer to http://www.cadsoft.de/people/kls/vdr.
+refer to http://www.cadsoft.de/vdr.
 
 There is also a remote control unit described on those
 Web pages, which can be used within this program.
diff --git a/ca.conf b/ca.conf
index ee2c9c5..61f1189 100644
--- a/ca.conf
+++ b/ca.conf
@@ -13,11 +13,83 @@
 
 101    Premiere World
 102    ORF
+103    DIGI-Kabel
 
 # Cryptoworks
 
 201    GOD-DIGITAL
 
+# Videoguard
+
+301    Sky Digital
+
+# Viaccess 1
+
+401    SRG Swiss
+402    NTV Plus
+403    Viasat
+404    Parabole Reunion
+
+# Viaccess 2
+
+501    Alpha Digital Greece
+
+# Cryptoworks
+
+601    UPC Direct
+602    DigiTurk
+
+# Mediaguard
+
+701    CanalSatellite Reunion
+
+# Mediaguard 2
+
+801    Orbit Network
+
+# Nagravision
+
+901    PolSat Cyfrowy
+
+# Irdeto 2
+
+1001   ADD
+1002   Nova Greece
+1003   Multichoice Africa
+
+# Conax
+
+1101 Canal Digital Scandinavia
+
+# Mediaguard, Viaccess 1, Viaccess 2
+
+10001  AB Sat France
+10002  TPS France
+
+# Videoguard, Mediaguard 2, Irdeto 1
+
+11001  Stream TV Italy
+
+# Videoguard, Mediaguard 2, Cryptoworks
+
+12001  Tele+ Digitale
+
+# Mediaguard 1, Irdeto 1
+
+13001  Canal Digitaal Satelliet NL
+
+# Mediaguard 1, Mediaguard 2, Viaccess 1
+
+14001  Canal Satellite France
+
+# Mediaguard 1, Mediaguard 2, Viaccess 1, Cryptoworks
+
+15001  Canal Satelite Digital Espana
+
+# Mediaguard 2, Cryptoworks
+
+16001  Cyfra+ Polska
+
 # Special values to "hard code" a channel to a specific DVB card:
 
 1      DVB 1
diff --git a/channels.c b/channels.c
index cb05e2c..6afa7b9 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.8 2002/11/10 13:01:55 kls Exp $
+ * $Id: channels.c 1.9 2002/11/24 14:28:48 kls Exp $
  */
 
 #include "channels.h"
@@ -120,6 +120,39 @@ int MapToDriver(int Value, const tChannelParameterMap *Map)
   return -1;
 }
 
+// -- tChannelID -------------------------------------------------------------
+
+const tChannelID tChannelID::InvalidID;
+
+bool tChannelID::operator== (const tChannelID &arg) const
+{
+  return source == arg.source && nid == arg.nid && tid == arg.tid && sid == arg.sid && rid == arg.rid;
+}
+
+tChannelID tChannelID::FromString(const char *s)
+{
+  char *sourcebuf = NULL;
+  int nid;
+  int tid;
+  int sid;
+  int rid = 0;
+  int fields = sscanf(s, "%a[^-]-%d-%d-%d-%d", &sourcebuf, &nid, &tid, &sid, &rid);
+  if (fields == 4 || fields == 5) {
+     int source = cSource::FromString(sourcebuf);
+     free(sourcebuf);
+     if (source >= 0)
+        return tChannelID(source, nid, tid, sid, rid);
+     }
+  return tChannelID::InvalidID;
+}
+
+const char *tChannelID::ToString(void)
+{
+  static char buffer[256];
+  snprintf(buffer, sizeof(buffer), rid ? "%s-%d-%d-%d-%d" : "%s-%d-%d-%d", cSource::ToString(source), nid, tid, sid, rid);
+  return buffer;
+}
+
 // -- cChannel ---------------------------------------------------------------
 
 char *cChannel::buffer = NULL;
@@ -137,7 +170,10 @@ cChannel::cChannel(void)
   dpid2        = 0;
   tpid         = 32;
   ca           = 0;
-  sid          = 0;
+  nid          = 0;
+  tid          = 0;
+  sid          = 888;
+  rid          = 0;
   groupSep     = false;
   polarization = 'v';
   inversion    = INVERSION_AUTO;
@@ -158,36 +194,14 @@ cChannel& cChannel::operator= (const cChannel &Channel)
 
 static int MHz(int frequency)
 {
-  while (frequency > 20000) {
+  while (frequency > 20000)
         frequency /= 1000;
-        }
   return frequency;
 }
 
-uint64 cChannel::GetChannelID(void) const
+tChannelID cChannel::GetChannelID(void) const
 {
-  return (uint64(source) << 48) | (uint64(0) << 32) | ((MHz(frequency)) << 16) | sid;
-}
-
-const char *cChannel::GetChannelIDStr(void) const
-{
-  static char buffer[256];
-  snprintf(buffer, sizeof(buffer), "%s-%d-%d-%d", cSource::ToString(source), 0, MHz(frequency), sid);
-  return buffer;
-}
-
-uint64 cChannel::StringToChannelID(const char *s)
-{
-  char *sourcebuf = NULL;
-  int reserved;
-  int frequency;
-  int sid;
-  if (4 == sscanf(s, "%a[^-]-%d-%d-%d", &sourcebuf, &reserved, &frequency, &sid)) {
-     int source = cSource::FromString(sourcebuf);
-     if (source >= 0)
-        return (uint64(source) << 48) | (uint64(reserved) << 32) | (frequency << 16) | sid;
-     }
-  return 0;
+  return tChannelID(source, nid, nid ? tid : MHz(frequency), sid, rid);
 }
 
 static int PrintParameter(char *p, char Name, int Value)
@@ -281,7 +295,7 @@ const char *cChannel::ToText(cChannel *Channel)
      if (Channel->dpid2)
         q += snprintf(q, sizeof(apidbuf) - (q - apidbuf), ",%d", Channel->dpid2);
      *q = 0;
-     asprintf(&buffer, "%s:%d:%s:%s:%d:%d:%s:%d:%d:%d\n", s, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, Channel->vpid, apidbuf, Channel->tpid, Channel->ca, Channel->sid);
+     asprintf(&buffer, "%s:%d:%s:%s:%d:%d:%s:%d:%d:%d:%d:%d:%d\n", s, Channel->frequency, Channel->ParametersToString(), cSource::ToString(Channel->source), Channel->srate, Channel->vpid, apidbuf, Channel->tpid, Channel->ca, Channel->sid, Channel->nid, Channel->tid, Channel->rid);
      }
   return buffer;
 }
@@ -312,7 +326,7 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
      char *sourcebuf = NULL;
      char *parambuf = NULL;
      char *apidbuf = NULL;
-     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%d :%a[^:]:%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpid, &apidbuf, &tpid, &ca, &sid);
+     int fields = sscanf(s, "%a[^:]:%d :%a[^:]:%a[^:] :%d :%d :%a[^:]:%d :%d :%d :%d :%d :%d ", &namebuf, &frequency, &parambuf, &sourcebuf, &srate, &vpid, &apidbuf, &tpid, &ca, &sid, &nid, &tid, &rid);
      if (fields >= 9) {
         if (fields == 9) {
            // allow reading of old format
@@ -430,18 +444,25 @@ cChannel *cChannels::GetByServiceID(int Source, unsigned short ServiceID)
   return NULL;
 }
 
-cChannel *cChannels::GetByChannelID(uint64 ChannelID)
+cChannel *cChannels::GetByChannelID(tChannelID ChannelID, bool TryWithoutRid)
 {
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
       if (!channel->GroupSep() && channel->GetChannelID() == ChannelID)
          return channel;
       }
+  if (TryWithoutRid) {
+     ChannelID.ClrRid();
+     for (cChannel *channel = First(); channel; channel = Next(channel)) {
+         if (!channel->GroupSep() && channel->GetChannelID().ClrRid() == ChannelID)
+            return channel;
+         }
+     }
   return NULL;
 }
 
 bool cChannels::HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel)
 {
-  uint64 NewChannelID = NewChannel->GetChannelID();
+  tChannelID NewChannelID = NewChannel->GetChannelID();
   for (cChannel *channel = First(); channel; channel = Next(channel)) {
       if (!channel->GroupSep() && channel != OldChannel && channel->GetChannelID() == NewChannelID)
          return false;
diff --git a/channels.conf b/channels.conf
index f440ca7..ab6b4b8 100644
--- a/channels.conf
+++ b/channels.conf
@@ -1,149 +1,149 @@
-RTL:12188:h:S19.2E:27500:163:104:105:0:12003
-Sat.1:12480:v:S19.2E:27500:1791:1792:34:0:46
-Pro-7:12480:v:S19.2E:27500:255:256;257:32:0:898
-RTL2:12188:h:S19.2E:27500:166:128:68:0:12020
-ARD:11837:h:S19.2E:27500:101:102:104:0:28106
-BR3:11837:h:S19.2E:27500:201:202:204:0:28107
-Hessen-3:11837:h:S19.2E:27500:301:302:304:0:28108
-N3:12110:h:S19.2E:27500:2401:2402:2404:0:28224
-SR3:11837:h:S19.2E:27500:501:502:504:0:28110
-WDR:11837:h:S19.2E:27500:601:602:604:0:28111
-BR-alpha:11837:h:S19.2E:27500:701:702:704:0:28112
-SWR BW:11837:h:S19.2E:27500:801:802:804:0:28113
-Phoenix:11837:h:S19.2E:27500:901:902:904:0:28114
-ZDF:11954:h:S19.2E:27500:110:120:130:0:28006
-3sat:11954:h:S19.2E:27500:210:220:230:0:28007
-KiKa:11954:h:S19.2E:27500:310:320:330:0:28008
-arte:11836:h:S19.2E:27500:401:402:404:0:28109
-ORF1:12692:h:S19.2E:22000:160:161:165:102:13001
-ORF2:12692:h:S19.2E:22000:500:501:505:102:13002
-ZDF.info:11954:h:S19.2E:27500:610:620:0:0:28011
-CNN:12168:v:S19.2E:27500:165:100:0:0:28512
-Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040
-VOX:12188:h:S19.2E:27500:167:136:71:0:12060
-DW TV:10788:v:S19.2E:22000:305:306:0:0:8905
-Kabel 1:12480:v:S19.2E:27500:511:512:33:0:899
-Neun Live:12480:v:S19.2E:27500:767:768:35:0:897
-DSF:12480:v:S19.2E:27500:1023:1024:0:0:900
-HOT:12480:v:S19.2E:27500:1279:1280:0:0:40
-Bloomberg TV Germany:12552:v:S19.2E:22000:162:99:0:0:12160
-Bloomberg TV France:11817:v:S19.2E:27500:163:92:0:0:8004
-Bloomberg TV Spain:12168:v:S19.2E:27500:167:112:0:0:12721
-Sky News:12552:v:S19.2E:22000:305:306:0:0:3995
-Fox Kids Netherlands:12574:h:S19.2E:22000:163:92:0:0:5020
-Alice:12610:v:S19.2E:22000:162:96:0:0:12200
-n-tv:12670:v:S19.2E:22000:162:96:55:0:12730
-Grand Tourisme:12670:v:S19.2E:22000:289:290:0:0:17300
-TW1:12692:h:S19.2E:22000:166:167:0:0:13013
-Eurosport:11954:h:S19.2E:27500:410:420:0:0:28009
-EinsExtra:12110:h:S19.2E:27500:101:102:0:0:28201
-EinsFestival:12110:h:S19.2E:27500:201:202:0:0:28202
-EinsMuXx:12110:h:S19.2E:27500:301:302:0:0:28203
-ZDF Theaterkanal:11954:h:S19.2E:27500:1110:1120:0:0:28016
-ZDF.doku:11954:h:S19.2E:27500:660:670:0:0:28014
-MDR:12110:h:S19.2E:27500:401:402:404:0:28204
-ORB:12110:h:S19.2E:27500:501:502:504:0:28205
-B1:12110:h:S19.2E:27500:601:602:604:0:28206
+RTL:12188:h:S19.2E:27500:163:104:105:0:12003:0:0:0
+Sat.1:12480:v:S19.2E:27500:1791:1792:34:0:46:0:0:0
+Pro-7:12480:v:S19.2E:27500:255:256;257:32:0:898:0:0:0
+RTL2:12188:h:S19.2E:27500:166:128:68:0:12020:0:0:0
+ARD:11837:h:S19.2E:27500:101:102:104:0:28106:0:0:0
+BR3:11837:h:S19.2E:27500:201:202:204:0:28107:0:0:0
+Hessen-3:11837:h:S19.2E:27500:301:302:304:0:28108:0:0:0
+N3:12110:h:S19.2E:27500:2401:2402:2404:0:28224:0:0:0
+SR3:11837:h:S19.2E:27500:501:502:504:0:28110:0:0:0
+WDR:11837:h:S19.2E:27500:601:602:604:0:28111:0:0:0
+BR-alpha:11837:h:S19.2E:27500:701:702:704:0:28112:0:0:0
+SWR BW:11837:h:S19.2E:27500:801:802:804:0:28113:0:0:0
+Phoenix:11837:h:S19.2E:27500:901:902:904:0:28114:0:0:0
+ZDF:11954:h:S19.2E:27500:110:120:130:0:28006:0:0:0
+3sat:11954:h:S19.2E:27500:210:220:230:0:28007:0:0:0
+KiKa:11954:h:S19.2E:27500:310:320:330:0:28008:0:0:0
+arte:11836:h:S19.2E:27500:401:402:404:0:28109:0:0:0
+ORF1:12692:h:S19.2E:22000:160:161:165:102:13001:0:0:0
+ORF2:12692:h:S19.2E:22000:500:501:505:102:13002:0:0:0
+ZDF.info:11954:h:S19.2E:27500:610:620:0:0:28011:0:0:0
+CNN:12168:v:S19.2E:27500:165:100:0:0:28512:0:0:0
+Super RTL:12188:h:S19.2E:27500:165:120:65:0:12040:0:0:0
+VOX:12188:h:S19.2E:27500:167:136:71:0:12060:0:0:0
+DW TV:10788:v:S19.2E:22000:305:306:0:0:8905:0:0:0
+Kabel 1:12480:v:S19.2E:27500:511:512:33:0:899:0:0:0
+Neun Live:12480:v:S19.2E:27500:767:768:35:0:897:0:0:0
+DSF:12480:v:S19.2E:27500:1023:1024:0:0:900:0:0:0
+HOT:12480:v:S19.2E:27500:1279:1280:0:0:40:0:0:0
+Bloomberg TV Germany:12552:v:S19.2E:22000:162:99:0:0:12160:0:0:0
+Bloomberg TV France:11817:v:S19.2E:27500:163:92:0:0:8004:0:0:0
+Bloomberg TV Spain:12168:v:S19.2E:27500:167:112:0:0:12721:0:0:0
+Sky News:12552:v:S19.2E:22000:305:306:0:0:3995:0:0:0
+Fox Kids Netherlands:12574:h:S19.2E:22000:163:92:0:0:5020:0:0:0
+Alice:12610:v:S19.2E:22000:162:96:0:0:12200:0:0:0
+n-tv:12670:v:S19.2E:22000:162:96:55:0:12730:0:0:0
+Grand Tourisme:12670:v:S19.2E:22000:289:290:0:0:17300:0:0:0
+TW1:12692:h:S19.2E:22000:166:167:0:0:13013:0:0:0
+Eurosport:11954:h:S19.2E:27500:410:420:0:0:28009:0:0:0
+EinsExtra:12110:h:S19.2E:27500:101:102:0:0:28201:0:0:0
+EinsFestival:12110:h:S19.2E:27500:201:202:0:0:28202:0:0:0
+EinsMuXx:12110:h:S19.2E:27500:301:302:0:0:28203:0:0:0
+ZDF Theaterkanal:11954:h:S19.2E:27500:1110:1120:0:0:28016:0:0:0
+ZDF.doku:11954:h:S19.2E:27500:660:670:0:0:28014:0:0:0
+MDR:12110:h:S19.2E:27500:401:402:404:0:28204:0:0:0
+ORB:12110:h:S19.2E:27500:501:502:504:0:28205:0:0:0
+B1:12110:h:S19.2E:27500:601:602:604:0:28206:0:0:0
 :Premiere World
-Premiere Start:11797:h:S19.2E:27500:255:256:0:101:8
-Premiere 1:11797:h:S19.2E:27500:511:512,513;515:0:101:10
-Premiere 2:11797:h:S19.2E:27500:1791:1792,1793;1795:0:101:11
-Premiere 3:11797:h:S19.2E:27500:2303:2304:0:101:43
-Premiere 4:11797:h:S19.2E:27500:767:768:0:101:9
-Premiere 5:11797:h:S19.2E:27500:1279:1280:0:101:29
-Premiere 6:11797:h:S19.2E:27500:1535:1536:0:101:41
-Premiere 7:11797:h:S19.2E:27500:1023:1024:0:101:20
-13th Street:11758:h:S19.2E:27500:2303:2304:0:101:42
-Studio Universal:12090:v:S19.2E:27500:255:256:0:101:36
-Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16
-Disney Channel:12090:v:S19.2E:27500:767:768:0:101:34
-Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516
-Discovery Channel:12031:h:S19.2E:27500:1791:1792:0:101:14
-Planet:12090:v:S19.2E:27500:1279:1280:0:101:13
-Fox Kids:11758:h:S19.2E:27500:1279:1280:0:101:28
-Junior:11758:h:S19.2E:27500:255:256:0:101:19
-K-Toon:11758:h:S19.2E:27500:511:512:0:101:12
-Krimi&Co:12031:h:S19.2E:27500:1535:1536:0:101:23
-Goldstar TV:11758:h:S19.2E:27500:3839:3840:0:101:518
-Classica:11758:h:S19.2E:27500:767:768:0:101:15
-Sonnenklar TV:12090:v:S19.2E:27500:1023:1024:0:0:32
+Premiere Start:11797:h:S19.2E:27500:255:256:0:101:8:0:0:0
+Premiere 1:11797:h:S19.2E:27500:511:512,513;515:0:101:10:0:0:0
+Premiere 2:11797:h:S19.2E:27500:1791:1792,1793;1795:0:101:11:0:0:0
+Premiere 3:11797:h:S19.2E:27500:2303:2304:0:101:43:0:0:0
+Premiere 4:11797:h:S19.2E:27500:767:768:0:101:9:0:0:0
+Premiere 5:11797:h:S19.2E:27500:1279:1280:0:101:29:0:0:0
+Premiere 6:11797:h:S19.2E:27500:1535:1536:0:101:41:0:0:0
+Premiere 7:11797:h:S19.2E:27500:1023:1024:0:101:20:0:0:0
+13th Street:11758:h:S19.2E:27500:2303:2304:0:101:42:0:0:0
+Studio Universal:12090:v:S19.2E:27500:255:256:0:101:36:0:0:0
+Premiere Serie:12031:h:S19.2E:27500:1023:1024:0:101:16:0:0:0
+Disney Channel:12090:v:S19.2E:27500:767:768:0:101:34:0:0:0
+Premiere Nostalgie:12031:h:S19.2E:27500:2559:2560:0:101:516:0:0:0
+Discovery Channel:12031:h:S19.2E:27500:1791:1792:0:101:14:0:0:0
+Planet:12090:v:S19.2E:27500:1279:1280:0:101:13:0:0:0
+Fox Kids:11758:h:S19.2E:27500:1279:1280:0:101:28:0:0:0
+Junior:11758:h:S19.2E:27500:255:256:0:101:19:0:0:0
+K-Toon:11758:h:S19.2E:27500:511:512:0:101:12:0:0:0
+Krimi&Co:12031:h:S19.2E:27500:1535:1536:0:101:23:0:0:0
+Goldstar TV:11758:h:S19.2E:27500:3839:3840:0:101:518:0:0:0
+Classica:11758:h:S19.2E:27500:767:768:0:101:15:0:0:0
+Sonnenklar TV:12090:v:S19.2E:27500:1023:1024:0:0:32:0:0:0
 :Premiere Direkt
-Premiere Direkt 1A:12031:h:S19.2E:27500:511:512,513;515:0:101:177
-Premiere Direkt 1B:11719:h:S19.2E:27500:1023:1024,1025;1027:0:101:182
-Premiere Direkt 2A:12031:h:S19.2E:27500:255:256;259:0:101:176
-Premiere Direkt 2B:11719:h:S19.2E:27500:767:768;769:0:101:181
-Premiere Direkt 3A:11719:h:S19.2E:27500:511:512;515:0:101:180
-Premiere Direkt 3B:11719:h:S19.2E:27500:1279:1280;1283:0:101:183
-Premiere Direkt 4A:12031:h:S19.2E:27500:2815:2816:0:101:18
-:#Premiere Direkt 4B:12070:h:S19.2E:27500:1535:1536:0:101:216
+Premiere Direkt 1A:12031:h:S19.2E:27500:511:512,513;515:0:101:177:0:0:0
+Premiere Direkt 1B:11719:h:S19.2E:27500:1023:1024,1025;1027:0:101:182:0:0:0
+Premiere Direkt 2A:12031:h:S19.2E:27500:255:256;259:0:101:176:0:0:0
+Premiere Direkt 2B:11719:h:S19.2E:27500:767:768;769:0:101:181:0:0:0
+Premiere Direkt 3A:11719:h:S19.2E:27500:511:512;515:0:101:180:0:0:0
+Premiere Direkt 3B:11719:h:S19.2E:27500:1279:1280;1283:0:101:183:0:0:0
+Premiere Direkt 4A:12031:h:S19.2E:27500:2815:2816:0:101:18:0:0:0
+:#Premiere Direkt 4B:12070:h:S19.2E:27500:1535:1536:0:101:216:0:0:0
 :PW Erotic
-Beate-Uhse.TV:11758:h:S19.2E:27500:1023:1024:0:101:21
-Premiere Erotik 1:12031:h:S19.2E:27500:1279:1280:0:101:513
-Premiere Erotik 2:11719:h:S19.2E:27500:1535:1536:0:101:778
-Premiere Erotik 3:11719:h:S19.2E:27500:1791:1792:0:101:779
-Premiere Erotik 4:11719:h:S19.2E:27500:3583:3584:0:101:780
+Beate-Uhse.TV:11758:h:S19.2E:27500:1023:1024:0:101:21:0:0:0
+Premiere Erotik 1:12031:h:S19.2E:27500:1279:1280:0:101:513:0:0:0
+Premiere Erotik 2:11719:h:S19.2E:27500:1535:1536:0:101:778:0:0:0
+Premiere Erotik 3:11719:h:S19.2E:27500:1791:1792:0:101:779:0:0:0
+Premiere Erotik 4:11719:h:S19.2E:27500:3583:3584:0:101:780:0:0:0
 :Sportsworld
-Premiere Sport 1:11720:h:S19.2E:27500:255:256,257:0:101:17
-Premiere Sport 2:12031:h:S19.2E:27500:3839:3840:0:101:27
+Premiere Sport 1:11720:h:S19.2E:27500:255:256,257:0:101:17:0:0:0
+Premiere Sport 2:12031:h:S19.2E:27500:3839:3840:0:101:27:0:0:0
 :Formel 1
-:#Supersignal:12070:h:S19.2E:27500:255:256:0:101:211
-:#Cockpitkanal:12070:h:S19.2E:27500:511:512:0:101:212
-:#Boxengasse:12070:h:S19.2E:27500:767:768:0:101:213
-:#Verfolgerfeld:12070:h:S19.2E:27500:1023:1024:0:101:214
-:#Infokanal:12070:h:S19.2E:27500:1279:1280:0:101:215
-:#Multikanal:11720:h:S19.2E:27500:255:256:0:101:17
+:#Supersignal:12070:h:S19.2E:27500:255:256:0:101:211:0:0:0
+:#Cockpitkanal:12070:h:S19.2E:27500:511:512:0:101:212:0:0:0
+:#Boxengasse:12070:h:S19.2E:27500:767:768:0:101:213:0:0:0
+:#Verfolgerfeld:12070:h:S19.2E:27500:1023:1024:0:101:214:0:0:0
+:#Infokanal:12070:h:S19.2E:27500:1279:1280:0:101:215:0:0:0
+:#Multikanal:11720:h:S19.2E:27500:255:256:0:101:17:0:0:0
 :Beta Digital
-N24:12480:v:S19.2E:27500:2047:2048:0:0:47
-CNBC:11954:h:S19.2E:27500:510:520:0:0:28010
-Liberty TV.com:12610:v:S19.2E:22000:941:943,942:0:0:12199
+N24:12480:v:S19.2E:27500:2047:2048:0:0:47:0:0:0
+CNBC:11954:h:S19.2E:27500:510:520:0:0:28010:0:0:0
+Liberty TV.com:12610:v:S19.2E:22000:941:943,942:0:0:12199:0:0:0
 :Premiere Bundesliga
-BL-Konferenz:12031:h:S19.2E:27500:2303:2304,2305:0:101:210
-BuLi 1:11719:h:S19.2E:27500:255:256,257:0:101:17
-BuLi 2:11719:h:S19.2E:27500:2047:2048,2049:0:101:240
-BuLi 3:11719:h:S19.2E:27500:2303:2304,2305:0:101:241
-BuLi 4:11719:h:S19.2E:27500:2559:2560,2561:0:101:242
-BuLi 5:11719:h:S19.2E:27500:2815:2816,2817:0:101:243
-BuLi 6:11719:h:S19.2E:27500:3071:3072,3073:0:101:244
-BuLi 7:11719:h:S19.2E:27500:3327:3328,3329:0:101:245
-BuLi 8:12031:h:S19.2E:27500:3071:3072,3073:0:101:208
-BuLi 9:12031:h:S19.2E:27500:3327:3328,3329:0:101:209
+BL-Konferenz:12031:h:S19.2E:27500:2303:2304,2305:0:101:210:0:0:0
+BuLi 1:11719:h:S19.2E:27500:255:256,257:0:101:17:0:0:0
+BuLi 2:11719:h:S19.2E:27500:2047:2048,2049:0:101:240:0:0:0
+BuLi 3:11719:h:S19.2E:27500:2303:2304,2305:0:101:241:0:0:0
+BuLi 4:11719:h:S19.2E:27500:2559:2560,2561:0:101:242:0:0:0
+BuLi 5:11719:h:S19.2E:27500:2815:2816,2817:0:101:243:0:0:0
+BuLi 6:11719:h:S19.2E:27500:3071:3072,3073:0:101:244:0:0:0
+BuLi 7:11719:h:S19.2E:27500:3327:3328,3329:0:101:245:0:0:0
+BuLi 8:12031:h:S19.2E:27500:3071:3072,3073:0:101:208:0:0:0
+BuLi 9:12031:h:S19.2E:27500:3327:3328,3329:0:101:209:0:0:0
 :-
-Mosaico:11934:v:S19.2E:27500:165:100:0:0:29010
-Andalucia TV:11934:v:S19.2E:27500:166:104:0:0:29011
-Canal J:11934:v:S19.2E:27500:167:108:0:0:8157
-Extreme Sports Channel:11992:h:S19.2E:27500:165:98,99:0:0:20365
-Pro 7 Austria:12051:v:S19.2E:27500:161:84:0:0:20002
-Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:0:0:20003
-Kabel 1 Austria:12051:v:S19.2E:27500:166:167:0:0:20004
-Pro 7 Schweiz:12051:v:S19.2E:27500:289:290:0:0:20001
-KTO:11739:v:S19.2E:27500:163:90:0:0:8304
-Cartoon Network France:12168:v:S19.2E:27500:161:84:0:0:28511
-TVBS Europe:12168:v:S19.2E:27500:162:88,89:0:0:28631
-travel channel:12168:v:S19.2E:27500:163:92,93:0:0:28001
-TCM Espana:12168:v:S19.2E:27500:164:96,97:0:0:28516
-TCM France:12168:v:S19.2E:27500:169:64,65:0:0:28515
-La Cinquieme:12207:v:S19.2E:27500:160:80:0:0:8501
-LCP:12207:v:S19.2E:27500:165:100:0:0:8506
-AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000
-AB 1:12266:h:S19.2E:27500:161:84:0:0:17001
-Escales:12285:v:S19.2E:27500:165:100:0:0:17025
-Canal Club:12324:v:S19.2E:27500:160:80:0:0:8612
-RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004
-K13:12402:v:S19.2E:27500:163:92:0:0:8704
-Astra Mosaic 1:12552:v:S19.2E:22000:175:176:0:0:3988
-Astra Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987
-Astra Mosaic 3:12552:v:S19.2E:22000:182:169:0:0:3986
-Astra Mosaic 4:12552:v:S19.2E:22000:185:170:0:0:3985
-Astra Mosaic 5:12552:v:S19.2E:22000:163:170:0:0:3984
-Chamber TV:12552:v:S19.2E:22000:55:56:0:0:12180
-RTL Tele Letzebuerg:12552:v:S19.2E:22000:168:144,146:0:0:3994
-VERONICA:12574:h:S19.2E:22000:161:84:0:0:5010
-VH1 Classic:12670:v:S19.2E:22000:3071:3072:0:0:28647
-MTV 2 Pop:12670:v:S19.2E:22000:3081:3082:0:0:28648
-Via 1 - Schöner Reisen:12148:h:S19.2E:27500:511:512:0:0:44
-Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220
-ORF/ZDF:12670:h:S19.2E:22000:506:507:0:0:13012
-VIVA:12670:v:S19.2E:22000:309:310:0:0:12732
-VIVA PLUS:12552:v:S19.2E:22000:171:172:0:0:12120
-MTV German:12670:v:S19.2E:22000:3031:3032:0:0:28643
-QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100
+Mosaico:11934:v:S19.2E:27500:165:100:0:0:29010:0:0:0
+Andalucia TV:11934:v:S19.2E:27500:166:104:0:0:29011:0:0:0
+Canal J:11934:v:S19.2E:27500:167:108:0:0:8157:0:0:0
+Extreme Sports Channel:11992:h:S19.2E:27500:165:98,99:0:0:20365:0:0:0
+Pro 7 Austria:12051:v:S19.2E:27500:161:84:0:0:20002:0:0:0
+Kabel 1 Schweiz:12051:v:S19.2E:27500:162:163:0:0:20003:0:0:0
+Kabel 1 Austria:12051:v:S19.2E:27500:166:167:0:0:20004:0:0:0
+Pro 7 Schweiz:12051:v:S19.2E:27500:289:290:0:0:20001:0:0:0
+KTO:11739:v:S19.2E:27500:163:90:0:0:8304:0:0:0
+Cartoon Network France:12168:v:S19.2E:27500:161:84:0:0:28511:0:0:0
+TVBS Europe:12168:v:S19.2E:27500:162:88,89:0:0:28631:0:0:0
+travel channel:12168:v:S19.2E:27500:163:92,93:0:0:28001:0:0:0
+TCM Espana:12168:v:S19.2E:27500:164:96,97:0:0:28516:0:0:0
+TCM France:12168:v:S19.2E:27500:169:64,65:0:0:28515:0:0:0
+La Cinquieme:12207:v:S19.2E:27500:160:80:0:0:8501:0:0:0
+LCP:12207:v:S19.2E:27500:165:100:0:0:8506:0:0:0
+AB Moteurs:12266:h:S19.2E:27500:160:80:0:0:17000:0:0:0
+AB 1:12266:h:S19.2E:27500:161:84:0:0:17001:0:0:0
+Escales:12285:v:S19.2E:27500:165:100:0:0:17025:0:0:0
+Canal Club:12324:v:S19.2E:27500:160:80:0:0:8612:0:0:0
+RAI Uno:10788:v:S19.2E:22000:289:290:0:0:9004:0:0:0
+K13:12402:v:S19.2E:27500:163:92:0:0:8704:0:0:0
+Astra Mosaic 1:12552:v:S19.2E:22000:175:176:0:0:3988:0:0:0
+Astra Mosaic 2:12552:v:S19.2E:22000:179:120:0:0:3987:0:0:0
+Astra Mosaic 3:12552:v:S19.2E:22000:182:169:0:0:3986:0:0:0
+Astra Mosaic 4:12552:v:S19.2E:22000:185:170:0:0:3985:0:0:0
+Astra Mosaic 5:12552:v:S19.2E:22000:163:170:0:0:3984:0:0:0
+Chamber TV:12552:v:S19.2E:22000:55:56:0:0:12180:0:0:0
+RTL Tele Letzebuerg:12552:v:S19.2E:22000:168:144,146:0:0:3994:0:0:0
+VERONICA:12574:h:S19.2E:22000:161:84:0:0:5010:0:0:0
+VH1 Classic:12670:v:S19.2E:22000:3071:3072:0:0:28647:0:0:0
+MTV 2 Pop:12670:v:S19.2E:22000:3081:3082:0:0:28648:0:0:0
+Via 1 - Schöner Reisen:12148:h:S19.2E:27500:511:512:0:0:44:0:0:0
+Video Italia:12610:v:S19.2E:22000:121:122:0:0:12220:0:0:0
+ORF/ZDF:12670:h:S19.2E:22000:506:507:0:0:13012:0:0:0
+VIVA:12670:v:S19.2E:22000:309:310:0:0:12732:0:0:0
+VIVA PLUS:12552:v:S19.2E:22000:171:172:0:0:12120:0:0:0
+MTV German:12670:v:S19.2E:22000:3031:3032:0:0:28643:0:0:0
+QVC Germany:12552:v:S19.2E:22000:165:166:0:0:12100:0:0:0
diff --git a/channels.conf.cable b/channels.conf.cable
index 131208f..1be4c53 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,210 +1,210 @@
-Das Erste:410:M64:C:6900:101:102:104:0:28106
-ZDF:394:M64:C:6900:110:120:130:0:28006
-3sat:394:M64:C:6900:210:220:230:0:28007
-arte:410:M64:C:6900:401:402:404:0:28109
-ZDF.info:394:M64:C:6900:610:620:0:0:28011
-ZDF.doku:394:M64:C:6900:660:670:0:0:28014
-ZDF Theaterkanal:394:M64:C:6900:1110:1120:130:0:28016
-EinsExtra:426:M64:C:6900:101:102:0:0:28201
-EinsFestival:426:M64:C:6900:201:202:0:0:28202
-EinsMuXx:426:M64:C:6900:301:302:0:0:28203
-Phoenix:410:M64:C:6900:901:902:904:0:28114
-KI.KA:394:M64:C:6900:310:320:330:0:28008
-EuroNews:394:M64:C:6900:2221:2233:768:0:28015
-CNBC:394:M64:C:6900:510:520:530:0:28010
-Eurosport:394:M64:C:6900:410:420:430:0:28009
+Das Erste:410:M64:C:6900:101:102:104:0:28106:0:0:0
+ZDF:394:M64:C:6900:110:120:130:0:28006:0:0:0
+3sat:394:M64:C:6900:210:220:230:0:28007:0:0:0
+arte:410:M64:C:6900:401:402:404:0:28109:0:0:0
+ZDF.info:394:M64:C:6900:610:620:0:0:28011:0:0:0
+ZDF.doku:394:M64:C:6900:660:670:0:0:28014:0:0:0
+ZDF Theaterkanal:394:M64:C:6900:1110:1120:130:0:28016:0:0:0
+EinsExtra:426:M64:C:6900:101:102:0:0:28201:0:0:0
+EinsFestival:426:M64:C:6900:201:202:0:0:28202:0:0:0
+EinsMuXx:426:M64:C:6900:301:302:0:0:28203:0:0:0
+Phoenix:410:M64:C:6900:901:902:904:0:28114:0:0:0
+KI.KA:394:M64:C:6900:310:320:330:0:28008:0:0:0
+EuroNews:394:M64:C:6900:2221:2233:768:0:28015:0:0:0
+CNBC:394:M64:C:6900:510:520:530:0:28010:0:0:0
+Eurosport:394:M64:C:6900:410:420:430:0:28009:0:0:0
 :Regionalprogramme
-B1 Berlin:426:M64:C:6900:601:602:604:0:28206
-ORB-Fernsehen:426:M64:C:6900:501:502:504:0:28205
-N3:426:M64:C:6900:2401:2402:2404:0:28224
-MDR FERNSEHEN:426:M64:C:6900:401:402:404:0:28204
-WDR FERNSEHEN:410:M64:C:6900:601:602:604:0:28111
-hessen fernsehen:410:M64:C:6900:301:302:304:0:28108
-BR-alpha:410:M64:C:6900:701:702:704:0:28112
-Bayerisches FS:410:M64:C:6900:201:202:204:0:28107
-SR Fernsehen Suedwest:410:M64:C:6900:501:502:504:0:28110
-SuedWest BW:410:M64:C:6900:801:802:804:0:28113
-SuedWest RP:426:M64:C:6900:3101:3102:3104:0:28231
+B1 Berlin:426:M64:C:6900:601:602:604:0:28206:0:0:0
+ORB-Fernsehen:426:M64:C:6900:501:502:504:0:28205:0:0:0
+N3:426:M64:C:6900:2401:2402:2404:0:28224:0:0:0
+MDR FERNSEHEN:426:M64:C:6900:401:402:404:0:28204:0:0:0
+WDR FERNSEHEN:410:M64:C:6900:601:602:604:0:28111:0:0:0
+hessen fernsehen:410:M64:C:6900:301:302:304:0:28108:0:0:0
+BR-alpha:410:M64:C:6900:701:702:704:0:28112:0:0:0
+Bayerisches FS:410:M64:C:6900:201:202:204:0:28107:0:0:0
+SR Fernsehen Suedwest:410:M64:C:6900:501:502:504:0:28110:0:0:0
+SuedWest BW:410:M64:C:6900:801:802:804:0:28113:0:0:0
+SuedWest RP:426:M64:C:6900:3101:3102:3104:0:28231:0:0:0
 :Hauptprogramme Premiere
-Premiere START:370:M64:C:6900:255:256:32:101:8
-Premiere 1:370:M64:C:6900:511:512;515:0:101:10
-Premiere 2:370:M64:C:6900:1791:1792;1795:0:101:11
-Premiere 3:370:M64:C:6900:2303:2304:0:101:43
-Premiere 4:370:M64:C:6900:767:768:0:101:9
-Premiere 5:370:M64:C:6900:1279:1280:0:101:29
-Premiere 6:370:M64:C:6900:1535:1536:0:101:41
-Premiere 7:370:M64:C:6900:1023:1024:0:101:20
-Premiere SERIE:378:M64:C:6900:1023:1024:0:101:16
-Premiere Nostalgie:378:M64:C:6900:2559:2560:0:101:516
-13 TH STREET:354:M64:C:6900:2303:2304:0:101:42
-Stundio Universal:402:M64:C:6900:1050:1054:0:101:36
-Krimi &Co:378:M64:C:6900:1535:1536:0:101:23
-Disney Channel:402:M64:C:6900:1030:1034:0:101:34
-Discovery Channel:378:M64:C:6900:1791:1792:0:101:14
-PLANET:354:M64:C:6900:1791:1792:0:101:13
-Fox Kids:354:M64:C:6900:1279:1280:0:101:28
-Junior:354:M64:C:6900:255:256:0:101:19
-K-TOON:354:M64:C:6900:511:512:0:101:12
-HEIMATKANAL:354:M64:C:6900:1535:1536:0:101:22
-GOLDSTAR TV:354:M64:C:6900:3839:3840:0:101:518
-CLASSICA:354:M64:C:6900:767:768:0:101:15
+Premiere START:370:M64:C:6900:255:256:32:101:8:0:0:0
+Premiere 1:370:M64:C:6900:511:512;515:0:101:10:0:0:0
+Premiere 2:370:M64:C:6900:1791:1792;1795:0:101:11:0:0:0
+Premiere 3:370:M64:C:6900:2303:2304:0:101:43:0:0:0
+Premiere 4:370:M64:C:6900:767:768:0:101:9:0:0:0
+Premiere 5:370:M64:C:6900:1279:1280:0:101:29:0:0:0
+Premiere 6:370:M64:C:6900:1535:1536:0:101:41:0:0:0
+Premiere 7:370:M64:C:6900:1023:1024:0:101:20:0:0:0
+Premiere SERIE:378:M64:C:6900:1023:1024:0:101:16:0:0:0
+Premiere Nostalgie:378:M64:C:6900:2559:2560:0:101:516:0:0:0
+13 TH STREET:354:M64:C:6900:2303:2304:0:101:42:0:0:0
+Studio Universal:402:M64:C:6900:1050:1054:0:101:36:0:0:0
+Krimi & Co:378:M64:C:6900:1535:1536:0:101:23:0:0:0
+Disney Channel:402:M64:C:6900:1030:1034:0:101:34:0:0:0
+Discovery Channel:378:M64:C:6900:1791:1792:0:101:14:0:0:0
+PLANET:354:M64:C:6900:1791:1792:0:101:13:0:0:0
+Fox Kids:354:M64:C:6900:1279:1280:0:101:28:0:0:0
+Junior:354:M64:C:6900:255:256:0:101:19:0:0:0
+K-TOON:354:M64:C:6900:511:512:0:101:12:0:0:0
+HEIMATKANAL:354:M64:C:6900:1535:1536:0:101:22:0:0:0
+GOLDSTAR TV:354:M64:C:6900:3839:3840:0:101:518:0:0:0
+CLASSICA:354:M64:C:6900:767:768:0:101:15:0:0:0
 :Mediavision
-Bloomberg:346:M64:C:6900:811:812:0:101:50701
-Fashion TV:346:M64:C:6900:821:822:0:101:50702
-Einstein:346:M64:C:6900:623:624:0:101:50719
-Extreme Sport:346:M64:C:6900:801:802:0:101:50700
-LANDSCAPE:346:M64:C:6900:831:832:0:101:50703
+Bloomberg:346:M64:C:6900:811:812:0:101:50701:0:0:0
+Fashion TV:346:M64:C:6900:821:822:0:101:50702:0:0:0
+Einstein:346:M64:C:6900:623:624:0:101:50719:0:0:0
+Extreme Sport:346:M64:C:6900:801:802:0:101:50700:0:0:0
+LANDSCAPE:346:M64:C:6900:831:832:0:101:50703:0:0:0
 :DIGIKABEL D
-Avante:113:M64:C:6900:741:742,743:0:101:53404
-BBC Prime:113:M64:C:6900:761:762:763:101:53406
-Club:113:M64:C:6900:711:712,713:0:101:53401
-Eurosport News:113:M64:C:6900:771:772:0:101:53407
-BibelTV:113:M64:C:6900:731:732:0:1:53403
-Liberty TV:113:M64:C:6900:721:722,723:0:101:53402
-TW1:113:M64:C:6900:751:752:0:101:53405
-MTV Base:113:M64:C:6900:781:782:0:101:53408
+Avante:113:M64:C:6900:741:742,743:0:101:53404:0:0:0
+BBC Prime:113:M64:C:6900:761:762:763:101:53406:0:0:0
+Club:113:M64:C:6900:711:712,713:0:101:53401:0:0:0
+Eurosport News:113:M64:C:6900:771:772:0:101:53407:0:0:0
+BibelTV:113:M64:C:6900:731:732:0:1:53403:0:0:0
+Liberty TV:113:M64:C:6900:721:722,723:0:101:53402:0:0:0
+TW1:113:M64:C:6900:751:752:0:101:53405:0:0:0
+MTV Base:113:M64:C:6900:781:782:0:101:53408:0:0:0
 :DIGIKABEL INT
-Canal 24 Horas:121:M64:C:6900:991:992:0:101:53509
-Gala TV:121:M64:C:6900:931:932:0:101:53503
-Kanal 7:121:M64:C:6900:941:942:0:101:53504
-Rai 1:121:M64:C:6900:951:952:0:101:53505
-Rai 2:121:M64:C:6900:961:962:0:101:53506
-Rai 3:121:M64:C:6900:971:972:0:101:53507
-Show TV:121:M64:C:6900:911:912:0:101:53501
-TGRT:121:M64:C:6900:921:922:0:101:53502
-TVEi:121:M64:C:6900:981:982:0:101:53508
+Canal 24 Horas:121:M64:C:6900:991:992:0:101:53509:0:0:0
+Gala TV:121:M64:C:6900:931:932:0:101:53503:0:0:0
+Kanal 7:121:M64:C:6900:941:942:0:101:53504:0:0:0
+Rai 1:121:M64:C:6900:951:952:0:101:53505:0:0:0
+Rai 2:121:M64:C:6900:961:962:0:101:53506:0:0:0
+Rai 3:121:M64:C:6900:971:972:0:101:53507:0:0:0
+Show TV:121:M64:C:6900:911:912:0:101:53501:0:0:0
+TGRT:121:M64:C:6900:921:922:0:101:53502:0:0:0
+TVEi:121:M64:C:6900:981:982:0:101:53508:0:0:0
 :DIGIKABEL SO
-Fox Kids:121:M64:C:6900:931:932,933:0:101:53523
-Kanal 7:121:M64:C:6900:941:942:0:101:53524
-Show TV:121:M64:C:6900:911:912:0:101:53521
-TGRT:121:M64:C:6900:921:922:0:101:53522
+Fox Kids:121:M64:C:6900:931:932,933:0:101:53523:0:0:0
+Kanal 7:121:M64:C:6900:941:942:0:101:53524:0:0:0
+Show TV:121:M64:C:6900:911:912:0:101:53521:0:0:0
+TGRT:121:M64:C:6900:921:922:0:101:53522:0:0:0
 :DIGIKABEL SW
-Canal 24 Horas:121:M64:C:6900:991:992:0:101:53535
-Rai 1:121:M64:C:6900:951:952:0:101:53531
-Rai 2:121:M64:C:6900:961:962:0:101:53532
-Rai 3:121:M64:C:6900:971:972:0:101:53533
-TVEi:121:M64:C:6900:981:982:0:101:53534
+Canal 24 Horas:121:M64:C:6900:991:992:0:101:53535:0:0:0
+Rai 1:121:M64:C:6900:951:952:0:101:53531:0:0:0
+Rai 2:121:M64:C:6900:961:962:0:101:53532:0:0:0
+Rai 3:121:M64:C:6900:971:972:0:101:53533:0:0:0
+TVEi:121:M64:C:6900:981:982:0:101:53534:0:0:0
 :Diverse TV-Sender
-Sonnenklar TV:402:M64:C:6900:0:0:0:101:32
-TV Polonia:434:M64:C:6900:641:642:0:101:53204
-Kanal D:434:M64:C:6900:651:652:0:101:53205
-RTP international:434:M64:C:6900:661:662:0:101:53206
-ERT-Sat:434:M64:C:6900:691:692:0:101:53209
-CNE:434:M64:C:6900:4056:4057:0:101:53208
-ZEE TV:442:M64:C:6900:517:773:0:101:53301
-NTV i:442:M64:C:6900:514:515:0:101:53302
-ATV:434:M64:C:6900:631:632:0:101:53203
-TW1:610:M64:C:6900:6106:6107:0:101:6106
+Sonnenklar TV:402:M64:C:6900:0:0:0:101:32:0:0:0
+TV Polonia:434:M64:C:6900:641:642:0:101:53204:0:0:0
+Kanal D:434:M64:C:6900:651:652:0:101:53205:0:0:0
+RTP international:434:M64:C:6900:661:662:0:101:53206:0:0:0
+ERT-Sat:434:M64:C:6900:691:692:0:101:53209:0:0:0
+CNE:434:M64:C:6900:4056:4057:0:101:53208:0:0:0
+ZEE TV:442:M64:C:6900:517:773:0:101:53301:0:0:0
+NTV i:442:M64:C:6900:514:515:0:101:53302:0:0:0
+ATV:434:M64:C:6900:631:632:0:101:53203:0:0:0
+TW1:610:M64:C:6900:6106:6107:0:101:6106:0:0:0
 :Digit. Bouquet "Kabel Berlin"
-Parlamentsfernsehen:610:M64:C:6900:33:36:47:0:6100
-DW-tv:610:M64:C:6900:634:632:0:0:6101
-Kanal 7:610:M64:C:6900:49:52:0:101:6103
-Euronews:610:M64:C:6900:597:592:0:101:6104
-Travel:610:M64:C:6900:595:594:0:101:6105
-VH1 Classic:610:M64:C:6900:604:603:0:101:6106
-Nuvolari:618:M64:C:6900:1011:1012:0:101:50101
-Alice:618:M64:C:6900:1031:1032:0:101:50103
-Leonardo:618:M64:C:6900:1041:1042:0:101:50104
-Club:618:M64:C:6900:1051:1052:0:101:50105
-Avante:618:M64:C:6900:1061:1062:0:101:50106
-BBC Prime:618:M64:C:6900:1091:1092:0:101:50109
-Eurosport News:618:M64:C:6900:1101:1102:0:101:50110
+Parlamentsfernsehen:610:M64:C:6900:33:36:47:0:6100:0:0:0
+DW-tv:610:M64:C:6900:634:632:0:0:6101:0:0:0
+Kanal 7:610:M64:C:6900:49:52:0:101:6103:0:0:0
+Euronews:610:M64:C:6900:597:592:0:101:6104:0:0:0
+Travel:610:M64:C:6900:595:594:0:101:6105:0:0:0
+VH1 Classic:610:M64:C:6900:604:603:0:101:6106:0:0:1
+Nuvolari:618:M64:C:6900:1011:1012:0:101:50101:0:0:0
+Alice:618:M64:C:6900:1031:1032:0:101:50103:0:0:0
+Leonardo:618:M64:C:6900:1041:1042:0:101:50104:0:0:0
+Club:618:M64:C:6900:1051:1052:0:101:50105:0:0:0
+Avante:618:M64:C:6900:1061:1062:0:101:50106:0:0:0
+BBC Prime:618:M64:C:6900:1091:1092:0:101:50109:0:0:0
+Eurosport News:618:M64:C:6900:1101:1102:0:101:50110:0:0:0
 :Premiere Sport
-PREMIERE SPORT 1:362:M64:C:6900:255:256,258:0:101:17
-PREMIERE SPORT 2:378:M64:C:6900:3839:3840,3841:0:101:27
+PREMIERE SPORT 1:362:M64:C:6900:255:256,258:0:101:17:0:0:0
+PREMIERE SPORT 2:378:M64:C:6900:3839:3840,3841:0:101:27:0:0:0
 :Premiere Bundesliga
-BuLi Opt 1:362:M64:C:6900:255:256:0:101:17
-BuLi Opt 2:362:M64:C:6900:2047:2048:0:101:240
-BuLi Opt 3:362:M64:C:6900:2303:2304:0:101:241
-BuLi Opt 4:362:M64:C:6900:2559:2560:0:101:242
-BuLi Opt 5:362:M64:C:6900:2815:2816:0:101:243
-BuLi Opt 6:362:M64:C:6900:3071:3072:0:101:244
-BuLi Opt 7:362:M64:C:6900:3327:3328:0:101:245
-BuLi Opt 8:378:M64:C:6900:3071:3072:0:101:208
-BuLi Opt 9:378:M64:C:6900:3327:3328:0:101:209
-BuLi Opt 10:378:M64:C:6900:2303:2304:0:101:210
+BuLi Opt 1:362:M64:C:6900:255:256:0:101:17:0:0:1
+BuLi Opt 2:362:M64:C:6900:2047:2048:0:101:240:0:0:0
+BuLi Opt 3:362:M64:C:6900:2303:2304:0:101:241:0:0:0
+BuLi Opt 4:362:M64:C:6900:2559:2560:0:101:242:0:0:0
+BuLi Opt 5:362:M64:C:6900:2815:2816:0:101:243:0:0:0
+BuLi Opt 6:362:M64:C:6900:3071:3072:0:101:244:0:0:0
+BuLi Opt 7:362:M64:C:6900:3327:3328:0:101:245:0:0:0
+BuLi Opt 8:378:M64:C:6900:3071:3072:0:101:208:0:0:0
+BuLi Opt 9:378:M64:C:6900:3327:3328:0:101:209:0:0:0
+BuLi Opt 10:378:M64:C:6900:2303:2304:0:101:210:0:0:0
 :Premiere CL
-UEFA CL 1:362:M64:C:6900:255:256,257:0:101:17
-UEFA CL 2:386:M64:C:6900:255:256:0:101:211
+UEFA CL 1:362:M64:C:6900:255:256,257:0:101:17:0:0:2
+UEFA CL 2:386:M64:C:6900:255:256:0:101:211:0:0:0
 :Premiere Formel 1
-F1 Portal 1:362:M64:C:6900:255:256:0:101:17
-F1 Supersignal:362:M64:C:6900:2047:2048:0:101:240
-F1 Cockpit Kanal:362:M64:C:6900:2303:2304:0:101:241
-F1 Boxengasse:362:M64:C:6900:2559:2560:0:101:242
-F1 Verfolgerfeld:362:M64:C:6900:2815:2816:0:101:243
-F1 Infokanal:362:M64:C:6900:3071:3072:0:101:244
+F1 Portal 1:362:M64:C:6900:255:256:0:101:17:0:0:3
+F1 Supersignal:362:M64:C:6900:2047:2048:0:101:240:0:0:1
+F1 Cockpit Kanal:362:M64:C:6900:2303:2304:0:101:241:0:0:1
+F1 Boxengasse:362:M64:C:6900:2559:2560:0:101:242:0:0:1
+F1 Verfolgerfeld:362:M64:C:6900:2815:2816:0:101:243:0:0:1
+F1 Infokanal:362:M64:C:6900:3071:3072:0:101:244:0:0:1
 :Premiere Direkt 1
-PREMIERE DIREKT 1A:378:M64:C:6900:511:512,513;515:0:101:177
-PREMIERE DIREKT 1B:362:M64:C:6900:1023:1024,1025;1027:0:101:182
+PREMIERE DIREKT 1A:378:M64:C:6900:511:512,513;515:0:101:177:0:0:0
+PREMIERE DIREKT 1B:362:M64:C:6900:1023:1024,1025;1027:0:101:182:0:0:0
 :Premiere Direkt 2
-PREMIERE DIREKT 2A:378:M64:C:6900:255:256,257;259:0:101:176
-PREMIERE DIREKT 2B:362:M64:C:6900:767:768,769;771:0:101:181
+PREMIERE DIREKT 2A:378:M64:C:6900:255:256,257;259:0:101:176:0:0:0
+PREMIERE DIREKT 2B:362:M64:C:6900:767:768,769;771:0:101:181:0:0:0
 :Premiere Direkt 3
-PREMIERE DIREKT 3A:362:M64:C:6900:1279:1280,1281;1283:0:101:183
-PREMIERE DIREKT 3B:362:M64:C:6900:511:512,513;515:0:101:180
+PREMIERE DIREKT 3A:362:M64:C:6900:1279:1280,1281;1283:0:101:183:0:0:0
+PREMIERE DIREKT 3B:362:M64:C:6900:511:512,513;515:0:101:180:0:0:0
 :Premiere Direkt 4
-PREMIERE DIREKT 4A:378:M64:C:6900:2815:2816,2817:0:101:18
-PREMIERE DIREKT 4B:386:M64:C:6900:1535:1536,1537:0:101:216
+PREMIERE DIREKT 4A:378:M64:C:6900:2815:2816,2817:0:101:18:0:0:0
+PREMIERE DIREKT 4B:386:M64:C:6900:1535:1536,1537:0:101:216:0:0:0
 :Premiere Erotik
-BEATE-UHSE.TV:354:M64:C:6900:1023:1024:0:101:21
-PREMIERE EROTIK 1:378:M64:C:6900:1279:1280:0:101:513
-PREMIERE EROTIK 2:362:M64:C:6900:1535:1536:0:101:778
-PREMIERE EROTIK 3:362:M64:C:6900:1791:1792:0:101:779
-PREMIERE EROTIK 4:362:M64:C:6900:3583:3584:0:101:780
+BEATE-UHSE.TV:354:M64:C:6900:1023:1024:0:101:21:0:0:0
+PREMIERE EROTIK 1:378:M64:C:6900:1279:1280:0:101:513:0:0:0
+PREMIERE EROTIK 2:362:M64:C:6900:1535:1536:0:101:778:0:0:0
+PREMIERE EROTIK 3:362:M64:C:6900:1791:1792:0:101:779:0:0:0
+PREMIERE EROTIK 4:362:M64:C:6900:3583:3584:0:101:780:0:0:0
 :Radio-Sender (FTV)
-Fritz:426:M64:C:6900:0:901:0:0:28209
-SPUTNIK:426:M64:C:6900:0:1201:0:0:28212
-HR XXL:410:M64:C:6900:0:3501:0:0:28125
-JUMP:426:M64:C:6900:0:1001:0:0:28210
-MDR info:426:M64:C:6900:0:1101:0:0:28211
-MDR KULTUR:426:M64:C:6900:0:801:0:0:28208
-Radio 3:426:M64:C:6900:0:701:0:0:28207
-RADIOmultikulti:426:M64:C:6900:0:1301:0:0:28213
-SWR2:426:M64:C:6900:0:1401:0:0:28214
-WDR 3:426:M64:C:6900:0:1501:0:0:28215
-WDR Radio 5:426:M64:C:6900:0:1601:0:0:28216
-Bayern 4 Klassik:410:M64:C:6900:0:3001:0:0:28120
-B5 aktuell:410:M64:C:6900:0:3101:0:0:28121
-NordwestRadio:410:M64:C:6900:0:3801:0:0:28128
-Bayern 1:410:M64:C:6900:0:3601:0:0:28126
-NDR Info:410:M64:C:6900:0:3701:0:0:28127
-SR 1:410:M64:C:6900:0:3901:0:0:28129
-hr-klassik:410:M64:C:6900:0:3401:0:0:28124
-hr2:410:M64:C:6900:0:3301:0:0:28123
-hr-chronos:410:M64:C:6900:0:3201:0:0:28122
-DLF-Köln:394:M64:C:6900:0:810:0:0:28013
-DLR-Berlin:394:M64:C:6900:0:710:0:0:28012
-Österreich 1:394:M64:C:6900:0:169:0:0:28017
-Radio GoldStar:354:M64:C:6900:0:368:0:0:171
+Fritz:426:M64:C:6900:0:901:0:0:28209:0:0:0
+SPUTNIK:426:M64:C:6900:0:1201:0:0:28212:0:0:0
+HR XXL:410:M64:C:6900:0:3501:0:0:28125:0:0:0
+JUMP:426:M64:C:6900:0:1001:0:0:28210:0:0:0
+MDR info:426:M64:C:6900:0:1101:0:0:28211:0:0:0
+MDR KULTUR:426:M64:C:6900:0:801:0:0:28208:0:0:0
+Radio 3:426:M64:C:6900:0:701:0:0:28207:0:0:0
+RADIOmultikulti:426:M64:C:6900:0:1301:0:0:28213:0:0:0
+SWR2:426:M64:C:6900:0:1401:0:0:28214:0:0:0
+WDR 3:426:M64:C:6900:0:1501:0:0:28215:0:0:0
+WDR Radio 5:426:M64:C:6900:0:1601:0:0:28216:0:0:0
+Bayern 4 Klassik:410:M64:C:6900:0:3001:0:0:28120:0:0:0
+B5 aktuell:410:M64:C:6900:0:3101:0:0:28121:0:0:0
+NordwestRadio:410:M64:C:6900:0:3801:0:0:28128:0:0:0
+Bayern 1:410:M64:C:6900:0:3601:0:0:28126:0:0:0
+NDR Info:410:M64:C:6900:0:3701:0:0:28127:0:0:0
+SR 1:410:M64:C:6900:0:3901:0:0:28129:0:0:0
+hr-klassik:410:M64:C:6900:0:3401:0:0:28124:0:0:0
+hr2:410:M64:C:6900:0:3301:0:0:28123:0:0:0
+hr-chronos:410:M64:C:6900:0:3201:0:0:28122:0:0:0
+DLF-Köln:394:M64:C:6900:0:810:0:0:28013:0:0:0
+DLR-Berlin:394:M64:C:6900:0:710:0:0:28012:0:0:0
+Österreich 1:394:M64:C:6900:0:169:0:0:28017:0:0:0
+Radio GoldStar:354:M64:C:6900:0:368:0:0:171:0:0:0
 :Radio-Sender (PPV)
-ALTERNATIVE ROCK:370:M64:C:6900:1:544:0:101:154
-DEUTSCHE HITS:370:M64:C:6900:1:800:0:101:151
-HITLISTE:370:M64:C:6900:1:784:0:101:150
-HIP HOP/R&B:370:M64:C:6900:1:576:0:101:159
-DANCE:370:M64:C:6900:1:304:0:101:165
-HARD ROCK:370:M64:C:6900:1:816:0:101:152
-LOVE SONGS:370:M64:C:6900:1:592:0:101:156
-FILM & MUSICAL:378:M64:C:6900:1:592:0:101:145
-EASY LISTENING:378:M64:C:6900:1:608:0:101:146
-JAZZ:378:M64:C:6900:1:640:0:101:148
-KLASSIK POPULÄR:378:M64:C:6900:1:624:0:101:147
-ORCHESTRALE WERKE:378:M64:C:6900:1:560:0:101:158
-CLASSIC ROCK:370:M64:C:6900:1:352:0:101:163
-CHILLOUT:370:M64:C:6900:1:400:0:101:157
-SCHLAGER:370:M64:C:6900:1:384:0:101:162
-GOLD:370:M64:C:6900:1:320:0:101:166
-OLD GOLD:362:M64:C:6900:1:336:0:101:167
-SOUL CLASSICS:362:M64:C:6900:1:352:0:101:153
-LATIN:362:M64:C:6900:1:368:0:101:155
-NEW COUNTRY:362:M64:C:6900:1:384:0:101:164
-COUNTRY:362:M64:C:6900:1:656:0:101:149
-All Jazz:442:M64:C:6900:1:535:0:101:53350
-Cristal New Age:442:M64:C:6900:1:536:0:101:53351
-Movie Sounds:442:M64:C:6900:1:537:0:101:53352
-Sinfonica:442:M64:C:6900:1:538:0:101:53353
-Opernfestival:442:M64:C:6900:1:539:0:101:53354
-Barock Fantasie:442:M64:C:6900:1:540:0:101:53355
-Musica Camerata:442:M64:C:6900:1:541:0:101:53356
-Musica Antica:442:M64:C:6900:1:542:0:101:53357
-Adagio:442:M64:C:6900:1:543:0:101:53358
-Jazz legends:442:M64:C:6900:1:544:0:101:53359
+ALTERNATIVE ROCK:370:M64:C:6900:1:544:0:101:154:0:0:0
+DEUTSCHE HITS:370:M64:C:6900:1:800:0:101:151:0:0:0
+HITLISTE:370:M64:C:6900:1:784:0:101:150:0:0:0
+HIP HOP/R&B:370:M64:C:6900:1:576:0:101:159:0:0:0
+DANCE:370:M64:C:6900:1:304:0:101:165:0:0:0
+HARD ROCK:370:M64:C:6900:1:816:0:101:152:0:0:0
+LOVE SONGS:370:M64:C:6900:1:592:0:101:156:0:0:0
+FILM & MUSICAL:378:M64:C:6900:1:592:0:101:145:0:0:0
+EASY LISTENING:378:M64:C:6900:1:608:0:101:146:0:0:0
+JAZZ:378:M64:C:6900:1:640:0:101:148:0:0:0
+KLASSIK POPULÄR:378:M64:C:6900:1:624:0:101:147:0:0:0
+ORCHESTRALE WERKE:378:M64:C:6900:1:560:0:101:158:0:0:0
+CLASSIC ROCK:370:M64:C:6900:1:352:0:101:163:0:0:0
+CHILLOUT:370:M64:C:6900:1:400:0:101:157:0:0:0
+SCHLAGER:370:M64:C:6900:1:384:0:101:162:0:0:0
+GOLD:370:M64:C:6900:1:320:0:101:166:0:0:0
+OLD GOLD:362:M64:C:6900:1:336:0:101:167:0:0:0
+SOUL CLASSICS:362:M64:C:6900:1:352:0:101:153:0:0:0
+LATIN:362:M64:C:6900:1:368:0:101:155:0:0:0
+NEW COUNTRY:362:M64:C:6900:1:384:0:101:164:0:0:0
+COUNTRY:362:M64:C:6900:1:656:0:101:149:0:0:0
+All Jazz:442:M64:C:6900:1:535:0:101:53350:0:0:0
+Cristal New Age:442:M64:C:6900:1:536:0:101:53351:0:0:0
+Movie Sounds:442:M64:C:6900:1:537:0:101:53352:0:0:0
+Sinfonica:442:M64:C:6900:1:538:0:101:53353:0:0:0
+Opernfestival:442:M64:C:6900:1:539:0:101:53354:0:0:0
+Barock Fantasie:442:M64:C:6900:1:540:0:101:53355:0:0:0
+Musica Camerata:442:M64:C:6900:1:541:0:101:53356:0:0:0
+Musica Antica:442:M64:C:6900:1:542:0:101:53357:0:0:0
+Adagio:442:M64:C:6900:1:543:0:101:53358:0:0:0
+Jazz legends:442:M64:C:6900:1:544:0:101:53359:0:0:0
diff --git a/channels.conf.terr b/channels.conf.terr
index 4187e11..f48d566 100644
--- a/channels.conf.terr
+++ b/channels.conf.terr
@@ -1,52 +1,52 @@
 : UK channels for Crystal Palace, London
-BBC ONE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:600:601,602:602:0:4164
-BBC TWO (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:610:611,612:0:2:4228
-BBC THREE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4351
-BBC NEWS 24 (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:640:641:0:0:4415
-Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841,2843:0:0:8800
-ITV 2 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2818:2819,2821:0:0:8325
-ITV 1 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:512:650,660:0:0:8261
-Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384
-five (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6017:6018,6019:0:0:12866
-QVC (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6049:6050:0:0:13120
-TV Travel Shop (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6161:6162:0:0:13632
-ITV News (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6193:6194:0:0:13760
-BBC PARLMNT (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:403:0:0:16768
-BBC FOUR (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16832
-BBC R5 Live (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:430:0:0:17920
-BBC 5L SportsX (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:431:0:0:17984
-BBC 6 Music (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:432:0:0:18048
-BBC 7 (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:433:0:0:18112
-1Xtra BBC (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:434:0:0:18176
-BBC Asian Net. (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:435:0:0:18240
-701 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:203:407:0:0:19456
-702 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:204:411:0:0:19520
-Sky News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:101:102,104:0:0:22080
-Sky Spts News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:22144
-Sky Travel (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:22208
-UKHistory (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:401:402,404:0:0:22272
-THE HITS (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:101:102:0:0:25664
-TMF (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:25728
-UKHomeStyle (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,306:0:0:25792
-f tn (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:25856
-Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048
-Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240
-KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176
-Kerrang! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1301:0:0:26304
-jazz fm (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1401:0:0:26368
-oneword (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1501:0:0:26432
-BBC World Sv (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1601:0:0:26496
-Ch 22 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048
-Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984
+BBC ONE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:600:601,602:602:0:4164:0:0:0
+BBC TWO (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:610:611,612:0:2:4228:0:0:0
+BBC THREE (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4351:0:0:0
+BBC NEWS 24 (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:640:641:0:0:4415:0:0:0
+Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841,2843:0:0:8800:0:0:0
+ITV 2 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2818:2819,2821:0:0:8325:0:0:0
+ITV 1 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:512:650,660:0:0:8261:0:0:0
+Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384:0:0:0
+five (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6017:6018,6019:0:0:12866:0:0:0
+QVC (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6049:6050:0:0:13120:0:0:0
+TV Travel Shop (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6161:6162:0:0:13632:0:0:0
+ITV News (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6193:6194:0:0:13760:0:0:0
+BBC PARLMNT (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:403:0:0:16768:0:0:0
+BBC FOUR (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16832:0:0:0
+BBC R5 Live (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:430:0:0:17920:0:0:0
+BBC 5L SportsX (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:431:0:0:17984:0:0:0
+BBC 6 Music (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:432:0:0:18048:0:0:0
+BBC 7 (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:433:0:0:18112:0:0:0
+1Xtra BBC (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:434:0:0:18176:0:0:0
+BBC Asian Net. (RADIO):529833:I0C34D0M16B8T2G32Y0:T:27500:0:435:0:0:18240:0:0:0
+701 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:203:407:0:0:19456:0:0:0
+702 (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:204:411:0:0:19520:0:0:0
+Sky News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:101:102,104:0:0:22080:0:0:0
+Sky Spts News (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:22144:0:0:0
+Sky Travel (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:22208:0:0:0
+UKHistory (TV):578166:I0C34D0M16B8T2G32Y0:T:27500:401:402,404:0:0:22272:0:0:0
+THE HITS (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:101:102:0:0:25664:0:0:0
+TMF (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:201:202,204:0:0:25728:0:0:0
+UKHomeStyle (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,306:0:0:25792:0:0:0
+f tn (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:301:302,304:0:0:25856:0:0:0
+Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:0
+Smash Hits! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1201:0:0:26240:0:0:0
+KISS (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1101:0:0:26176:0:0:0
+Kerrang! (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1301:0:0:26304:0:0:0
+jazz fm (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1401:0:0:26368:0:0:0
+oneword (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1501:0:0:26432:0:0:0
+BBC World Sv (RADIO):537833:I0C34D0M16B8T2G32Y0:T:27500:0:1601:0:0:26496:0:0:0
+Ch 22 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:1
+Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984:0:0:0
 : DVB-T Berlin Germany
-PRO 7:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:0:0:16403
-SAT 1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:0:0:16408
-RTL:658000:I0C23D0M16B8T8G8Y0:T:27500:337:338:0:0:16405
-RTL 2:658000:I0C23D0M16B8T8G8Y0:T:27500:353:354:0:0:16406
-Super RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:433:434:0:0:16411
-VOX:778000:I0C23D0M16B8T8G8Y0:T:27500:545:546:0:0:16418
-KABEL 1:778000:I0C23D0M16B8T8G8Y0:T:27500:161:162:0:0:16394
-MTV:650000:I0C23D0M16B8T2G8Y0:T:27500:193:194:0:0:16396
-N-TV:650000:I0C23D0M16B8T2G8Y0:T:27500:273:274:0:0:16401
-N24:778000:I0C23D0M16B8T8G8Y0:T:27500:225:226:0:0:16398
-FAB:650000:I0C23D0M16B8T2G8Y0:T:27500:3073:3074:0:0:16576
+PRO 7:658000:I0C23D0M16B8T8G8Y0:T:27500:305:306;307:0:0:16403:0:0:0
+SAT 1:658000:I0C23D0M16B8T8G8Y0:T:27500:385:386:0:0:16408:0:0:0
+RTL:658000:I0C23D0M16B8T8G8Y0:T:27500:337:338:0:0:16405:0:0:0
+RTL 2:658000:I0C23D0M16B8T8G8Y0:T:27500:353:354:0:0:16406:0:0:0
+Super RTL:778000:I0C23D0M16B8T8G8Y0:T:27500:433:434:0:0:16411:0:0:0
+VOX:778000:I0C23D0M16B8T8G8Y0:T:27500:545:546:0:0:16418:0:0:0
+KABEL 1:778000:I0C23D0M16B8T8G8Y0:T:27500:161:162:0:0:16394:0:0:0
+MTV:650000:I0C23D0M16B8T2G8Y0:T:27500:193:194:0:0:16396:0:0:0
+N-TV:650000:I0C23D0M16B8T2G8Y0:T:27500:273:274:0:0:16401:0:0:0
+N24:778000:I0C23D0M16B8T8G8Y0:T:27500:225:226:0:0:16398:0:0:0
+FAB:650000:I0C23D0M16B8T2G8Y0:T:27500:3073:3074:0:0:16576:0:0:0
diff --git a/channels.h b/channels.h
index 52e79b4..0f6feb1 100644
--- a/channels.h
+++ b/channels.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.h 1.4 2002/11/10 13:01:23 kls Exp $
+ * $Id: channels.h 1.5 2002/11/24 14:27:51 kls Exp $
  */
 
 #ifndef __CHANNELS_H
@@ -35,6 +35,24 @@ extern const tChannelParameterMap TransmissionValues[];
 extern const tChannelParameterMap GuardValues[];
 extern const tChannelParameterMap HierarchyValues[];
 
+struct tChannelID {
+private:
+  int source;
+  int nid;
+  int tid;
+  int sid;
+  int rid;
+public:
+  tChannelID(void) { source = nid = tid = sid = rid = 0; }
+  tChannelID(int Source, int Nid, int Tid, int Sid, int Rid = 0) { source = Source; nid = Nid; tid = Tid; sid = Sid; rid = Rid; }
+  bool operator== (const tChannelID &arg) const;
+  bool Valid(void) { return source && tid && sid; } // nid and rid are optional
+  tChannelID &ClrRid(void) { rid = 0; return *this; }
+  static tChannelID FromString(const char *s);
+  const char *ToString(void);
+  static const tChannelID InvalidID;
+  };
+
 class cChannel : public cListObject {
   friend class cMenuEditChannel;
 private:
@@ -51,7 +69,10 @@ private:
   int dpid1, dpid2;
   int tpid;
   int ca;
+  int nid;
+  int tid;
   int sid;
+  int rid;
   int number;    // Sequence number assigned on load
   bool groupSep;
   char polarization;
@@ -99,9 +120,7 @@ public:
   bool IsCable(void) { return (source & cSource::st_Mask) == cSource::stCable; }
   bool IsSat(void) { return (source & cSource::st_Mask) == cSource::stSat; }
   bool IsTerr(void) { return (source & cSource::st_Mask) == cSource::stTerr; }
-  uint64 GetChannelID(void) const;
-  const char *GetChannelIDStr(void) const;
-  static uint64 StringToChannelID(const char *s);
+  tChannelID GetChannelID(void) const;
   };
 
 class cChannels : public cConfig<cChannel> {
@@ -116,7 +135,7 @@ public:
   void ReNumber(void);         // Recalculate 'number' based on channel type
   cChannel *GetByNumber(int Number, int SkipGap = 0);
   cChannel *GetByServiceID(int Source, unsigned short ServiceID);
-  cChannel *GetByChannelID(uint64 ChannelID);
+  cChannel *GetByChannelID(tChannelID ChannelID, bool TryWithoutRid = false);
   bool HasUniqueChannelID(cChannel *NewChannel, cChannel *OldChannel = NULL);
   bool SwitchTo(int Number);
   int MaxNumber(void) { return maxNumber; }
diff --git a/config.h b/config.h
index af8d92b..0c84ad4 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.139 2002/11/08 13:16:12 kls Exp $
+ * $Id: config.h 1.141 2002/11/24 12:28:20 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,10 +17,9 @@
 #include <time.h>
 #include <unistd.h>
 #include "device.h"
-#include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.16"
+#define VDRVERSION "1.1.17"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/diseqc.conf b/diseqc.conf
index 52222f3..135089e 100644
--- a/diseqc.conf
+++ b/diseqc.conf
@@ -22,9 +22,41 @@
 #   [xx ...]  hex code sequence (max. 6)
 #
 # The 'command...' part is optional.
+#
+# Examples:
+
+# Full DiSEqC sequence:
 
 S19.2E  11700 V  9750  t v W15 [E0 10 38 F0] W15 A W15 t
 S19.2E  99999 V 10600  t v W15 [E0 10 38 F1] W15 A W15 T
 S19.2E  11700 H  9750  t V W15 [E0 10 38 F2] W15 A W15 t
 S19.2E  99999 H 10600  t V W15 [E0 10 38 F3] W15 A W15 T
 
+S21.5E  11700 V  9750  t v W15 [E0 10 38 F4] W15 B W15 t
+S21.5E  99999 V 10600  t v W15 [E0 10 38 F5] W15 B W15 T
+S21.5E  11700 H  9750  t V W15 [E0 10 38 F6] W15 B W15 t
+S21.5E  99999 H 10600  t V W15 [E0 10 38 F7] W15 B W15 T
+
+# Optimized for mini DiSEqC (aka toneburst):
+#
+# S19.2E  11700 V  9750  t v W15 A W15 t
+# S19.2E  99999 V 10600  t v W15 A W15 T
+# S19.2E  11700 H  9750  t V W15 A W15 t
+# S19.2E  99999 H 10600  t V W15 A W15 T
+#
+# S21.5E  11700 V  9750  t v W15 B W15 t
+# S21.5E  99999 V 10600  t v W15 B W15 T
+# S21.5E  11700 H  9750  t V W15 B W15 t
+# S21.5E  99999 H 10600  t V W15 B W15 T
+#
+# Optimized for full DiSEqC:
+#
+# S19.2E  11700 V  9750  [E0 10 38 F0]
+# S19.2E  99999 V 10600  [E0 10 38 F1]
+# S19.2E  11700 H  9750  [E0 10 38 F2]
+# S19.2E  99999 H 10600  [E0 10 38 F3]
+#
+# S21.5E  11700 V  9750  [E0 10 38 F4]
+# S21.5E  99999 V 10600  [E0 10 38 F5]
+# S21.5E  11700 H  9750  [E0 10 38 F6]
+# S21.5E  99999 H 10600  [E0 10 38 F7]
diff --git a/dvbdevice.c b/dvbdevice.c
index 119a28e..3aa9f93 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.35 2002/11/10 12:57:17 kls Exp $
+ * $Id: dvbdevice.c 1.37 2002/11/15 15:17:30 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -33,6 +33,7 @@ extern "C" {
 #include "transfer.h"
 
 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
+#define DO_MULTIPLE_RECORDINGS 1
 
 #define DEV_VIDEO         "/dev/video"
 #define DEV_DVB_ADAPTER   "/dev/dvb/adapter"
@@ -311,11 +312,11 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On)
            pesFilterParams.pes_type= PesTypes[Type];
            pesFilterParams.flags   = DMX_IMMEDIATE_START;
            CHECK(ioctl(Handle->handle, DMX_SET_PES_FILTER, &pesFilterParams));
-           close(Handle->handle);
-           Handle->handle = -1;
            if (PesTypes[Type] == DMX_PES_VIDEO) // let's only do this once
               SetPlayMode(pmNone); // necessary to switch a PID from DMX_PES_VIDEO/AUDIO to DMX_PES_OTHER
            }
+        close(Handle->handle);
+        Handle->handle = -1;
         }
      }
   return true;
@@ -343,6 +344,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
   bool needsDetachReceivers = true;
 
   if (ProvidesSource(Channel->Source()) && ProvidesCa(Channel->Ca())) {
+#ifdef DO_MULTIPLE_RECORDINGS
      if (Receiving()) {
         if (IsTunedTo(Channel)) {
            needsDetachReceivers = false;
@@ -365,6 +367,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
            result = hasPriority;
         }
      else
+#endif
         result = hasPriority;
      }
   if (NeedsDetachReceivers)
@@ -381,11 +384,6 @@ static unsigned int FrequencyToHz(unsigned int f)
 
 bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
 {
-#ifndef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
-  if (HasDecoder())
-     LiveView = true;
-#endif
-
   bool IsEncrypted = Channel->Ca() > CACONFBASE;
 
   bool DoTune = !IsTunedTo(Channel);
@@ -393,10 +391,9 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   bool TurnOffLivePIDs = HasDecoder()
                          && (DoTune
                             || IsEncrypted && pidHandles[ptVideo].pid != Channel->Vpid() // CA channels can only be decrypted in "live" mode
-                            || IsPrimaryDevice()
-                               && (LiveView // for a new live view the old PIDs need to be turned off
-                                  || pidHandles[ptVideo].pid == Channel->Vpid() // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
-                                  )
+                            || !IsPrimaryDevice()
+                            || LiveView // for a new live view the old PIDs need to be turned off
+                            || pidHandles[ptVideo].pid == Channel->Vpid() // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER
                             );
 
   bool StartTransferMode = IsPrimaryDevice() && !IsEncrypted && !DoTune
@@ -409,6 +406,11 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
                            || LiveView
                            );
 
+#ifndef DO_MULTIPLE_RECORDINGS
+  TurnOffLivePIDs = TurnOnLivePIDs = true;
+  StartTransferMode = false;
+#endif
+
   // Stop setting system time:
 
   if (siProcessor)
@@ -634,6 +636,10 @@ void cDvbDevice::SetAudioTrackDevice(int Index)
 
 bool cDvbDevice::CanReplay(void) const
 {
+#ifndef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
+  if (Receiving())
+     return false;
+#endif
   return cDevice::CanReplay() && !Ca(); // we can only replay if there is no Ca recording going on
 }
 
diff --git a/eit.c b/eit.c
index f8b436c..dd51f0c 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.60 2002/11/10 15:50:21 kls Exp $
+ * $Id: eit.c 1.61 2002/11/24 14:37:38 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -180,7 +180,7 @@ bool cTDT::SetSystemTime()
 
 // --- cEventInfo ------------------------------------------------------------
 
-cEventInfo::cEventInfo(uint64 channelid, unsigned short eventid)
+cEventInfo::cEventInfo(tChannelID channelid, unsigned short eventid)
 {
    pTitle = NULL;
    pSubtitle = NULL;
@@ -190,7 +190,7 @@ cEventInfo::cEventInfo(uint64 channelid, unsigned short eventid)
    tTime = 0;
    uTableID = 0;
    uEventID = eventid;
-   uChannelID = channelid;
+   channelID = channelid;
    nChannelNumber = 0;
 }
 
@@ -325,15 +325,15 @@ void cEventInfo::SetEventID(unsigned short evid)
    uEventID = evid;
 }
 /**  */
-void cEventInfo::SetChannelID(uint64 channelid)
+void cEventInfo::SetChannelID(tChannelID channelid)
 {
-   uChannelID = channelid;
+   channelID = channelid;
 }
 
 /**  */
-uint64 cEventInfo::GetChannelID() const
+tChannelID cEventInfo::GetChannelID() const
 {
-   return uChannelID;
+   return channelID;
 }
 
 /**  */
@@ -404,13 +404,13 @@ bool cEventInfo::Read(FILE *f, cSchedule *Schedule)
 struct tEpgBugFixStats {
   int hits;
   int n;
-  uint64 channelIDs[MAXEPGBUGFIXCHANS];
+  tChannelID channelIDs[MAXEPGBUGFIXCHANS];
   tEpgBugFixStats(void) { hits = n = 0; }
   };
 
 tEpgBugFixStats EpgBugFixStats[MAXEPGBUGFIXSTATS];
 
-static void EpgBugFixStat(int Number, uint64 ChannelID)
+static void EpgBugFixStat(int Number, tChannelID ChannelID)
 {
   if (0 <= Number && Number < MAXEPGBUGFIXSTATS) {
      tEpgBugFixStats *p = &EpgBugFixStats[Number];
@@ -448,7 +448,7 @@ static void ReportEpgBugFixStats(bool Reset = false)
             char *q = buffer;
             q += snprintf(q, sizeof(buffer) - (q - buffer), "%d\t%d", i, p->hits);
             for (int c = 0; c < p->n; c++) {
-                cChannel *channel = Channels.GetByChannelID(p->channelIDs[c]);
+                cChannel *channel = Channels.GetByChannelID(p->channelIDs[c], true);
                 if (channel) {
                    q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name());
                    delim = ", ";
@@ -608,10 +608,10 @@ void cEventInfo::FixEpgBugs(void)
 
 // --- cSchedule -------------------------------------------------------------
 
-cSchedule::cSchedule(uint64 channelid)
+cSchedule::cSchedule(tChannelID channelid)
 {
    pPresent = pFollowing = NULL;
-   uChannelID = channelid;
+   channelID = channelid;
 }
 
 
@@ -645,14 +645,14 @@ const cEventInfo *cSchedule::GetFollowingEvent(void) const
   return pe;
 }
 
-void cSchedule::SetChannelID(uint64 channelid)
+void cSchedule::SetChannelID(tChannelID channelid)
 {
-   uChannelID = channelid;
+   channelID = channelid;
 }
 /**  */
-uint64 cSchedule::GetChannelID() const
+tChannelID cSchedule::GetChannelID() const
 {
-   return uChannelID;
+   return channelID;
 }
 /**  */
 const cEventInfo * cSchedule::GetEvent(unsigned short uEventID, time_t tTime) const
@@ -735,10 +735,10 @@ void cSchedule::Cleanup(time_t tTime)
 /**  */
 void cSchedule::Dump(FILE *f, const char *Prefix) const
 {
-   cChannel *channel = Channels.GetByChannelID(uChannelID);
+   cChannel *channel = Channels.GetByChannelID(channelID, true);
    if (channel)
    {
-      fprintf(f, "%sC %s %s\n", Prefix, channel->GetChannelIDStr(), channel->Name());
+      fprintf(f, "%sC %s %s\n", Prefix, channel->GetChannelID().ToString(), channel->Name());
       for (cEventInfo *p = Events.First(); p; p = Events.Next(p))
          p->Dump(f, Prefix);
       fprintf(f, "%sc\n", Prefix);
@@ -756,9 +756,9 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
               if (p)
                  *p = 0; // strips optional channel name
               if (*s) {
-                 uint64 uChannelID = cChannel::StringToChannelID(s);
-                 if (uChannelID) {
-                    cSchedule *p = (cSchedule *)Schedules->AddChannelID(uChannelID);
+                 tChannelID channelID = tChannelID::FromString(s);
+                 if (channelID.Valid()) {
+                    cSchedule *p = (cSchedule *)Schedules->AddChannelID(channelID);
                     if (p) {
                        if (!cEventInfo::Read(f, p))
                           return false;
@@ -785,14 +785,13 @@ bool cSchedule::Read(FILE *f, cSchedules *Schedules)
 cSchedules::cSchedules()
 {
    pCurrentSchedule = NULL;
-   uCurrentChannelID = 0;
 }
 
 cSchedules::~cSchedules()
 {
 }
 /**  */
-const cSchedule *cSchedules::AddChannelID(uint64 channelid)
+const cSchedule *cSchedules::AddChannelID(tChannelID channelid)
 {
   const cSchedule *p = GetSchedule(channelid);
   if (!p) {
@@ -802,11 +801,12 @@ const cSchedule *cSchedules::AddChannelID(uint64 channelid)
   return p;
 }
 /**  */
-const cSchedule *cSchedules::SetCurrentChannelID(uint64 channelid)
+const cSchedule *cSchedules::SetCurrentChannelID(tChannelID channelid)
 {
+  channelid.ClrRid();
   pCurrentSchedule = AddChannelID(channelid);
   if (pCurrentSchedule)
-     uCurrentChannelID = channelid;
+     currentChannelID = channelid;
   return pCurrentSchedule;
 }
 /**  */
@@ -815,10 +815,11 @@ const cSchedule * cSchedules::GetSchedule() const
    return pCurrentSchedule;
 }
 /**  */
-const cSchedule * cSchedules::GetSchedule(uint64 channelid) const
+const cSchedule * cSchedules::GetSchedule(tChannelID channelid) const
 {
    cSchedule *p;
 
+   channelid.ClrRid();
    p = First();
    while (p != NULL)
    {
@@ -905,7 +906,8 @@ int cEIT::ProcessEIT(unsigned char *buffer, int CurrentSource)
       for (VdrProgramInfo = (struct VdrProgramInfo *) VdrProgramInfos->Head; VdrProgramInfo; VdrProgramInfo = (struct VdrProgramInfo *) xSucc (VdrProgramInfo)) {
           //XXX TODO use complete channel ID
           cChannel *channel = Channels.GetByServiceID(CurrentSource, VdrProgramInfo->ServiceID);
-          uint64 channelID = channel ? channel->GetChannelID() : (uint64(CurrentSource) << 48) | VdrProgramInfo->ServiceID;
+          tChannelID channelID = channel ? channel->GetChannelID() : tChannelID(CurrentSource, 0, 0, VdrProgramInfo->ServiceID);
+          channelID.ClrRid();
           //XXX
           pSchedule = (cSchedule *)schedules->GetSchedule(channelID);
           if (!pSchedule) {
@@ -915,7 +917,7 @@ int cEIT::ProcessEIT(unsigned char *buffer, int CurrentSource)
                 break;
              }
           if (VdrProgramInfo->ReferenceServiceID) {
-             rSchedule = (cSchedule *)schedules->GetSchedule((uint64(CurrentSource) << 48) | VdrProgramInfo->ReferenceServiceID);
+             rSchedule = (cSchedule *)schedules->GetSchedule(tChannelID(CurrentSource, 0, 0, VdrProgramInfo->ReferenceServiceID));
              if (!rSchedule)
                 break;
              rEvent = (cEventInfo *)rSchedule->GetEvent((unsigned short)VdrProgramInfo->ReferenceEventID);
@@ -1270,7 +1272,7 @@ void cSIProcessor::SetCurrentTransponder(int CurrentSource, int CurrentTranspond
 }
 
 /** */
-bool cSIProcessor::SetCurrentChannelID(uint64 channelid)
+bool cSIProcessor::SetCurrentChannelID(tChannelID channelid)
 {
   cMutexLock MutexLock(&schedulesMutex);
   return schedules ? schedules->SetCurrentChannelID(channelid) : false;
diff --git a/eit.h b/eit.h
index d906725..36c0a3e 100644
--- a/eit.h
+++ b/eit.h
@@ -16,12 +16,13 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.21 2002/11/10 12:58:27 kls Exp $
+ * $Id: eit.h 1.22 2002/11/24 12:45:55 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
 #define __EIT_H
 
+#include "channels.h"
 #include "thread.h"
 #include "tools.h"
 
@@ -32,7 +33,7 @@ class cEventInfo : public cListObject {
   friend class cEIT;
 private:
   unsigned char uTableID;           // Table ID this event came from
-  uint64 uChannelID;                // Channel ID of program for that event
+  tChannelID channelID;             // Channel ID of program for that event
   bool bIsFollowing;                // true if this is the next event on this channel
   bool bIsPresent;                  // true if this is the present event running
   char *pExtendedDescription;       // Extended description of this event
@@ -47,13 +48,13 @@ protected:
   void SetFollowing(bool foll);
   void SetPresent(bool pres);
   void SetTitle(const char *string);
-  void SetChannelID(uint64 channelid);
+  void SetChannelID(tChannelID channelid);
   void SetEventID(unsigned short evid);
   void SetDuration(long l);
   void SetTime(time_t t);
   void SetExtendedDescription(const char *string);
   void SetSubtitle(const char *string);
-  cEventInfo(uint64 channelid, unsigned short eventid);
+  cEventInfo(tChannelID channelid, unsigned short eventid);
 public:
   ~cEventInfo();
   const unsigned char GetTableID(void) const;
@@ -68,7 +69,7 @@ public:
   unsigned short GetEventID(void) const;
   long GetDuration(void) const;
   time_t GetTime(void) const;
-  uint64 GetChannelID(void) const;
+  tChannelID GetChannelID(void) const;
   int GetChannelNumber(void) const { return nChannelNumber; }
   void SetChannelNumber(int ChannelNumber) const { ((cEventInfo *)this)->nChannelNumber = ChannelNumber; } // doesn't modify the EIT data, so it's ok to make it 'const'
   void Dump(FILE *f, const char *Prefix = "") const;
@@ -82,21 +83,21 @@ class cSchedule : public cListObject  {
 private:
   cEventInfo *pPresent;
   cEventInfo *pFollowing;
-  uint64 uChannelID;
+  tChannelID channelID;
   cList<cEventInfo> Events;
 protected:
-  void SetChannelID(uint64 channelid);
+  void SetChannelID(tChannelID channelid);
   bool SetFollowingEvent(cEventInfo *pEvent);
   bool SetPresentEvent(cEventInfo *pEvent);
   void Cleanup(time_t tTime);
   void Cleanup(void);
-  cSchedule(uint64 channelid = 0);
+  cSchedule(tChannelID channelid = tChannelID::InvalidID);
 public:
   ~cSchedule();
   cEventInfo *AddEvent(cEventInfo *EventInfo);
   const cEventInfo *GetPresentEvent(void) const;
   const cEventInfo *GetFollowingEvent(void) const;
-  uint64 GetChannelID(void) const;
+  tChannelID GetChannelID(void) const;
   const cEventInfo *GetEvent(unsigned short uEventID, time_t tTime = 0) const;
   const cEventInfo *GetEventAround(time_t tTime) const;
   const cEventInfo *GetEventNumber(int n) const { return Events.Get(n); }
@@ -110,15 +111,15 @@ class cSchedules : public cList<cSchedule> {
   friend class cSIProcessor;
 private:
   const cSchedule *pCurrentSchedule;
-  uint64 uCurrentChannelID;
+  tChannelID currentChannelID;
 protected:
-  const cSchedule *AddChannelID(uint64 channelid);
-  const cSchedule *SetCurrentChannelID(uint64 channelid);
+  const cSchedule *AddChannelID(tChannelID channelid);
+  const cSchedule *SetCurrentChannelID(tChannelID channelid);
   void Cleanup();
 public:
   cSchedules(void);
   ~cSchedules();
-  const cSchedule *GetSchedule(uint64 channelid) const;
+  const cSchedule *GetSchedule(tChannelID channelid) const;
   const cSchedule *GetSchedule(void) const;
   void Dump(FILE *f, const char *Prefix = "") const;
   static bool Read(FILE *f);
@@ -162,7 +163,7 @@ public:
   static void Clear(void);
   void SetStatus(bool On);
   void SetCurrentTransponder(int CurrentSource, int CurrentTransponder);
-  static bool SetCurrentChannelID(uint64 channelid);
+  static bool SetCurrentChannelID(tChannelID channelid);
   static void TriggerDump(void);
   };
 
diff --git a/menu.c b/menu.c
index 2e29b02..0210e2d 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.224 2002/11/10 16:05:15 kls Exp $
+ * $Id: menu.c 1.226 2002/11/24 14:34:41 kls Exp $
  */
 
 #include "menu.h"
@@ -582,6 +582,11 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem( tr("Tpid"),         &data.tpid,  0, 0x1FFF));
   Add(new cMenuEditCaItem(  tr("CA"),           &data.ca, true));
   Add(new cMenuEditIntItem( tr("Sid"),          &data.sid, 0));
+  /* XXX not yet used
+  Add(new cMenuEditIntItem( tr("Nid"),          &data.nid, 0));
+  Add(new cMenuEditIntItem( tr("Tid"),          &data.tid, 0));
+  Add(new cMenuEditIntItem( tr("Rid"),          &data.rid, 0));
+  XXX*/
   // Parameters for specific types of sources:
   ST(" S ")  Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
   ST("CS ")  Add(new cMenuEditIntItem( tr("Srate"),        &data.srate));
@@ -1089,7 +1094,7 @@ cMenuEvent::cMenuEvent(const cEventInfo *EventInfo, bool CanSwitch)
 {
   eventInfo = EventInfo;
   if (eventInfo) {
-     cChannel *channel = Channels.GetByChannelID(eventInfo->GetChannelID());
+     cChannel *channel = Channels.GetByChannelID(eventInfo->GetChannelID(), true);
      if (channel) {
         char *buffer;
         asprintf(&buffer, "%-17.*s\t%.*s  %s - %s", 17, channel->Name(), 5, eventInfo->GetDate(), eventInfo->GetTimeString(), eventInfo->GetEndTimeString());
@@ -1183,7 +1188,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
 
         pArray[num] = Now ? Schedule->GetPresentEvent() : Schedule->GetFollowingEvent();
         if (pArray[num]) {
-           cChannel *channel = Channels.GetByChannelID(pArray[num]->GetChannelID());
+           cChannel *channel = Channels.GetByChannelID(pArray[num]->GetChannelID(), true);
            if (channel) {
               pArray[num]->SetChannelNumber(channel->Number());
               num++;
@@ -1213,7 +1218,7 @@ eOSState cMenuWhatsOn::Switch(void)
 {
   cMenuWhatsOnItem *item = (cMenuWhatsOnItem *)Get(Current());
   if (item) {
-     cChannel *channel = Channels.GetByChannelID(item->eventInfo->GetChannelID());
+     cChannel *channel = Channels.GetByChannelID(item->eventInfo->GetChannelID(), true);
      if (channel && cDevice::PrimaryDevice()->SwitchChannel(channel, true))
         return osEnd;
      }
@@ -1397,7 +1402,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
                         if (!now && !next) {
                            int ChannelNr = 0;
                            if (Count()) {
-                              cChannel *channel = Channels.GetByChannelID(((cMenuScheduleItem *)Get(Current()))->eventInfo->GetChannelID());
+                              cChannel *channel = Channels.GetByChannelID(((cMenuScheduleItem *)Get(Current()))->eventInfo->GetChannelID(), true);
                               if (channel)
                                  ChannelNr = channel->Number();
                               }
@@ -1424,7 +1429,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
      now = next = false;
      const cEventInfo *ei = cMenuWhatsOn::ScheduleEventInfo();
      if (ei) {
-        cChannel *channel = Channels.GetByChannelID(ei->GetChannelID());
+        cChannel *channel = Channels.GetByChannelID(ei->GetChannelID(), true);
         if (channel) {
            PrepareSchedule(channel);
            if (channel->Number() != cDevice::CurrentChannel()) {
@@ -2176,6 +2181,8 @@ cMenuPluginItem::cMenuPluginItem(const char *Name, int Index)
 #define STOP_RECORDING tr(" Stop recording ")
 #define ON_PRIMARY_INTERFACE tr("on primary interface")
 
+cOsdObject *cMenuMain::pluginOsdObject = NULL;
+
 cMenuMain::cMenuMain(bool Replaying, eOSState State)
 :cOsdMenu("")
 {
@@ -2195,6 +2202,13 @@ cMenuMain::cMenuMain(bool Replaying, eOSState State)
     }
 }
 
+cOsdObject *cMenuMain::PluginOsdObject(void)
+{
+  cOsdObject *o = pluginOsdObject;
+  pluginOsdObject = NULL;
+  return o;
+}
+
 void cMenuMain::Set(void)
 {
   Clear();
@@ -2308,9 +2322,15 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
                          if (item) {
                             cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex());
                             if (p) {
-                               cOsdMenu *menu = p->MainMenuAction();
-                               if (menu)
-                                  return AddSubMenu(menu);
+                               cOsdObject *menu = p->MainMenuAction();
+                               if (menu) {
+                                  if (menu->IsMenu())
+                                     return AddSubMenu((cOsdMenu *)menu);
+                                  else {
+                                     pluginOsdObject = menu;
+                                     return osPlugin;
+                                     }
+                                  }
                                }
                             }
                          state = osEnd;
diff --git a/menu.h b/menu.h
index be70e53..ae7d0a9 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.49 2002/10/27 12:04:49 kls Exp $
+ * $Id: menu.h 1.50 2002/11/23 14:51:32 kls Exp $
  */
 
 #ifndef __MENU_H
@@ -20,10 +20,12 @@ class cMenuMain : public cOsdMenu {
 private:
   time_t lastActivity;
   bool replaying;
+  static cOsdObject *pluginOsdObject;
   void Set(void);
 public:
   cMenuMain(bool Replaying, eOSState State = osUnknown);
   virtual eOSState ProcessKey(eKeys Key);
+  static cOsdObject *PluginOsdObject(void);
   };
 
 class cDisplayChannel : public cOsdObject {
diff --git a/newplugin b/newplugin
index a5004dc..22830b7 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.11 2002/11/01 13:43:50 kls Exp $
+# $Id: newplugin 1.12 2002/11/23 15:00:35 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -165,7 +165,7 @@ public:
   virtual bool Start(void);
   virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
-  virtual cOsdMenu *MainMenuAction(void);
+  virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
   };
@@ -205,7 +205,7 @@ void cPlugin${PLUGIN_CLASS}::Housekeeping(void)
   // Perform any cleanup or other regular tasks.
 }
 
-cOsdMenu *cPlugin${PLUGIN_CLASS}::MainMenuAction(void)
+cOsdObject *cPlugin${PLUGIN_CLASS}::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
   return NULL;
diff --git a/osd.c b/osd.c
index 8324874..eb0d2dc 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.37 2002/11/10 12:30:09 kls Exp $
+ * $Id: osd.c 1.38 2002/11/16 14:20:26 kls Exp $
  */
 
 #include "osd.h"
@@ -316,6 +316,7 @@ eOSState cOsdItem::ProcessKey(eKeys Key)
 
 cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
 {
+  isMenu = true;
   digit = 0;
   hasHotkeys = false;
   visible = false;
diff --git a/osd.h b/osd.h
index 9fb515b..2cd2f4b 100644
--- a/osd.h
+++ b/osd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.h 1.36 2002/11/10 12:28:57 kls Exp $
+ * $Id: osd.h 1.37 2002/11/24 10:32:29 kls Exp $
  */
 
 #ifndef __OSD_H
@@ -110,14 +110,19 @@ public:
   };
 
 class cOsdObject {
+  friend class cOsdMenu;
+private:
+  bool isMenu;
 protected:
   bool needsFastResponse;
 public:
-  cOsdObject(bool FastResponse = false) { needsFastResponse = FastResponse; }
+  cOsdObject(bool FastResponse = false) { isMenu = false; needsFastResponse = FastResponse; }
   virtual ~cOsdObject() {}
   int Width(void) { return Interface->Width(); }
   int Height(void) { return Interface->Height(); }
   bool NeedsFastResponse(void) { return needsFastResponse; }
+  bool IsMenu(void) { return isMenu; }
+  virtual void Show(void) {}
   virtual eOSState ProcessKey(eKeys Key) { return osUnknown; }
   };
 
diff --git a/plugin.c b/plugin.c
index 8d4d4cb..5b8bc5f 100644
--- a/plugin.c
+++ b/plugin.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.c 1.7 2002/08/11 11:21:00 kls Exp $
+ * $Id: plugin.c 1.8 2002/11/16 14:22:37 kls Exp $
  */
 
 #include "plugin.h"
@@ -64,7 +64,7 @@ const char *cPlugin::MainMenuEntry(void)
   return NULL;
 }
 
-cOsdMenu *cPlugin::MainMenuAction(void)
+cOsdObject *cPlugin::MainMenuAction(void)
 {
   return NULL;
 }
diff --git a/plugin.h b/plugin.h
index 0b62e8b..d3e26d6 100644
--- a/plugin.h
+++ b/plugin.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: plugin.h 1.4 2002/05/13 15:32:14 kls Exp $
+ * $Id: plugin.h 1.5 2002/11/16 14:22:24 kls Exp $
  */
 
 #ifndef __PLUGIN_H
@@ -37,7 +37,7 @@ public:
   virtual void Housekeeping(void);
 
   virtual const char *MainMenuEntry(void);
-  virtual cOsdMenu *MainMenuAction(void);
+  virtual cOsdObject *MainMenuAction(void);
 
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
diff --git a/timers.c b/timers.c
index 6044522..8e2bead 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.c 1.2 2002/11/10 10:19:12 kls Exp $
+ * $Id: timers.c 1.3 2002/11/24 14:29:21 kls Exp $
  */
 
 #include "timers.h"
@@ -49,7 +49,7 @@ cTimer::cTimer(const cEventInfo *EventInfo)
   startTime = stopTime = 0;
   recording = pending = false;
   active = true;
-  channel = Channels.GetByChannelID(EventInfo->GetChannelID());
+  channel = Channels.GetByChannelID(EventInfo->GetChannelID(), true);
   time_t tstart = EventInfo->GetTime();
   time_t tstop = tstart + EventInfo->GetDuration() + Setup.MarginStop * 60;
   tstart -= Setup.MarginStart * 60;
@@ -97,7 +97,7 @@ const char *cTimer::ToText(bool UseChannelID)
   free(buffer);
   strreplace(file, ':', '|');
   strreplace(summary, '\n', '|');
-  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", active, UseChannelID ? Channel()->GetChannelIDStr() : itoa(Channel()->Number()), PrintDay(day, firstday), start, stop, priority, lifetime, file, summary ? summary : "");
+  asprintf(&buffer, "%d:%s:%s:%04d:%04d:%d:%d:%s:%s\n", active, UseChannelID ? Channel()->GetChannelID().ToString() : itoa(Channel()->Number()), PrintDay(day, firstday), start, stop, priority, lifetime, file, summary ? summary : "");
   strreplace(summary, '|', '\n');
   strreplace(file, '|', ':');
   return buffer;
@@ -216,8 +216,8 @@ bool cTimer::Parse(const char *s)
      strn0cpy(file, filebuffer, MaxFileName);
      strreplace(file, '|', ':');
      strreplace(summary, '|', '\n');
-     uint64 cid = cChannel::StringToChannelID(channelbuffer);
-     channel = cid ? Channels.GetByChannelID(cid) : Channels.GetByNumber(atoi(channelbuffer));
+     tChannelID cid = tChannelID::FromString(channelbuffer);
+     channel = cid.Valid() ? Channels.GetByChannelID(cid) : Channels.GetByNumber(atoi(channelbuffer));
      if (!channel) {
         esyslog("ERROR: channel %s not defined", channelbuffer);
         result = false;
diff --git a/timers.h b/timers.h
index 933c88e..3d30888 100644
--- a/timers.h
+++ b/timers.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: timers.h 1.2 2002/11/10 10:17:05 kls Exp $
+ * $Id: timers.h 1.3 2002/11/24 11:50:56 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -12,6 +12,7 @@
 
 #include "channels.h"
 #include "config.h"
+#include "eit.h"
 #include "tools.h"
 
 enum eTimerActive { taInactive = 0,
diff --git a/tools.c b/tools.c
index 68bfb7e..c34a621 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.73 2002/11/09 15:33:47 kls Exp $
+ * $Id: tools.c 1.75 2002/11/24 16:04:57 kls Exp $
  */
 
 #include "tools.h"
@@ -235,6 +235,8 @@ void delay_ms(int ms)
 
 bool isnumber(const char *s)
 {
+  if (!*s)
+     return false;
   while (*s) {
         if (!isdigit(*s))
            return false;
@@ -720,7 +722,7 @@ bool cLockFile::Lock(int WaitSeconds)
            if (errno == EEXIST) {
               struct stat fs;
               if (stat(fileName, &fs) == 0) {
-                 if (time(NULL) - fs.st_mtime > LOCKFILESTALETIME) {
+                 if (abs(time(NULL)) - fs.st_mtime > LOCKFILESTALETIME) {
                     esyslog("ERROR: removing stale lock file '%s'", fileName);
                     if (remove(fileName) < 0) {
                        LOG_ERROR_STR(fileName);
diff --git a/vdr.1 b/vdr.1
index 06c0b84..a1ad9b1 100644
--- a/vdr.1
+++ b/vdr.1
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.4 2002/05/09 16:04:17 kls Exp $
+.\" $Id: vdr.1 1.6 2002/11/24 16:36:37 kls Exp $
 .\"
-.TH vdr 1 "9 May 2002" "1.1.0" "Video Disk Recorder"
+.TH vdr 1 "24 Nov 2002" "1.1.0" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
@@ -67,6 +67,8 @@ Set logging to \fIlevel\fR.
 \fB0\fR\ =\ no logging, \fB1\fR\ =\ errors only,
 \fB2\fR\ =\ errors and info, \fB3\fR\ =\ errors, info and debug.
 The default logging level is \fB3\fR.
+If logging should be done to LOG_LOCALn instead of
+LOG_USER, add '.n' to LEVEL, as in 3.7 (n=0..7).
 .TP
 .BI -L\  dir ,\ --lib= dir
 Search for plugins in directory \fIdir\fR (default is ./PLUGINS/lib).
diff --git a/vdr.5 b/vdr.5
index 9720a65..02b5b64 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.12 2002/11/10 10:10:15 kls Exp $
+.\" $Id: vdr.5 1.14 2002/11/24 16:36:48 kls Exp $
 .\"
-.TH vdr 5 "10 Nov 2002" "1.2.0" "Video Disk Recorder Files"
+.TH vdr 5 "24 Nov 2002" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -38,7 +38,7 @@ The given number must be larger than the number of any previous channel
 A \fBchannel definition\fR is a line with channel data, where the fields
 are separated by ':' characters. Example:
 
-\fBRTL:12188:h:S19.2E:27500:163:104:105:0:12003\fR
+\fBRTL:12188:h:S19.2E:27500:163:104:105:0:12003:0:0:0\fR
 
 The line number of a channel definition (not counting group separators,
 and based on a possible previous '@...' parameter)
@@ -119,16 +119,27 @@ l l.
 .TE
 .TP
 .B SID
-The service ID of this channel.
+The Service ID of this channel.
+.TP
+.B NID
+The Network ID of this channel (for future use, currently always 0).
+.TP
+.B TID
+The Transport stream ID of this channel (for future use, currently always 0).
+.TP
+.B RID
+The Radio ID of this channel (typically 0, may be used to distinguish channels where
+NID, TID and SID are all equal).
 .PP
 A particular channel can be uniquely identified by its \fBchannel\ ID\fR,
 which is a string that looks like this:
 
-\fBS19.2E-0-12188-12003\fR
+\fBS19.2E-0-12188-12003-0\fR
 
 The components of this string are the \fBSource\fR (S19.2E), \fBFrequency\fR
-(12188, MHz) and \fBSID\fR (12003) as defined above. The part that is currently
-\fB0\fR is reserved for future use.
+(12188, MHz) and \fBSID\fR (12003) as defined above. The parts that are currently
+\fB0\fR are reserved for future use (the last part can be omitted if it is \fB0\fR,
+so the above example could also be written as \fBS19.2E-0-12188-12003\fR).
 .br
 The \fBchannel\ ID\fR is used in the \fItimers.conf\fR and \fIepg.data\fR
 files to properly identify the channels.
diff --git a/vdr.c b/vdr.c
index 1285ae7..d27f302 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.132 2002/11/03 13:54:39 kls Exp $
+ * $Id: vdr.c 1.134 2002/11/24 15:50:16 kls Exp $
  */
 
 #include <getopt.h>
@@ -93,6 +93,7 @@ int main(int argc, char *argv[])
   bool DisplayHelp = false;
   bool DisplayVersion = false;
   bool DaemonMode = false;
+  int SysLogTarget = LOG_USER;
   bool MuteAudio = false;
   int WatchdogTimeout = DEFAULTWATCHDOG;
   const char *Terminal = NULL;
@@ -142,15 +143,31 @@ int main(int argc, char *argv[])
                     break;
           case 'h': DisplayHelp = true;
                     break;
-          case 'l': if (isnumber(optarg)) {
-                       int l = atoi(optarg);
-                       if (0 <= l && l <= 3) {
-                          SysLogLevel = l;
-                          break;
-                          }
-                       }
+          case 'l': {
+                      char *p = strchr(optarg, '.');
+                      if (p)
+                         *p = 0;
+                      if (isnumber(optarg)) {
+                         int l = atoi(optarg);
+                         if (0 <= l && l <= 3) {
+                            SysLogLevel = l;
+                            if (!p)
+                               break;
+                            if (isnumber(p + 1)) {
+                               int l = atoi(optarg);
+                               if (0 <= l && l <= 7) {
+                                  int targets[] = { LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7 };
+                                  SysLogTarget = targets[l];
+                                  break;
+                                  }
+                               }
+                            }
+                         }
+                    if (p)
+                       *p = '.';
                     fprintf(stderr, "vdr: invalid log level: %s\n", optarg);
                     return 2;
+                    }
                     break;
           case 'L': if (access(optarg, R_OK | X_OK) == 0)
                        PluginManager.SetDirectory(optarg);
@@ -182,8 +199,7 @@ int main(int argc, char *argv[])
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;
                     break;
-          case 'w': if (isnumber(optarg)) {
-                       int t = atoi(optarg);
+          case 'w': if (isnumber(optarg)) { int t = atoi(optarg);
                        if (t >= 0) {
                           WatchdogTimeout = t;
                           break;
@@ -219,6 +235,8 @@ int main(int argc, char *argv[])
                "  -l LEVEL, --log=LEVEL    set log level (default: 3)\n"
                "                           0 = no logging, 1 = errors only,\n"
                "                           2 = errors and info, 3 = errors, info and debug\n"
+               "                           if logging should be done to LOG_LOCALn instead of\n"
+               "                           LOG_USER, add '.n' to LEVEL, as in 3.7 (n=0..7)\n"
                "  -L DIR,   --lib=DIR      search for plugins in DIR (default is %s)\n"
                "  -m,       --mute         mute audio of the primary DVB device at startup\n"
                "  -p PORT,  --port=PORT    use PORT for SVDRP (default: %d)\n"
@@ -264,7 +282,7 @@ int main(int argc, char *argv[])
   // Log file:
 
   if (SysLogLevel > 0)
-     openlog("vdr", LOG_PID | LOG_CONS, LOG_USER);
+     openlog("vdr", LOG_PID | LOG_CONS, SysLogTarget);
 
   // Check the video directory:
 
@@ -551,6 +569,11 @@ int main(int argc, char *argv[])
                             Interface->Info(tr("Switching primary DVB..."));
                             cDevice::SetPrimaryDevice(Setup.PrimaryDVB);
                             break;
+             case osPlugin: DELETENULL(Menu);
+                            Menu = Temp = cMenuMain::PluginOsdObject();
+                            if (Menu)
+                               Menu->Show();
+                            break;
              case osBack:
              case osEnd:    if (Interact == Menu)
                                DELETENULL(Menu);