summaryrefslogtreecommitdiff
path: root/cutter.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 /cutter.c
parent8fe90254f6843fedab11f4bbf7f83090e341f6eb (diff)
downloadvdr-af54ce4842850f228d2ac85cb47e6339fd36e9c1.tar.gz
vdr-af54ce4842850f228d2ac85cb47e6339fd36e9c1.tar.bz2
Changed cThread Active() vs. Running()
Diffstat (limited to 'cutter.c')
-rw-r--r--cutter.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cutter.c b/cutter.c
index 59c6fb86..9bbb0d40 100644
--- a/cutter.c
+++ b/cutter.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: cutter.c 1.9 2005/08/13 11:49:02 kls Exp $
+ * $Id: cutter.c 1.10 2005/08/14 10:51:54 kls Exp $
*/
#include "cutter.h"
@@ -76,7 +76,7 @@ void cCuttingThread::Action(void)
uchar buffer[MAXFRAMESIZE];
bool LastMark = false;
bool cutIn = true;
- while (Active()) {
+ while (Running()) {
uchar FileNumber;
int FileOffset, Length;
uchar PictureType;
@@ -213,7 +213,7 @@ bool cCutter::Start(const char *FileName)
void cCutter::Stop(void)
{
- bool Interrupted = cuttingThread && cuttingThread->Running();
+ bool Interrupted = cuttingThread && cuttingThread->Active();
const char *Error = cuttingThread ? cuttingThread->Error() : NULL;
delete cuttingThread;
cuttingThread = NULL;
@@ -230,7 +230,7 @@ void cCutter::Stop(void)
bool cCutter::Active(void)
{
if (cuttingThread) {
- if (cuttingThread->Running())
+ if (cuttingThread->Active())
return true;
error = cuttingThread->Error();
Stop();