| 1 |
hd_brummy 12/04/07 19:08:48 |
| 2 |
|
| 3 |
Added: vdr-1.7.27.diff |
| 4 |
Log: |
| 5 |
compilefix >=vdr-1.7.27 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.11/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-plugins/vdr-text2skin/files/vdr-1.7.27.diff |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: vdr-1.7.27.diff |
| 16 |
=================================================================== |
| 17 |
diff -Naur text2skin-1.3.2.orig/display.c text2skin-1.3.2/display.c |
| 18 |
--- text2skin-1.3.2.orig/display.c 2012-04-07 20:45:11.000000000 +0200 |
| 19 |
+++ text2skin-1.3.2/display.c 2012-04-07 20:45:47.000000000 +0200 |
| 20 |
@@ -1233,17 +1233,17 @@ |
| 21 |
|
| 22 |
case tRecordingPriority: |
| 23 |
return mRecording != NULL |
| 24 |
- ? (cxType)mRecording->priority |
| 25 |
+ ? (cxType)mRecording->Priority() |
| 26 |
: (cxType)false; |
| 27 |
|
| 28 |
case tRecordingLifetime: |
| 29 |
return mRecording != NULL |
| 30 |
- ? (cxType)mRecording->lifetime |
| 31 |
+ ? (cxType)mRecording->Lifetime() |
| 32 |
: (cxType)false; |
| 33 |
|
| 34 |
case tRecordingDateTime: |
| 35 |
return mRecording != NULL |
| 36 |
- ? (cxType)TimeType(mRecording->start, Token.Attrib.Text) |
| 37 |
+ ? (cxType)TimeType(mRecording->Start(), Token.Attrib.Text) |
| 38 |
: (cxType)false; |
| 39 |
|
| 40 |
case tRecordingTitle: |
| 41 |
diff -Naur text2skin-1.3.2.orig/render.c text2skin-1.3.2/render.c |
| 42 |
--- text2skin-1.3.2.orig/render.c 2012-04-07 20:45:11.000000000 +0200 |
| 43 |
+++ text2skin-1.3.2/render.c 2012-04-07 20:48:29.000000000 +0200 |
| 44 |
@@ -597,14 +597,14 @@ |
| 45 |
if (Marks) { |
| 46 |
bool start = true; |
| 47 |
for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) { |
| 48 |
- txPoint pt(Pos.x + m->position * Size.w / Total, Pos.y); |
| 49 |
+ txPoint pt(Pos.x + m->Position() * Size.w / Total, Pos.y); |
| 50 |
if (Selected && start) { |
| 51 |
const cMark *m2 = Marks->Next(m); |
| 52 |
DrawRectangle(txPoint(pt.x, Pos.y + Size.h / 3), |
| 53 |
- txSize(((m2 ? m2->position : Total) - m->position) |
| 54 |
+ txSize(((m2 ? m2->Position() : Total) - m->Position()) |
| 55 |
* Size.w / Total + 1, Size.h - Size.h * 2 / 3 + 1), Selected); |
| 56 |
} |
| 57 |
- DrawMark(pt, Size, start, m->position == Current, false, Mark, Cur); |
| 58 |
+ DrawMark(pt, Size, start, m->Position() == Current, false, Mark, Cur); |
| 59 |
start = !start; |
| 60 |
} |
| 61 |
} |
| 62 |
@@ -614,15 +614,15 @@ |
| 63 |
if (Marks) { |
| 64 |
bool start = true; |
| 65 |
for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) { |
| 66 |
- txPoint pt(Pos.x, Pos.y + m->position * Size.h / Total); |
| 67 |
+ txPoint pt(Pos.x, Pos.y + m->Position() * Size.h / Total); |
| 68 |
if (Selected && start) { |
| 69 |
const cMark *m2 = Marks->Next(m); |
| 70 |
DrawRectangle(txPoint(Pos.x + Size.w / 3, pt.y), |
| 71 |
txSize(Size.w - Size.w * 2 / 3 + 1, |
| 72 |
- ((m2 ? m2->position : Total) - m->position) |
| 73 |
+ ((m2 ? m2->Position() : Total) - m->Position()) |
| 74 |
* Size.h / Total + 1), Selected); |
| 75 |
} |
| 76 |
- DrawMark(pt, Size, start, m->position == Current, true, Mark, Cur); |
| 77 |
+ DrawMark(pt, Size, start, m->Position() == Current, true, Mark, Cur); |
| 78 |
start = !start; |
| 79 |
} |
| 80 |
} |
| 81 |
diff -Naur text2skin-1.3.2.orig/common.c text2skin-1.3.2/common.c |
| 82 |
--- text2skin-1.3.2.orig/common.c 2012-04-07 20:54:59.000000000 +0200 |
| 83 |
+++ text2skin-1.3.2/common.c 2012-04-07 20:56:00.000000000 +0200 |
| 84 |
@@ -255,11 +255,11 @@ |
| 85 |
int start = 1; // first frame |
| 86 |
bool isStart = true; |
| 87 |
|
| 88 |
- for (cMark *m = marks.First(); m; m = marks.GetNext(m->position)) { |
| 89 |
+ for (cMark *m = marks.First(); m; m = marks.GetNext(m->Position())) { |
| 90 |
if (isStart) |
| 91 |
- start = m->position; |
| 92 |
+ start = m->Position(); |
| 93 |
else |
| 94 |
- length += (double)(m->position - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min] |
| 95 |
+ length += (double)(m->Position() - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min] |
| 96 |
|
| 97 |
isStart = !isStart; |
| 98 |
} |
| 99 |
diff -Naur text2skin-1.3.2.orig/status.c text2skin-1.3.2/status.c |
| 100 |
--- text2skin-1.3.2.orig/status.c 2012-04-07 20:59:39.000000000 +0200 |
| 101 |
+++ text2skin-1.3.2/status.c 2012-04-07 21:01:12.000000000 +0200 |
| 102 |
@@ -314,7 +314,7 @@ |
| 103 |
|
| 104 |
case tReplayDateTime: |
| 105 |
return mReplay != NULL |
| 106 |
- ? (cxType)TimeType(mReplay->start, Token.Attrib.Text) |
| 107 |
+ ? (cxType)TimeType(mReplay->Start(), Token.Attrib.Text) |
| 108 |
: (cxType)false; |
| 109 |
|
| 110 |
case tReplayShortText: |
Archives