Gentoo Archives: gentoo-commits

From: "Joerg Bornkessel (hd_brummy)" <hd_brummy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-vompserver/files: vdr-1.7.27.diff
Date: Tue, 01 May 2012 12:57:03
Message-Id: 20120501125648.44A662004B@flycatcher.gentoo.org
1 hd_brummy 12/05/01 12:56:48
2
3 Added: vdr-1.7.27.diff
4 Log:
5 vdr-plugin-2.eclass; 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-vompserver/files/vdr-1.7.27.diff
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-vompserver/files/vdr-1.7.27.diff?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-vompserver/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 vompserver-0.3.1.orig/mvpreceiver.c vompserver-0.3.1/mvpreceiver.c
18 --- vompserver-0.3.1.orig/mvpreceiver.c 2012-05-01 14:35:39.000000000 +0200
19 +++ vompserver-0.3.1/mvpreceiver.c 2012-05-01 14:49:08.000000000 +0200
20 @@ -40,7 +40,7 @@
21 #elif VDRVERSNUM < 10500
22 : cReceiver(channel->Ca(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
23 #else
24 -: cReceiver(channel->GetChannelID(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
25 +: cReceiver(channel, 0)
26 #endif
27 {
28 logger = Log::getInstance();
29 diff -Naur vompserver-0.3.1.orig/vompclientrrproc.c vompserver-0.3.1/vompclientrrproc.c
30 --- vompserver-0.3.1.orig/vompclientrrproc.c 2012-05-01 14:35:39.000000000 +0200
31 +++ vompserver-0.3.1/vompclientrrproc.c 2012-05-01 14:46:41.000000000 +0200
32 @@ -615,7 +615,7 @@
33
34 for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording))
35 {
36 - resp->addULONG(recording->start);
37 + resp->addULONG(recording->Start());
38 resp->addString(recording->Name());
39 resp->addString(recording->FileName());
40 }
41 @@ -1770,9 +1770,9 @@
42 {
43 for (const cMark *m = Marks.First(); m; m = Marks.Next(m))
44 {
45 - log->log("RRProc", Log::DEBUG, "found Mark %i", m->position);
46 + log->log("RRProc", Log::DEBUG, "found Mark %i", m->Position());
47
48 - resp->addULONG(m->position);
49 + resp->addULONG(m->Position());
50 }
51 }
52 else