diff options
| author | Jochen Dolze <vdr@dolze.de> | 2011-03-20 12:55:29 +0100 |
|---|---|---|
| committer | Jochen Dolze <vdr@dolze.de> | 2011-03-20 12:55:29 +0100 |
| commit | da3974c0707bf98c5f9a9e0dd2599292c9da3984 (patch) | |
| tree | 375dc5dbda0d8315b0523d60a7f0ace6717da017 /command/markad-standalone.cpp | |
| parent | 0662afd6d8816713ebeef519b38456d0f57a837b (diff) | |
| download | vdr-plugin-markad-da3974c0707bf98c5f9a9e0dd2599292c9da3984.tar.gz vdr-plugin-markad-da3974c0707bf98c5f9a9e0dd2599292c9da3984.tar.bz2 | |
Fixed bug in handling ts files ("demux error")v0.1.1
Fixed output of marks on channels without logos
Added finnish logos and translation from Rolf Ahrensberg
Added more informations in markad logfile
Diffstat (limited to 'command/markad-standalone.cpp')
| -rw-r--r-- | command/markad-standalone.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp index 2db0fc6..f263f04 100644 --- a/command/markad-standalone.cpp +++ b/command/markad-standalone.cpp @@ -458,7 +458,7 @@ void cMarkAdStandalone::AddMark(MarkAdMark *Mark) double distance=(Mark->Position-prev->position)/macontext.Video.Info.FramesPerSecond; isyslog("mark distance too short (%.1fs), deleting %i,%i",distance, prev->position,Mark->Position); - if ((prev->type & 0x0F)==MT_START) inBroadCast=false; + if (((prev->type & 0x0F)==MT_START) && (!macontext.Video.Options.WeakMarksOk)) inBroadCast=false; marks.Del(prev); if (comment) free(comment); return; @@ -479,7 +479,7 @@ void cMarkAdStandalone::AddMark(MarkAdMark *Mark) double distance=(Mark->Position-prev->position)/macontext.Video.Info.FramesPerSecond; isyslog("mark distance too short (%.1fs), deleting %i,%i",distance, prev->position,Mark->Position); - if ((prev->type & 0x0F)==MT_START) inBroadCast=false; + if (((prev->type & 0x0F)==MT_START) && (!macontext.Video.Options.WeakMarksOk)) inBroadCast=false; marks.Del(prev); if (comment) free(comment); return; @@ -520,10 +520,6 @@ void cMarkAdStandalone::AddMark(MarkAdMark *Mark) inBroadCast=false; } } - else - { - inBroadCast=true; - } marks.Add(Mark->Type,Mark->Position,comment); if (comment) free(comment); } @@ -2084,6 +2080,7 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory, const MarkAdConfig * if (macontext.Video.Options.WeakMarksOk) { isyslog("marks can/will be weak!"); + inBroadCast=true; } if (tStart>1) isyslog("pre-timer %im",tStart/60); |