diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | interface.c | 4 | ||||
| -rw-r--r-- | menu.c | 8 | ||||
| -rw-r--r-- | tools.c | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c07505d1..c3456a2a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1119,6 +1119,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi> for making the Recordings menu display the length (in hours:minutes) of each recording for fixing handling DVB subtitles and implementing decoding textual DVB subtitles for adding file name and line number to LOG_ERROR_STR() + for replacing all calls to sleep() with cCondWait::SleepMs() Ralf Klueber <ralf.klueber@vodafone.com> for reporting a bug in cutting a recording if there is only a single editing mark @@ -6778,3 +6778,4 @@ Video Disk Recorder Revision History - Changed the default location for the LIRC socket to /var/run/lirc/lircd (thanks to Ville Skyttä). - Added file name and line number to LOG_ERROR_STR() (thanks to Rolf Ahrenberg). +- Replaced all calls to sleep() with cCondWait::SleepMs() (thanks to Rolf Ahrenberg). diff --git a/interface.c b/interface.c index 6ad3c59f..2bfa6c39 100644 --- a/interface.c +++ b/interface.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: interface.c 1.77 2008/02/10 15:49:15 kls Exp $ + * $Id: interface.c 2.1 2011/12/04 14:52:38 kls Exp $ */ #include "interface.h" @@ -79,7 +79,7 @@ bool cInterface::QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu) DisplayMenu->SetItem(tr("RC code detected!"), 4, false, false); DisplayMenu->SetItem(tr("Do not press any key..."), 5, false, false); DisplayMenu->Flush(); - sleep(3); + cCondWait::SleepMs(3000); DisplayMenu->SetItem("", 4, false, false); DisplayMenu->SetItem("", 5, false, false); @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 2.33 2011/12/03 15:11:42 kls Exp $ + * $Id: menu.c 2.34 2011/12/04 14:52:38 kls Exp $ */ #include "menu.h" @@ -4208,7 +4208,7 @@ bool cRecordControl::GetEvent(void) } if (seconds == 0) dsyslog("waiting for EPG info..."); - sleep(1); + cCondWait::SleepMs(1000); } dsyslog("no EPG info available"); return false; @@ -4318,11 +4318,11 @@ bool cRecordControls::PauseLiveVideo(void) Skins.Message(mtStatus, tr("Pausing live video...")); cReplayControl::SetRecording(NULL, NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed() if (Start(NULL, true)) { - sleep(2); // allow recorded file to fill up enough to start replaying + cCondWait::SleepMs(2000); // allow recorded file to fill up enough to start replaying cReplayControl *rc = new cReplayControl; cControl::Launch(rc); cControl::Attach(); - sleep(1); // allow device to replay some frames, so we have a picture + cCondWait::SleepMs(1000); // allow device to replay some frames, so we have a picture Skins.Message(mtStatus, NULL); rc->ProcessKey(kPause); // pause, allowing replay mode display return true; @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: tools.c 2.18 2011/09/18 11:22:21 kls Exp $ + * $Id: tools.c 2.19 2011/12/04 14:52:38 kls Exp $ */ #include "tools.h" @@ -1789,7 +1789,7 @@ bool cLockFile::Lock(int WaitSeconds) break; } if (WaitSeconds) - sleep(1); + cCondWait::SleepMs(1000); } } while (f < 0 && time(NULL) < Timeout); } |