summaryrefslogtreecommitdiff
path: root/command/markad-standalone.cpp
diff options
context:
space:
mode:
authorJochen Dolze <vdr@dolze.de>2011-07-28 21:07:43 +0200
committerJochen Dolze <vdr@dolze.de>2011-07-28 21:07:43 +0200
commit543b4d41ea7dc6e96c1e0148dd099afa579cee57 (patch)
treeb2ef920aadcaf20d3a2950248c8a10b08300624a /command/markad-standalone.cpp
parent3b7d47c660b6170f90b9a0cdb6b73ea9749f307d (diff)
downloadvdr-plugin-markad-543b4d41ea7dc6e96c1e0148dd099afa579cee57.tar.gz
vdr-plugin-markad-543b4d41ea7dc6e96c1e0148dd099afa579cee57.tar.bz2
Changed kabel1-logo, changed prosieben-logo
Diffstat (limited to 'command/markad-standalone.cpp')
-rw-r--r--command/markad-standalone.cpp25
1 files changed, 22 insertions, 3 deletions
diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp
index 47d9eaa..10ed7a2 100644
--- a/command/markad-standalone.cpp
+++ b/command/markad-standalone.cpp
@@ -1123,7 +1123,7 @@ void cMarkAdStandalone::ProcessFile()
AddMark(&tempmark);
}
}
- skipped=demux->Skipped();
+ if (demux) skipped=demux->Skipped();
}
void cMarkAdStandalone::Process()
@@ -1934,6 +1934,11 @@ bool cMarkAdStandalone::CreatePidfile()
}
fclose(oldpid);
}
+ else
+ {
+ // fopen above sets the error to 2, reset it here!
+ errno=0;
+ }
if (duplicate)
{
free(buf);
@@ -2036,7 +2041,17 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig *
}
}
- isyslog("starting v%s",VERSION);
+ long lb;
+ errno=0;
+ lb=sysconf(_SC_LONG_BIT);
+ if (errno==0)
+ {
+ isyslog("starting v%s (%libit)",VERSION,lb);
+ }
+ else
+ {
+ isyslog("starting v%s",VERSION);
+ }
isyslog("on %s",Directory);
if (!bDecodeAudio)
@@ -2065,7 +2080,11 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig *
bIgnoreTimerInfo=true;
}
- if (!CheckTS()) return;
+ if (!CheckTS()) {
+ esyslog("no files found");
+ abort=true;
+ return;
+ }
if (isTS)
{