diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2005-08-14 11:24:57 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2005-08-14 11:24:57 +0200 |
commit | af54ce4842850f228d2ac85cb47e6339fd36e9c1 (patch) | |
tree | 5bcf8cb26d825d4e8f4d84b504cd502cfb2bd6e9 /dvbplayer.c | |
parent | 8fe90254f6843fedab11f4bbf7f83090e341f6eb (diff) | |
download | vdr-af54ce4842850f228d2ac85cb47e6339fd36e9c1.tar.gz vdr-af54ce4842850f228d2ac85cb47e6339fd36e9c1.tar.bz2 |
Changed cThread Active() vs. Running()
Diffstat (limited to 'dvbplayer.c')
-rw-r--r-- | dvbplayer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dvbplayer.c b/dvbplayer.c index 8763ac82..feb82d8e 100644 --- a/dvbplayer.c +++ b/dvbplayer.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbplayer.c 1.37 2005/08/13 12:27:17 kls Exp $ + * $Id: dvbplayer.c 1.38 2005/08/14 10:52:45 kls Exp $ */ #include "dvbplayer.h" @@ -144,7 +144,7 @@ int cNonBlockingFileReader::Read(int FileHandle, uchar *Buffer, int Length) void cNonBlockingFileReader::Action(void) { - while (Active()) { + while (Running()) { Lock(); if (!hasData && f >= 0 && buffer) { int r = safe_read(f, buffer + length, wanted - length); @@ -201,7 +201,7 @@ protected: public: cDvbPlayer(const char *FileName); virtual ~cDvbPlayer(); - bool Active(void) { return cThread::Active(); } + bool Active(void) { return cThread::Running(); } void Pause(void); void Play(void); void Forward(void); @@ -363,7 +363,7 @@ void cDvbPlayer::Action(void) int Length = 0; bool Sleep = false; - while (Active() && (NextFile() || readIndex >= 0 || ringBuffer->Available() || !DeviceFlush(100))) { + while (Running() && (NextFile() || readIndex >= 0 || ringBuffer->Available() || !DeviceFlush(100))) { if (Sleep) { cCondWait::SleepMs(3); // this keeps the CPU load low Sleep = false; |