summaryrefslogtreecommitdiff
path: root/plugin/status.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugin/status.cpp')
-rw-r--r--plugin/status.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/plugin/status.cpp b/plugin/status.cpp
index b219385..4fdf1be 100644
--- a/plugin/status.cpp
+++ b/plugin/status.cpp
@@ -70,9 +70,7 @@ void cStatusMarkAd::Replaying(const cControl *UNUSED(Control), const char *UNUSE
bool cStatusMarkAd::Start(const char *FileName, const char *Name, const bool Direct)
{
if ((Direct) && (Get(FileName)!=-1)) return false;
- if (setup->OSDMessage) {
- }
cString cmd = cString::sprintf("\"%s\"/markad %s%s%s%s%s%s%s -l \"%s\" %s \"%s\"",
bindir,
setup->Verbose ? " -v " : "",
@@ -95,7 +93,7 @@ bool cStatusMarkAd::Start(const char *FileName, const char *Name, const bool Dir
int pos=Add(FileName,Name);
if (getPid(pos) && getStatus(pos))
{
- if (!setup->ProcessDuring)
+ if (setup->ProcessDuring==0)
{
if (!Direct)
{
@@ -211,6 +209,11 @@ void cStatusMarkAd::Recording(const cDevice *Device, const char *Name,
if (!bindir) return; // we cannot operate without bindir
if (!logodir) return; // we dont want to operate without logodir
+ if (setup->ProcessDuring==2) {
+ dsyslog("markad: deactivated by user");
+ return; // markad deactivated
+ }
+
if (On)
{
if (setup->LogoOnly && !LogoExists(Device,FileName)) {