New compile time option REMOTE=NONE

4 files changed, 14 insertions, 8 deletions

diff --git a/HISTORY b/HISTORY
index 4f95d2ad..ed881e07 100644
--- a/HISTORY
+++ b/HISTORY
@@ -350,7 +350,7 @@ Video Disk Recorder Revision History
 - Encrypted channels can now be selected even without knowing the PNR (however, it
   is still necessary for the EPG info).
 
-2001-01-27: Version 0.71
+2001-02-02: Version 0.71
 
 - Fixed 'Transfer Mode' in cases where a non-primary interface was switched to
   a channel that only the primary interface can receive (which could happen in
@@ -359,3 +359,6 @@ Video Disk Recorder Revision History
   second channel).
 - Reacitvated setting the PNR.
 - Adapted the frame scanning to the new muxing of the driver.
+- The new compile time option REMOTE=NONE can be used to compile VDR without
+  any remote control support (for applications where it shall be controlled
+  exclusively via SVDRP).
diff --git a/INSTALL b/INSTALL
index e2a67a0f..95379dc2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -38,6 +38,7 @@ following values 'make' call to activate the respective control mode:
                 (see http://www.cadsoft.de/people/kls/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)
 
 Adding "DEBUG_OSD=1" will use the PC screen (or current window)
 to display texts instead of the DVB card's on-screen display
diff --git a/interface.c b/interface.c
index ef8368ae..2346f6ca 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.33 2000/12/09 11:04:10 kls Exp $
+ * $Id: interface.c 1.34 2001/02/02 14:49:39 kls Exp $
  */
 
 #include "interface.h"
@@ -26,8 +26,10 @@ cInterface::cInterface(int SVDRPport)
   rcIo = new cRcIoRCU("/dev/ttyS1");
 #elif defined(REMOTE_LIRC)
   rcIo = new cRcIoLIRC("/dev/lircd");
-#else
+#elif defined(REMOTE_KBD)
   rcIo = new cRcIoKBD;
+#else
+  rcIo = new cRcIoBase; // acts as a dummy device
 #endif
   rcIo->SetCode(Keys.code, Keys.address);
   if (SVDRPport)
diff --git a/remote.h b/remote.h
index 0ea4442a..659de1ac 100644
--- a/remote.h
+++ b/remote.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.h 1.13 2000/10/08 12:11:34 kls Exp $
+ * $Id: remote.h 1.14 2001/02/02 14:49:10 kls Exp $
  */
 
 #ifndef __REMOTE_H
@@ -18,9 +18,9 @@
 class cRcIoBase {
 protected:
   time_t t;
-  cRcIoBase(void);
 public:
   enum { modeH = 'h', modeB = 'b', modeS = 's' };
+  cRcIoBase(void);
   virtual ~cRcIoBase();
   virtual bool SetCode(unsigned char Code, unsigned short Address) { return true; }
   virtual bool SetMode(unsigned char Mode) { return true; }
@@ -29,8 +29,8 @@ public:
   virtual bool String(char *s) { return true; }
   virtual bool DetectCode(unsigned char *Code, unsigned short *Address) { return true; }
   virtual void Flush(int WaitMs = 0) {}
-  virtual bool InputAvailable(void) = 0;
-  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL) = 0;
+  virtual bool InputAvailable(void) { return false; }
+  virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL) { return false; }
   };
 
 #if defined REMOTE_KBD
@@ -93,7 +93,7 @@ public:
   virtual bool GetCommand(unsigned int *Command = NULL, bool *Repeat = NULL, bool *Release = NULL);
   };
 
-#else
+#elif !defined REMOTE_NONE
 
 #error Please define a remote control mode!