frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed the spelling of 'canceling'

This commit is contained in:
Klaus Schmidinger 2004-11-26 14:18:22 +01:00
parent eb8405695b
commit 5c6ed74aff
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CONTRIBUTORS
View File

@ -755,7 +755,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
for reporting a problem on systems that have UTF-8 enabled for reporting a problem on systems that have UTF-8 enabled
for pointing out a flaw in the the description of cRingBufferLinear for pointing out a flaw in the the description of cRingBufferLinear
for reporting a bug in cRingBufferLinear::Get() in case the buffer wraps around for reporting a bug in cRingBufferLinear::Get() in case the buffer wraps around
for adding some checks when cancelling a thread and removing the usleep() in for adding some checks when canceling a thread and removing the usleep() in
cThread::Start() cThread::Start()
Thomas Koch <tom@harhar.net> Thomas Koch <tom@harhar.net>
@ -857,7 +857,7 @@ Jon Burgess <mplayer@jburgess.uklinux.net>
for fixing a memory leak in thread handling when using NPTL for fixing a memory leak in thread handling when using NPTL
Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
for reporting a crash when cancelling a newly created timer for reporting a crash when canceling a newly created timer
for making 'diseqc.conf' a required file only if Setup.DiSEqC is activated for making 'diseqc.conf' a required file only if Setup.DiSEqC is activated
Michael Walle <michael.walle@web.de> Michael Walle <michael.walle@web.de>
@ -1060,6 +1060,7 @@ Wayne Keer <syphir@syphir.sytes.net>
for suggesting to make the "Channel not available!" message and mtInfo instead of for suggesting to make the "Channel not available!" message and mtInfo instead of
mtError mtError
for reporting an unused variable from cTimer::GetWDayFromMDay() for reporting an unused variable from cTimer::GetWDayFromMDay()
for reporting a spelling error in 'canceling'
Marco Schlüßler <marco@lordzodiac.de> Marco Schlüßler <marco@lordzodiac.de>
for fixing handling colors in cDvbSpuPalette::yuv2rgb() for fixing handling colors in cDvbSpuPalette::yuv2rgb()

7
HISTORY
View File

@ -346,7 +346,7 @@ Video Disk Recorder Revision History
and then renames it). and then renames it).
- In case the video data stream is broken the log message will come only every - In case the video data stream is broken the log message will come only every
5 seconds. 5 seconds.
- The current channel is now saved in the 'setup.conf' file when VDR is cancelled, - The current channel is now saved in the 'setup.conf' file when VDR is canceled,
and will be restored next time it is started (thanks to Deti Fliegl). and will be restored next time it is started (thanks to Deti Fliegl).
- The EIT scanning thread is now locked when switching channels to avoid problems. - The EIT scanning thread is now locked when switching channels to avoid problems.
- Encrypted channels can now be selected even without knowing the PNR (however, it - Encrypted channels can now be selected even without knowing the PNR (however, it
@ -2241,7 +2241,7 @@ Video Disk Recorder Revision History
Gruber for reporting this one). Gruber for reporting this one).
- Fixed editing channels ('timers.conf' was not written after a channel has - Fixed editing channels ('timers.conf' was not written after a channel has
been modified, which could result in errors upon the next start of VDR). been modified, which could result in errors upon the next start of VDR).
- Fixed a crash when cancelling a newly created timer (thanks to Thomas Schmidt - Fixed a crash when canceling a newly created timer (thanks to Thomas Schmidt
for reporting this one). for reporting this one).
- Completed Hungarian language texts (thanks to Istvan Koenigsberger and Guido - Completed Hungarian language texts (thanks to Istvan Koenigsberger and Guido
Josten). Josten).
@ -3065,7 +3065,7 @@ Video Disk Recorder Revision History
small packet. small packet.
- Removed the signal handler and WakeUp() call from cThread (it is no longer - Removed the signal handler and WakeUp() call from cThread (it is no longer
needed). needed).
- Added some checks when cancelling a thread and removed the usleep() in - Added some checks when canceling a thread and removed the usleep() in
cThread::Start() (suggested by Ludwig Nussel). Also removed 'running' from cThread::Start() (suggested by Ludwig Nussel). Also removed 'running' from
cThread and using only childTid to indicate whether a thread is actually cThread and using only childTid to indicate whether a thread is actually
running. running.
@ -3166,3 +3166,4 @@ Video Disk Recorder Revision History
for reporting this one). for reporting this one).
- Some more changes to the 'childTid' handling in cThread (based on suggestions by - Some more changes to the 'childTid' handling in cThread (based on suggestions by
Stefan Huelswitt). Stefan Huelswitt).
- Fixed the spelling of 'canceling' (thanks to Wayne Keer for reporting this one).

4
thread.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: thread.c 1.38 2004/11/26 13:50:37 kls Exp $ * $Id: thread.c 1.39 2004/11/26 14:16:07 kls Exp $
*/ */
#include "thread.h" #include "thread.h"
@ -281,7 +281,7 @@ void cThread::Cancel(int WaitSeconds)
return; return;
cCondWait::SleepMs(10); cCondWait::SleepMs(10);
} }
esyslog("ERROR: thread %ld won't end (waited %d seconds) - cancelling it...", childTid, WaitSeconds); esyslog("ERROR: thread %ld won't end (waited %d seconds) - canceling it...", childTid, WaitSeconds);
} }
childTidMutex.Lock(); childTidMutex.Lock();
if (childTid) { if (childTid) {