Version 0.85vdr-0.85

- Added Norwegian language texts (thanks to Jørgen Tvedt).
- Increased the usleep value in cDvbOsd::Cmd() to 5000 in order to work on
  systems with the KURT/utime-patch (thanks to Guido Fiala).
- Changed the check whether the driver is loaded in runvdr to check for the
  'dvb' module (the last one loaded).
- Fixed repeat function with LIRC (thanks to Stefan Huelswitt).
- Increased the upper limit for the symbol rate to 30000 (thanks to Ulrich
  Röder).
- Made the position of the channel display configurable (thanks to Stefan
  Huelswitt).
- Made the width and height of the OSD configurable (thanks to Stefan Huelswitt).
- DiSEqC support can now be generally enabled/disabled in the Setup menu. This
  may be necessary if your multiswitch gets irritated by the default DiSEqC
  codes '0' (thanks to Markus Lang).
- Fixed replaying in case there is no index file.
- Fixed jumping to an editing mark when replay has been paused.
- Avoiding unnecessary code execution in the replay progress display (thanks
  to Guido Fiala).
- When entering time values the digits that still have to be entered are now
  shown as '-' (as in "1-:--").
- When setting an editing mark while the progress display is not active, the
  display will now be turned on for a short while to indicate the successful
  setting of the mark.
- Updated 'channels.conf' for Premiere World (thanks to Helmut Schächner).
  Check your timers if you use this channels.conf file, since the sequence of
  several PW channels has been changed.
- Changed the color of "Info" messages to "black on green" and that of the
  confirmation messages (like "Delete...") to "black on yellow".
- Fixed display with DEBUG_OSD (it still crashes sometimes, esp. when replaying,
  but I can't seem to find what causes this... any ideas anybody?).
- Avoiding audio/video distortions in 'Transfer Mode' by no longer actually
  tuning the primary interface (which can't receive this channel, anyway).
  Apparently the driver gets irritated when the channel is switched and a
  replay session is started immediately after that.
- Increased timeout until reporting "video data stream broken" when recording.
- Explicitly switching back to the previously active channel after ending a
  replay session (to have it shown correctly in case it was in 'Transfer Mode').

1 files changed, 12 insertions, 5 deletions

diff --git a/thread.h b/thread.h
index 6aaee0b..bf9804d 100644
--- a/thread.h
+++ b/thread.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.h 1.4 2000/12/03 11:18:37 kls Exp $
+ * $Id: thread.h 1.6 2001/06/27 11:22:04 kls Exp $
  */
 
 #ifndef __THREAD_H
@@ -16,11 +16,13 @@
 class cMutex {
 private:
   pthread_mutex_t mutex;
+  pid_t lockingPid;
+  int locked;
 public:
-  cMutex(void) { pthread_mutex_init(&mutex, NULL); }
-  ~cMutex() { pthread_mutex_destroy(&mutex); }
-  void Lock(void) { pthread_mutex_lock(&mutex); }
-  void Unlock(void) { pthread_mutex_unlock(&mutex); }
+  cMutex(void);
+  ~cMutex();
+  void Lock(void);
+  void Unlock(void);
   };
 
 class cThread {
@@ -31,6 +33,9 @@ private:
   pid_t parentPid, threadPid, lockingPid;
   int locked;
   bool running;
+  static time_t lastPanic;
+  static int panicLevel;
+  static bool emergencyExitRequested;
   static bool signalHandlerInstalled;
   static void SignalHandler(int signum);
   static void *StartThread(cThread *Thread);
@@ -45,6 +50,8 @@ public:
   virtual ~cThread();
   bool Start(void);
   bool Active(void);
+  static void RaisePanic(void);
+  static bool EmergencyExit(bool Request = false);
   };
 
 // cThreadLock can be used to easily set a lock in a thread and make absolutely