summaryrefslogtreecommitdiff
path: root/device.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-08-14 11:24:57 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2005-08-14 11:24:57 +0200
commitaf54ce4842850f228d2ac85cb47e6339fd36e9c1 (patch)
tree5bcf8cb26d825d4e8f4d84b504cd502cfb2bd6e9 /device.c
parent8fe90254f6843fedab11f4bbf7f83090e341f6eb (diff)
downloadvdr-af54ce4842850f228d2ac85cb47e6339fd36e9c1.tar.gz
vdr-af54ce4842850f228d2ac85cb47e6339fd36e9c1.tar.bz2
Changed cThread Active() vs. Running()
Diffstat (limited to 'device.c')
-rw-r--r--device.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/device.c b/device.c
index c9227f92..9fcc420b 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: device.c 1.104 2005/08/13 11:44:06 kls Exp $
+ * $Id: device.c 1.105 2005/08/14 10:52:08 kls Exp $
*/
#include "device.h"
@@ -1124,8 +1124,8 @@ bool cDevice::Receiving(bool CheckAny) const
void cDevice::Action(void)
{
- if (Active() && OpenDvr()) {
- while (Active()) {
+ if (Running() && OpenDvr()) {
+ while (Running()) {
// Read data from the DVR device:
uchar *b = NULL;
if (GetTSPacket(b)) {
@@ -1186,7 +1186,7 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
Receiver->device = this;
receiver[i] = Receiver;
Unlock();
- if (!Active())
+ if (!Running())
Start();
return true;
}
@@ -1254,7 +1254,7 @@ void cTSBuffer::Action(void)
if (ringBuffer) {
bool firstRead = true;
cPoller Poller(f);
- while (Active()) {
+ while (Running()) {
if (firstRead || Poller.Poll(100)) {
firstRead = false;
int r = ringBuffer->Read(f);