diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2012-04-04 23:33:34 +0300 |
|---|---|---|
| committer | Ville Skyttä <ville.skytta@iki.fi> | 2012-04-04 23:33:34 +0300 |
| commit | 421d737cabfd96625b708dbad097d070cd69c7d8 (patch) | |
| tree | 8ade9df4986ec8083ae4b064f21a21cf61b0eada | |
| parent | b9b2a8725dbd718e792f4faa661df6bfd219ae84 (diff) | |
| download | vdr-plugin-text2skin-421d737cabfd96625b708dbad097d070cd69c7d8.tar.gz vdr-plugin-text2skin-421d737cabfd96625b708dbad097d070cd69c7d8.tar.bz2 | |
Fix build with VDR 1.7.27.
| -rw-r--r-- | common.c | 8 | ||||
| -rw-r--r-- | display.c | 12 | ||||
| -rw-r--r-- | render.c | 22 | ||||
| -rw-r--r-- | status.c | 4 |
4 files changed, 46 insertions, 0 deletions
@@ -255,11 +255,19 @@ int GetRecordingCuttedLength(const char *FileName, double FramesPerSecond, bool int start = 1; // first frame bool isStart = true; +#if APIVERSNUM >= 10721 + for (cMark *m = marks.First(); m; m = marks.GetNext(m->Position())) { + if (isStart) + start = m->Position(); + else + length += (double)(m->Position() - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min] +#else for (cMark *m = marks.First(); m; m = marks.GetNext(m->position)) { if (isStart) start = m->position; else length += (double)(m->position - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min] +#endif isStart = !isStart; } @@ -1257,17 +1257,29 @@ cxType cText2SkinDisplayMenu::GetTokenData(const txToken &Token) case tRecordingPriority: return mRecording != NULL +#if APIVERSNUM >= 10721 + ? (cxType)mRecording->Priority() +#else ? (cxType)mRecording->priority +#endif : (cxType)false; case tRecordingLifetime: return mRecording != NULL +#if APIVERSNUM >= 10721 + ? (cxType)mRecording->Lifetime() +#else ? (cxType)mRecording->lifetime +#endif : (cxType)false; case tRecordingDateTime: return mRecording != NULL +#if APIVERSNUM >= 10721 + ? (cxType)TimeType(mRecording->Start(), Token.Attrib.Text) +#else ? (cxType)TimeType(mRecording->start, Token.Attrib.Text) +#endif : (cxType)false; case tRecordingTitle: @@ -597,14 +597,25 @@ void cText2SkinRender::DrawProgressbar(const txPoint &Pos, const txSize &Size, i if (Marks) { bool start = true; for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) { +#if APIVERSNUM >= 10721 + txPoint pt(Pos.x + m->Position() * Size.w / Total, Pos.y); +#else txPoint pt(Pos.x + m->position * Size.w / Total, Pos.y); +#endif if (Selected && start) { const cMark *m2 = Marks->Next(m); DrawRectangle(txPoint(pt.x, Pos.y + Size.h / 3), +#if APIVERSNUM >= 10721 + txSize(((m2 ? m2->Position() : Total) - m->Position()) + * Size.w / Total + 1, Size.h - Size.h * 2 / 3 + 1), Selected); + } + DrawMark(pt, Size, start, m->Position() == Current, false, Mark, Cur); +#else txSize(((m2 ? m2->position : Total) - m->position) * Size.w / Total + 1, Size.h - Size.h * 2 / 3 + 1), Selected); } DrawMark(pt, Size, start, m->position == Current, false, Mark, Cur); +#endif start = !start; } } @@ -614,15 +625,26 @@ void cText2SkinRender::DrawProgressbar(const txPoint &Pos, const txSize &Size, i if (Marks) { bool start = true; for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) { +#if APIVERSNUM >= 10721 + txPoint pt(Pos.x, Pos.y + m->Position() * Size.h / Total); +#else txPoint pt(Pos.x, Pos.y + m->position * Size.h / Total); +#endif if (Selected && start) { const cMark *m2 = Marks->Next(m); DrawRectangle(txPoint(Pos.x + Size.w / 3, pt.y), txSize(Size.w - Size.w * 2 / 3 + 1, +#if APIVERSNUM >= 10721 + ((m2 ? m2->Position() : Total) - m->Position()) + * Size.h / Total + 1), Selected); + } + DrawMark(pt, Size, start, m->Position() == Current, true, Mark, Cur); +#else ((m2 ? m2->position : Total) - m->position) * Size.h / Total + 1), Selected); } DrawMark(pt, Size, start, m->position == Current, true, Mark, Cur); +#endif start = !start; } } @@ -314,7 +314,11 @@ cxType cText2SkinStatus::GetTokenData(const txToken &Token) case tReplayDateTime: return mReplay != NULL +#if APIVERSNUM >= 10721 + ? (cxType)TimeType(mReplay->Start(), Token.Attrib.Text) +#else ? (cxType)TimeType(mReplay->start, Token.Attrib.Text) +#endif : (cxType)false; case tReplayShortText: |