[vdr-text2skin] Patch to build with VDR 1.7.27.

[Ville Skyttä]

commit 914ac9730f79ceafcec4b5271de38ee151c0cbee
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Mar 27 23:55:41 2012 +0300

    Patch to build with VDR 1.7.27.

 vdr-text2skin-1.3.2-vdr1727.patch |   98 +++++++++++++++++++++++++++++++++++++
 vdr-text2skin.spec                |    9 +++-
 2 files changed, 105 insertions(+), 2 deletions(-)
---
diff --git a/vdr-text2skin-1.3.2-vdr1727.patch b/vdr-text2skin-1.3.2-vdr1727.patch
new file mode 100644
index 0000000..d3141b4
--- /dev/null
+++ b/vdr-text2skin-1.3.2-vdr1727.patch
@@ -0,0 +1,98 @@
+diff --git a/common.c b/common.c
+index 8ca0315..c398fe1 100644
+--- a/common.c
++++ b/common.c
+@@ -255,11 +255,11 @@ int GetRecordingCuttedLength(const char *FileName, double FramesPerSecond, bool
+ 		int start = 1; // first frame
+ 		bool isStart = true;
+ 
+-		for (cMark *m = marks.First(); m; m = marks.GetNext(m->position)) {
++		for (cMark *m = marks.First(); m; m = marks.GetNext(m->Position())) {
+ 			if (isStart)
+-				start = m->position;
++				start = m->Position();
+ 			else
+-				length += (double)(m->position - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
++				length += (double)(m->Position() - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
+ 
+ 			isStart = !isStart;
+ 		}
+diff --git a/display.c b/display.c
+index 93086e5..ec510d7 100644
+--- a/display.c
++++ b/display.c
+@@ -1257,17 +1257,17 @@ cxType cText2SkinDisplayMenu::GetTokenData(const txToken &Token)
+ 
+ 	case tRecordingPriority:
+ 		return mRecording != NULL
+-		       ? (cxType)mRecording->priority
++		       ? (cxType)mRecording->Priority()
+ 		       : (cxType)false;
+ 
+ 	case tRecordingLifetime:
+ 		return mRecording != NULL
+-		       ? (cxType)mRecording->lifetime
++		       ? (cxType)mRecording->Lifetime()
+ 		       : (cxType)false;
+ 
+ 	case tRecordingDateTime:
+ 		return mRecording != NULL
+-		       ? (cxType)TimeType(mRecording->start, Token.Attrib.Text)
++		       ? (cxType)TimeType(mRecording->Start(), Token.Attrib.Text)
+ 		       : (cxType)false;
+ 
+ 	case tRecordingTitle:
+diff --git a/render.c b/render.c
+index 20b6976..9fdd0bf 100644
+--- a/render.c
++++ b/render.c
+@@ -597,14 +597,14 @@ 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)) {
+-				txPoint pt(Pos.x + m->position * Size.w / Total, Pos.y);
++				txPoint pt(Pos.x + m->Position() * Size.w / Total, Pos.y);
+ 				if (Selected && start) {
+ 					const cMark *m2 = Marks->Next(m);
+ 					DrawRectangle(txPoint(pt.x, Pos.y + Size.h / 3), 
+-					              txSize(((m2 ? m2->position : Total) - m->position) 
++					              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);
++				DrawMark(pt, Size, start, m->Position() == Current, false, Mark, Cur);
+ 				start = !start;
+ 			}
+ 		}
+@@ -614,15 +614,15 @@ 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)) {
+-				txPoint pt(Pos.x, Pos.y + m->position * Size.h / Total);
++				txPoint pt(Pos.x, Pos.y + m->Position() * Size.h / Total);
+ 				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,
+-					              ((m2 ? m2->position : Total) - m->position)
++					              ((m2 ? m2->Position() : Total) - m->Position())
+ 					              * Size.h / Total + 1), Selected);
+ 				}
+-				DrawMark(pt, Size, start, m->position == Current, true, Mark, Cur);
++				DrawMark(pt, Size, start, m->Position() == Current, true, Mark, Cur);
+ 				start = !start;
+ 			}
+ 		}
+diff --git a/status.c b/status.c
+index 5ecd7c8..8cadc2f 100644
+--- a/status.c
++++ b/status.c
+@@ -314,7 +314,7 @@ cxType cText2SkinStatus::GetTokenData(const txToken &Token)
+ 
+ 	case tReplayDateTime:
+ 		return mReplay != NULL
+-		       ? (cxType)TimeType(mReplay->start, Token.Attrib.Text)
++		       ? (cxType)TimeType(mReplay->Start(), Token.Attrib.Text)
+ 		       : (cxType)false;
+ 
+ 	case tReplayShortText:
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 6dd7eec..a683ae6 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -13,6 +13,7 @@ URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
 Source0:        http://projects.vdr-developer.org/attachments/download/783/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         %{name}-1.3-skindir.patch
+Patch1:         %{name}-1.3.2-vdr1727.patch
 
 %if "%{imagelib}" == "imagemagick"
 BuildRequires:  ImageMagick-c++-devel
@@ -23,7 +24,7 @@ BuildRequires:  GraphicsMagick-c++-devel
 %if "%{imagelib}" == "imlib2"
 BuildRequires:  imlib2-devel
 %endif
-BuildRequires:  vdr-devel >= 1.6.0-41
+BuildRequires:  vdr-devel >= 1.7.21
 BuildRequires:  gawk
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
@@ -40,6 +41,7 @@ of the skin wishes.
 %prep
 %setup -q -n %{pname}-%{version}
 sed -e 's|/usr/share/vdr/|%{vdr_datadir}/|' %{PATCH0} | patch -p1
+%patch1 -p1
 chmod -c -x contrib/*.pl
 
 
@@ -74,6 +76,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Tue Mar 27 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.3.2-8
+- Patch to build with VDR 1.7.27.
+
 * Sun Mar 11 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.3.2-7
 - Rebuild.