summaryrefslogtreecommitdiff
path: root/command/video.cpp
diff options
context:
space:
mode:
authorJochen Dolze <vdr@dolze.de>2011-02-09 21:33:37 +0100
committerJochen Dolze <vdr@dolze.de>2011-02-09 21:33:37 +0100
commit71a9b82061cc4420da2357ae99ecc701d7a6eedd (patch)
tree593d9ff7fc169e20cca0788cdaf8ca8e019325da /command/video.cpp
parent44d861cb39b59700ea5b8bd79da088d0d5400a23 (diff)
downloadvdr-plugin-markad-71a9b82061cc4420da2357ae99ecc701d7a6eedd.tar.gz
vdr-plugin-markad-71a9b82061cc4420da2357ae99ecc701d7a6eedd.tar.bz2
Completed end mark detection
New option -I for correcting info file Better texts for options
Diffstat (limited to 'command/video.cpp')
-rw-r--r--command/video.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/command/video.cpp b/command/video.cpp
index 6f7081b..5c86838 100644
--- a/command/video.cpp
+++ b/command/video.cpp
@@ -792,7 +792,7 @@ void cMarkAdVideo::resetmarks()
}
bool cMarkAdVideo::addmark(int type, int position, MarkAdAspectRatio *before,
- MarkAdAspectRatio *after, bool verticalborders)
+ MarkAdAspectRatio *after)
{
if (marks.Count>marks.maxCount) return false;
if (before)
@@ -805,7 +805,6 @@ bool cMarkAdVideo::addmark(int type, int position, MarkAdAspectRatio *before,
marks.Number[marks.Count].AspectRatioAfter.Num=after->Num;
marks.Number[marks.Count].AspectRatioAfter.Den=after->Den;
}
- marks.Number[marks.Count].VerticalBorders=verticalborders;
marks.Number[marks.Count].Position=position;
marks.Number[marks.Count].Type=type;
marks.Count++;
@@ -863,17 +862,17 @@ MarkAdMarks *cMarkAdVideo::Process(int FrameNumber, int FrameNumberNext)
}
}
- int borderframenumber;
- int hret=hborder->Process(FrameNumber,&borderframenumber);
+ int hborderframenumber;
+ int hret=hborder->Process(FrameNumber,&hborderframenumber);
- if ((hret>0) && (borderframenumber))
+ if ((hret>0) && (hborderframenumber))
{
- addmark(MT_BORDERSTART,borderframenumber);
+ addmark(MT_HBORDERSTART,hborderframenumber);
}
- if ((hret<0) && (borderframenumber))
+ if ((hret<0) && (hborderframenumber))
{
- addmark(MT_BORDERSTOP,borderframenumber);
+ addmark(MT_HBORDERSTOP,hborderframenumber);
}
if (!macontext->Video.Options.IgnoreAspectRatio)