From 9bbcf23a86d9373eb1f0ecbd039636b1375b8a61 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 18 Dec 2004 13:26:07 +0100
Subject: [PATCH] Removed the LOCK_THREAD from the LIRC thread

---
 CONTRIBUTORS | 1 +
 HISTORY      | 1 +
 lirc.c       | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d4e57073..b7952316 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -760,6 +760,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
  for reporting a bug in cRingBufferLinear::Get() in case the buffer wraps around
  for adding some checks when canceling a thread and removing the usleep() in
  cThread::Start()
+ for removing the LOCK_THREAD from the LIRC thread
 
 Thomas Koch <tom@harhar.net>
  for his support in keeping the Premiere World channels up to date in 'channels.conf'
diff --git a/HISTORY b/HISTORY
index 03086622..d5c4ac10 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3198,3 +3198,4 @@ Video Disk Recorder Revision History
 - Completed the Italian OSD texts (thanks to Sean Carlos).
 - Fixed setting 'synced' in cRemux when recording radio channels (thanks to
   Laurence Abbott).
+- Removed the LOCK_THREAD from the LIRC thread (thanks to Ludwig Nussel).
diff --git a/lirc.c b/lirc.c
index d1aa4e59..ae905fdc 100644
--- a/lirc.c
+++ b/lirc.c
@@ -6,7 +6,7 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 1.7 2003/10/18 11:34:02 kls Exp $
+ * $Id: lirc.c 1.8 2004/12/18 13:25:11 kls Exp $
  */
 
 #include "lirc.h"
@@ -41,6 +41,8 @@ cLircRemote::cLircRemote(char *DeviceName)
 cLircRemote::~cLircRemote()
 {
   Cancel();
+  if (f >= 0)
+     close(f);
 }
 
 bool cLircRemote::Ready(void)
@@ -59,8 +61,6 @@ void cLircRemote::Action(void)
 
   for (; f >= 0;) {
 
-      LOCK_THREAD;
-
       bool ready = cFile::FileReady(f, timeout);
       int ret = ready ? safe_read(f, buf, sizeof(buf)) : -1;