Version 1.3.15vdr-1.3.15

- Fixed some typos in the Makefile's 'font' target (thanks to Uwe Hanke).
- Added more checks and polling when getting frontend events (based on a patch
  from Werner Fink).
- No longer explicitly waiting for a tuner lock when switching channels
  (apparently setting "live" PIDs before the tuner is locked doesn't hurt).
  Moved the wait into cDevice::AttachReceiver() instead.
- Immediately displaying the new channel info when switching channel groups.
- Moved the main program loop variables further up to allow compilation with
  older compiler versions (thanks to Marco Schlüßler for reporting this one).
- Now calling pthread_cond_broadcast() in the destructor of cCondWait and
  cCondVar to make sure any sleepers will wake up (suggested by Werner Fink).
  Also using pthread_cond_broadcast() instead of pthread_cond_signal() in
  cCondWait, in case there is more than one sleeper.
- Making sure that timers and channels are only saved together, in a consistent
  manner (thanks to Mirko Dölle for reporting a problem with inconsistent
  channel and timer lists).
- Now handling the channel name, short name and provider separately. cChannel
  therefore has two new functions, ShortName() and Provider(). ShortName()
  can be used to display a short version of the name (in case such a version
  is available). The optional boolean parameter of ShortName() can be set to
  true to make it return the name, if no short name is available.
  The sequence of 'name' and 'short name' in the channels.conf file has been
  swapped (see man vdr(5)).
- Added the 'portal name' to cChannels (thanks to Marco Schlüßler).
- Fixed handling key codes that start with 0x1B in the KBD remote control code.
- Now using qsort() to sort cListBase lists. For this, the virtual function
  cListObject::operator<() has been replaced with cListObject::Compare().
  Plugins that implement derived cListObject classes may need to adjust their
  code.
- The "Channels" menu can now be sorted "by number" (default), "by name" and
  "by provider". While in the "Channels" menu, pressing the '0' key switches
  through these modes.
- Fixed the buffer size in cRecording::SortName().
- Now displaying the name of the remote control for which the keys are being
  learned inside the menu to avoid overwriting the date/time in the 'classic'
  skin (thanks to Oliver Endriss for reporting this one).

1 files changed, 17 insertions, 12 deletions

diff --git a/timers.h b/timers.h
index cbc6a92..24f54ad 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.8 2004/10/24 14:40:37 kls Exp $
+ * $Id: timers.h 1.10 2004/10/31 16:41:17 kls Exp $
  */
 
 #ifndef __TIMERS_H
@@ -26,7 +26,7 @@ enum eTimerMatch { tmNone, tmPartial, tmFull };
 class cTimer : public cListObject {
   friend class cMenuEditTimer;
 private:
-  time_t startTime, stopTime;
+  mutable time_t startTime, stopTime;
   static char *buffer;
   bool recording, pending, inVpsMargin;
   int flags;
@@ -37,7 +37,7 @@ private:
   int priority;
   int lifetime;
   char file[MaxFileName];
-  time_t firstday;
+  mutable time_t firstday;
   char *summary;
   const cEvent *event;
 public:
@@ -45,7 +45,7 @@ public:
   cTimer(const cEvent *Event);
   virtual ~cTimer();
   cTimer& operator= (const cTimer &Timer);
-  virtual bool operator< (const cListObject &ListObject);
+  virtual int Compare(const cListObject &ListObject) const;
   bool Recording(void) { return recording; }
   bool Pending(void) { return pending; }
   bool InVpsMargin(void) { return inVpsMargin; }
@@ -63,17 +63,17 @@ public:
   const cEvent *Event(void) { return event; }
   bool Parse(const char *s);
   bool Save(FILE *f);
-  bool IsSingleEvent(void);
-  int GetMDay(time_t t);
-  int GetWDay(time_t t);
-  bool DayMatches(time_t t);
+  bool IsSingleEvent(void) const;
+  int GetMDay(time_t t) const;
+  int GetWDay(time_t t) const;
+  bool DayMatches(time_t t) const;
   static time_t IncDay(time_t t, int Days);
   static time_t SetTime(time_t t, int SecondsFromMidnight);
   char *SetFile(const char *File);
-  bool Matches(time_t t = 0, bool Directly = false);
+  bool Matches(time_t t = 0, bool Directly = false) const;
   int Matches(const cEvent *Event);
-  time_t StartTime(void);
-  time_t StopTime(void);
+  time_t StartTime(void) const;
+  time_t StopTime(void) const;
   void SetEvent(const cEvent *Event);
   void SetRecording(bool Recording);
   void SetPending(bool Pending);
@@ -81,7 +81,7 @@ public:
   void SetFlags(int Flags);
   void ClrFlags(int Flags);
   void InvFlags(int Flags);
-  bool HasFlags(int Flags);
+  bool HasFlags(int Flags) const;
   void Skip(void);
   void OnOff(void);
   const char *PrintFirstDay(void);
@@ -92,6 +92,7 @@ public:
 
 class cTimers : public cConfig<cTimer> {
 private:
+  bool modified;
   int beingEdited;
   time_t lastSetEvents;
 public:
@@ -103,6 +104,10 @@ public:
   int BeingEdited(void) { return beingEdited; }
   void IncBeingEdited(void) { beingEdited++; }
   void DecBeingEdited(void) { if (!--beingEdited) lastSetEvents = 0; }
+  void SetModified(void);
+  bool Modified(void);
+      ///< Returns true if any of the timers have been modified.
+      ///< Calling this function resets the 'modified' flag to false.
   void SetEvents(void);
   };