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, 59 insertions, 1 deletions

diff --git a/thread.c b/thread.c
index 363190d..e253ea0 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.7 2000/12/24 12:27:21 kls Exp $
+ * $Id: thread.c 1.9 2001/06/27 11:34:41 kls Exp $
  */
 
 #include "thread.h"
@@ -14,12 +14,43 @@
 #include <unistd.h>
 #include "tools.h"
 
+// --- cMutex ----------------------------------------------------------------
+
+cMutex::cMutex(void)
+{
+  lockingPid = 0;
+  locked = 0;
+  pthread_mutex_init(&mutex, NULL);
+}
+
+cMutex::~cMutex()
+{
+  pthread_mutex_destroy(&mutex);
+}
+
+void cMutex::Lock(void)
+{
+  if (getpid() != lockingPid || !locked)
+     pthread_mutex_lock(&mutex);
+  lockingPid = getpid();
+  locked++;
+}
+
+void cMutex::Unlock(void)
+{
+ if (!--locked)
+    pthread_mutex_unlock(&mutex);
+}
+
 // --- cThread ---------------------------------------------------------------
 
 // The signal handler is necessary to be able to use SIGIO to wake up any
 // pending 'select()' call.
 
+time_t cThread::lastPanic = 0;
+int cThread::panicLevel = 0;
 bool cThread::signalHandlerInstalled = false;
+bool cThread::emergencyExitRequested = false;
 
 cThread::cThread(void)
 {
@@ -110,6 +141,33 @@ void cThread::WakeUp(void)
   kill(parentPid, SIGIO); // makes any waiting 'select()' call return immediately
 }
 
+#define MAXPANICLEVEL 10
+
+void cThread::RaisePanic(void)
+{
+  if (lastPanic > 0) {
+     if (time(NULL) - lastPanic < 5)
+        panicLevel++;
+     else if (panicLevel > 0)
+        panicLevel--;
+     }
+  lastPanic = time(NULL);
+  if (panicLevel > MAXPANICLEVEL) {
+     esyslog(LOG_ERR, "ERROR: max. panic level exceeded");
+     EmergencyExit(true);
+     }
+  else
+     dsyslog(LOG_INFO, "panic level: %d", panicLevel);
+}
+
+bool cThread::EmergencyExit(bool Request)
+{
+  if (!Request)
+     return emergencyExitRequested;
+  esyslog(LOG_ERR, "initiating emergency exit");
+  return emergencyExitRequested = true; // yes, it's an assignment, not a comparison!
+}
+
 // --- cThreadLock -----------------------------------------------------------
 
 cThreadLock::cThreadLock(cThread *Thread)