From ce8369251cf64919a7f1a8333201d87f92fb2f14 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 19 Dec 2004 17:22:13 +0100
Subject: [PATCH] Removed delay_ms(), using cCondWait::SleepMs() instead

---
 HISTORY                 | 1 +
 PLUGINS/src/sky/HISTORY | 1 +
 PLUGINS/src/sky/sky.c   | 4 ++--
 rcu.c                   | 4 ++--
 tools.c                 | 9 +--------
 tools.h                 | 3 +--
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/HISTORY b/HISTORY
index 0f16486e..0813fbf9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3221,3 +3221,4 @@ Video Disk Recorder Revision History
   itoa() -> cItoa
   WeekDayName() -> cWeekDayName
   DayDateTime() -> cDayDateTime
+- Removed delay_ms(), using cCondWait::SleepMs() instead.
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index f1f22a69..2fed4c36 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -36,3 +36,4 @@ VDR Plugin 'sky' Revision History
 2004-12-19: Version 0.3.3
 
 - Made several functions threadsafe.
+- Removed delay_ms(), using cCondWait::SleepMs() instead.
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index 49afea1d..4e934f73 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: sky.c 1.9 2004/12/19 15:33:47 kls Exp $
+ * $Id: sky.c 1.10 2004/12/19 17:21:52 kls Exp $
  */
 
 #include <sys/socket.h>
@@ -113,7 +113,7 @@ void cDigiboxDevice::LircSend(const char *s)
   dsyslog(buf);//XXX
   if (write(fd_lirc, buf, strlen(buf)) < 0)
      LOG_ERROR;//XXX _STR
-  delay_ms(200);
+  cCondWait::SleepMs(200);
 }
 
 void cDigiboxDevice::LircSend(int n)
diff --git a/rcu.c b/rcu.c
index 43dc480a..71a3220e 100644
--- a/rcu.c
+++ b/rcu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: rcu.c 1.6 2003/10/18 11:34:30 kls Exp $
+ * $Id: rcu.c 1.7 2004/12/19 17:19:34 kls Exp $
  */
 
 #include "rcu.h"
@@ -295,7 +295,7 @@ bool cRcuRemote::DetectCode(unsigned char *Code)
      sprintf(buf, "C0D%c", *Code);
      String(buf);
      SetCode(*Code);
-     delay_ms(2 * REPEATDELAY);
+     cCondWait::SleepMs(2 * REPEATDELAY);
      if (receivedCommand) {
         SetMode(modeB);
         String("----");
diff --git a/tools.c b/tools.c
index 111b18c2..3776e6b9 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.83 2004/12/19 16:08:50 kls Exp $
+ * $Id: tools.c 1.84 2004/12/19 17:19:46 kls Exp $
  */
 
 #include "tools.h"
@@ -199,13 +199,6 @@ int time_ms(void)
   return 0;
 }
 
-void delay_ms(int ms)
-{
-  int t0 = time_ms();
-  while (time_ms() - t0 < ms)
-        ;
-}
-
 bool isnumber(const char *s)
 {
   if (!*s)
diff --git a/tools.h b/tools.h
index bbbd5704..71e7d884 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.59 2004/12/19 14:49:48 kls Exp $
+ * $Id: tools.h 1.60 2004/12/19 17:20:05 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -72,7 +72,6 @@ bool endswith(const char *s, const char *p);
 bool isempty(const char *s);
 int numdigits(int n);
 int time_ms(void);
-void delay_ms(int ms);
 bool isnumber(const char *s);
 int FreeDiskSpaceMB(const char *Directory, int *UsedMB = NULL);
 bool DirectoryOk(const char *DirName, bool LogErrors = false);