1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Removed the usleep() call from cDvbPlayer::Action() to make VDR run on NPTL systems; also removed the NPTL check at startup

This commit is contained in:
Klaus Schmidinger 2004-10-23 12:43:23 +02:00
parent 5b2784cc4f
commit af6b8ff533
5 changed files with 8 additions and 23 deletions

View File

@ -798,6 +798,8 @@ Alfred Zastrow <vdr@zastrow4u.de>
the recordings created when pausing live video
for reporting two warnings when compiling with gcc 3.3.1
for reporting a bug in handling menu status messages when the list contents is scrolled
for reporting that without the usleep() call in cDvbPlayer::Action() VDR runs on NPTL
systems
Matthias Raus <matthias-raus@web.de>
for reporting a problem with starting the editing process if no marks have been set

View File

@ -3049,3 +3049,6 @@ Video Disk Recorder Revision History
- Fixed attaching a cPlayer to a cDevice, so that 'Operation not permited'
errors don't occur any more (thanks to Marco Schlüßler).
- Fixed a case where the resultBuffer in cRemux ran full before getting a sync.
- Removed the usleep() call from cDvbPlayer::Action() to make VDR run on NPTL
systems (thanks to Alfred Zastrow). The NPTL check at startup has also been
removed.

View File

@ -7,14 +7,7 @@ Version 1.3
IMPORTANT NOTES:
----------------
VDR currently doesn't work with NPTL ("Native Posix Thread Library").
Either don't use NPTL, or set the environment variable
LD_ASSUME_KERNEL=2.4.1
before running VDR.
Also, please make sure your environment is NOT set to use UTF-8 or
Please make sure your environment is NOT set to use UTF-8 or
any other multibyte character representation. Check the value of your
$LANG or $LC_CTYPE environment variable, and if it contains something
like "de_DE.UTF-8", make sure you set it to something like "de_DE.iso8859-1"

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbplayer.c 1.25 2004/10/15 13:07:55 kls Exp $
* $Id: dvbplayer.c 1.26 2004/10/23 12:39:35 kls Exp $
*/
#include "dvbplayer.h"
@ -490,8 +490,6 @@ void cDvbPlayer::Action(void)
break;
}
}
else//XXX
usleep(1); // this keeps the CPU load low
}
// Store the frame in the buffer:

13
vdr.c
View File

@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
* $Id: vdr.c 1.187 2004/10/17 11:50:21 kls Exp $
* $Id: vdr.c 1.188 2004/10/23 12:40:24 kls Exp $
*/
#include <getopt.h>
@ -85,17 +85,6 @@ static void Watchdog(int signum)
int main(int argc, char *argv[])
{
#ifdef _CS_GNU_LIBPTHREAD_VERSION
// Check for NPTL and exit if present - VDR apparently doesn't run well with NPTL:
char LibPthreadVersion[128];
if (confstr(_CS_GNU_LIBPTHREAD_VERSION, LibPthreadVersion, sizeof(LibPthreadVersion)) > 0) {
if (strstr(LibPthreadVersion, "NPTL")) {
fprintf(stderr, "vdr: please turn off NPTL by setting 'export LD_ASSUME_KERNEL=2.4.1' before starting VDR\n");
return 2;
}
}
#endif
// Check for UTF-8 and exit if present - asprintf() will fail if it encounters 8 bit ASCII codes
char *LangEnv;
if ((LangEnv = getenv("LANG")) != NULL && strcasestr(LangEnv, "utf") ||