Version 1.1.11vdr-1.1.11

- Fixed an incomplete initialization of the filter parameters in eit.c (thanks
  to Jeremy Hall).
- Fixed the 'newplugin' script for use with the NEWSTRUCT driver (thanks to
  Andreas Schultz for reporting this one). If you have already created a plugin
  directory and Makefile with 'newplugin', please apply the following patch to it:

  -------------------------------------------------------
  --- Makefile    2002/06/10 16:24:06     1.4
  +++ Makefile    2002/09/17 15:36:36     1.5
  @@ -15,7 +15,12 @@

   ### The directory environment:

  +ifdef NEWSTRUCT
  +DVBDIR = ../../../../DVB/include
  +DEFINES += -DNEWSTRUCT
  +else
   DVBDIR = ../../../../DVB/ost/include
  +endif
   VDRDIR = ../../..
   VDRINC = $(VDRDIR)/include
   LIBDIR = ../../lib
  @@ -34,7 +39,7 @@

   INCLUDES = -I$(VDRINC) -I$(DVBDIR)

  -DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

   ### The object files (add further files here):
  -------------------------------------------------------

  This is the diff for the 'setup' example that comes with VDR, so your line
  numbers may be different.
- Added a missing 'public' keyword in device.h (thanks to Martin Hammerschmid).
- Fixed a race condition when starting 'Transfer Mode'.
- Rearranged the remote control key handling to allow plugins to implement
  additional types of remote controls (see PLUGINS.html, section "Remote Control").
  The previously used files 'keys.conf' and 'keys-pc.conf' have been replaced
  by the file 'remote.conf', which holds the key definitions of all remote controls.
- The LIRC remote control keys are now handled just like the keyboard and RCU keys.
  This means that you can use the lircd.conf file as is for your remote control,
  without the need of editing it to make the key names the same as used in VDR.
  When first starting VDR it will go into the "Learning keys" mode and ask you
  to press the various keys. The resulting key assignment will be stored in
  the file 'remote.conf'.
  Since I have no way of testing the LIRC support, I hope I didn't break it in
  the process...
- While learning the remote control keys it is now possible to press the 'Menu'
  key to skip the definition of keys that are not available on your particular
  RC unit.
- Fixed handling DVD subtitles in the SPU decoder (thanks to Andreas Schultz).
- Avoiding restarts due to 'panic level' when switching channels on the primary
  device during EPG scan.

1 files changed, 19 insertions, 20 deletions

diff --git a/vdr.c b/vdr.c
index 1f38af4..fd23ae1 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.123 2002/09/15 11:08:35 kls Exp $
+ * $Id: vdr.c 1.124 2002/09/29 12:55:03 kls Exp $
  */
 
 #include <getopt.h>
@@ -37,19 +37,16 @@
 #include "eitscan.h"
 #include "i18n.h"
 #include "interface.h"
+#include "keys.h"
+#include "lirc.h"
 #include "menu.h"
 #include "osd.h"
 #include "plugin.h"
+#include "rcu.h"
 #include "recording.h"
 #include "tools.h"
 #include "videodir.h"
 
-#ifdef REMOTE_KBD
-#define KEYS_CONF "keys-pc.conf"
-#else
-#define KEYS_CONF "keys.conf"
-#endif
-
 #define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
 #define SHUTDOWNWAIT   300 // seconds to wait in user prompt before automatic shutdown
 #define MANUALSTART    600 // seconds the next timer must be in the future to assume manual start
@@ -319,11 +316,7 @@ int main(int argc, char *argv[])
   Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
   SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
   CaDefinitions.Load(AddDirectory(ConfigDirectory, "ca.conf"), true);
-#if defined(REMOTE_LIRC)
-  Keys.SetDummyValues();
-#elif !defined(REMOTE_NONE)
-  bool KeysLoaded = Keys.Load(AddDirectory(ConfigDirectory, KEYS_CONF));
-#endif
+  Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));
 
   // DVB interfaces:
 
@@ -350,6 +343,20 @@ int main(int argc, char *argv[])
 
   cOsd::Initialize();
 
+  // User interface:
+
+  Interface = new cInterface(SVDRPport);
+
+  // Remote Controls:
+#if defined(REMOTE_RCU)
+  new cRcuRemote("/dev/ttyS1");
+#elif defined(REMOTE_LIRC)
+  new cLircRemote("/dev/lircd");
+#elif defined(REMOTE_KBD)
+  new cKbdRemote;
+#endif
+  Interface->LearnKeys();
+
   // Channel:
 
   Channels.SwitchTo(Setup.CurrentChannel);
@@ -360,14 +367,6 @@ int main(int argc, char *argv[])
 
   cEITScanner EITScanner;
 
-  // User interface:
-
-  Interface = new cInterface(SVDRPport);
-#if !defined(REMOTE_LIRC) && !defined(REMOTE_NONE)
-  if (!KeysLoaded)
-     Interface->LearnKeys();
-#endif
-
   // Signal handlers:
 
   if (signal(SIGHUP,  SignalHandler) == SIG_IGN) signal(SIGHUP,  SIG_IGN);