Version 0.6vdr-0.6

- Added support for LIRC remote control (thanks to Carsten Koch!).
  There are now three different remote control modes: KBD (PC-Keyboard), RCU
  and LIRC. See the INSTALL file for information on how to enable either of
  these modes. The default mode is now KBD, not RCU as before (to make it
  work immediately even if there is no actual remote control).
- Fixed small bug in dvbapi.c that was causing some channels (many on hotbird)
  not to be correctly tuned (thanks to Plamen Ganev!).
- Now clearing the replay buffer in search forward/back, which results in
  faster reaction.
- The 'Recordings' menu is now listed alphabetically (thanks to Carsten Koch!).
- The new 'epg2timers' tool (thanks to Carsten Koch!) can be used to convert
  an EPG "merkliste" page (http://www.tvtv.de) to vdr timer entries.
- The new 'xtvrc2vdr' tool (thanks to Plamen Ganev!) can be used to convert
  'xtvrc' channel files into 'vdr' format.
- When more than one timer matches at the same time, the first one in the list
  with the highest 'Priority' is selected.
- The MANUAL section on "Programming the Timer" has been filled in.
- The year in the "Recordings" menu as well as in the progress display during
  replay has been reduced to 2 digits to allow more space for the recording's
  title. In the internal file structure the year is still stored with 4 digits,
  so there will be no problem at the next turn of the century ;-)
- Channel names and timer filenames can now contain blanks. To avoid problems
  with file names that contain blanks, all blanks in recording file names are
  converted to underscores.
- The polarization can now be given in uppercase or lowercase characters in
  channels.conf.
- Fixed buffer initialization to work with DVB driver version 0.6.
- Implemented the "Simple Video Disk Recorder Protocol" (SVDRP) to control
  the VDR over a network connection.
- Implemented command line option handling.
- The program can now run in full background mode by using the --daemon option.
- Added a "summary" field to the timers (thanks to Carsten Koch!).
  This field can contain a descriptive text of the programme and will be
  displayed when the "Blue" key is pressed on a recording that was created by
  this timer. If the text contains the special character '|', a newline will
  be inserted at that place.  When pressing "Ok" on a timer that contains a
  summary field, the summary will be displayed. To edit such a timer the "Red"
  key must be pressed. Timers without a summary still go into Edit mode when
  pressing "Ok".  The summary field can only be filled in directly by editing
  the 'timers.conf' file with a text editor, or by defining/modifying the timer
  via the SVDRP interface.

1 files changed, 20 insertions, 9 deletions

diff --git a/config.h b/config.h
index 22099b9..be1c7ec 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.7 2000/06/24 13:42:32 kls Exp $
+ * $Id: config.h 1.11 2000/07/23 17:17:10 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -17,7 +17,7 @@
 #include "dvbapi.h"
 #include "tools.h"
 
-#define MaxBuffer 1000
+#define MaxBuffer 10000
 
 enum eKeys { // "Up" and "Down" must be the first two keys!
              kUp,
@@ -50,7 +50,8 @@ public:
   tKey *keys;
   cKeys(void);
   void Clear(void);
-  bool Load(char *FileName = NULL);
+  void SetDummyValues(void);
+  bool Load(const char *FileName = NULL);
   bool Save(void);
   unsigned int Encode(const char *Command);
   eKeys Get(unsigned int Code);
@@ -58,6 +59,9 @@ public:
   };
 
 class cChannel : public cListObject {
+private:
+  static char *buffer;
+  static const char *ToText(cChannel *Channel);
 public:
   enum { MaxChannelName = 32 }; // 31 chars + terminating 0!
   char name[MaxChannelName];
@@ -71,7 +75,8 @@ public:
   int pnr;
   cChannel(void);
   cChannel(const cChannel *Channel);
-  bool Parse(char *s);
+  const char *ToText(void);
+  bool Parse(const char *s);
   bool Save(FILE *f);
   bool Switch(cDvbApi *DvbApi = NULL);
   static bool SwitchTo(int i, cDvbApi *DvbApi = NULL);
@@ -81,6 +86,8 @@ public:
 class cTimer : public cListObject {
 private:
   time_t startTime, stopTime;
+  static char *buffer;
+  static const char *ToText(cTimer *Timer);
 public:
   enum { MaxFileName = 256 };
   bool recording;
@@ -93,19 +100,23 @@ public:
   int priority;
   int lifetime;
   char file[MaxFileName];
+  char *summary;
   cTimer(bool Instant = false);
-  bool Parse(char *s);
+  ~cTimer();
+  cTimer& operator= (const cTimer &Timer);
+  const char *ToText(void);
+  bool Parse(const char *s);
   bool Save(FILE *f);
   bool IsSingleEvent(void);
-  bool Matches(void);
+  bool Matches(time_t t = 0);
   time_t StartTime(void);
   time_t StopTime(void);
   void SetRecording(bool Recording);
   static cTimer *GetMatch(void);
   static int TimeToInt(int t);
   static time_t Day(time_t t);
-  static int ParseDay(char *s);
-  static char *PrintDay(int d);
+  static int ParseDay(const char *s);
+  static const char *PrintDay(int d);
   };
 
 template<class T> class cConfig : public cList<T> {
@@ -117,7 +128,7 @@ private:
     cList<T>::Clear();
   }
 public:
-  bool Load(char *FileName)
+  bool Load(const char *FileName)
   {
     isyslog(LOG_INFO, "loading %s", FileName);
     bool result = true;