summaryrefslogtreecommitdiff
path: root/plugin/status.cpp
diff options
context:
space:
mode:
authorJochen Dolze <vdr@dolze.de>2013-07-15 15:50:23 +0200
committerJochen Dolze <vdr@dolze.de>2013-07-15 15:50:23 +0200
commit5178e0ea9af99a09a309b5b43aa1c06bcfeeaa2b (patch)
tree501ad25b3322e38614eddc3edad0c432362c5d56 /plugin/status.cpp
parenta4af99d86e186b127c228abec4eccf64a93ab28a (diff)
downloadvdr-plugin-markad-5178e0ea9af99a09a309b5b43aa1c06bcfeeaa2b.tar.gz
vdr-plugin-markad-5178e0ea9af99a09a309b5b43aa1c06bcfeeaa2b.tar.bz2
Added support for ffmpeg 2.0
Prevent wrong setup options to become active
Diffstat (limited to 'plugin/status.cpp')
-rw-r--r--plugin/status.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugin/status.cpp b/plugin/status.cpp
index 4fdf1be..a691477 100644
--- a/plugin/status.cpp
+++ b/plugin/status.cpp
@@ -56,6 +56,7 @@ bool cStatusMarkAd::Replaying()
void cStatusMarkAd::Replaying(const cControl *UNUSED(Control), const char *UNUSED(Name),
const char *UNUSED(FileName), bool On)
{
+ if (setup->ProcessDuring!=0) return;
if (setup->whileReplaying) return;
if (On)
{
@@ -130,6 +131,7 @@ void cStatusMarkAd::TimerChange(const cTimer *Timer, eTimerChange Change)
{
if (!Timer) return;
if (Change!=tcDel) return;
+ if (setup->ProcessDuring==2) return;
if (time(NULL)>=Timer->StopTime()) return; // don't react on normal VDR timer deletion after recording
Remove(Timer->File(),true);
}