Gentoo Archives: gentoo-commits

From: "Christian Ruppert (idl0r)" <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-live/files: vdr-1.7.27-compatibility.patch
Date: Mon, 02 Apr 2012 20:31:10
Message-Id: 20120402203050.77C282004B@flycatcher.gentoo.org
1 idl0r 12/04/02 20:30:50
2
3 Added: vdr-1.7.27-compatibility.patch
4 Log:
5 Add vdr >=1.7.27 compatibility patch
6
7 (Portage version: 2.2.0_alpha98/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-live/files/vdr-1.7.27-compatibility.patch?rev=1.1&content-type=text/plain
14
15 Index: vdr-1.7.27-compatibility.patch
16 ===================================================================
17 commit 94a0a210a485ce1fc95c47a6bc67c4c16c89a0f9
18 Author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
19 Date: Sun Mar 25 16:42:12 2012 +0200
20
21 Updated LIVE to latest changes in vdr 1.7.27
22 - Do not use the direct access to cRecoding members any more.
23
24 diff --git a/epg_events.cpp b/epg_events.cpp
25 index a514769..cd4996e 100644
26 --- a/epg_events.cpp
27 +++ b/epg_events.cpp
28 @@ -182,12 +182,20 @@ namespace vdrlive
29
30 time_t EpgRecording::GetStartTime() const
31 {
32 +#if VDRVERSNUM < 10726
33 return m_recording ? m_recording->start : 0;
34 +#else
35 + return m_recording ? m_recording->Start() : 0;
36 +#endif
37 }
38
39 time_t EpgRecording::GetEndTime() const
40 {
41 +#if VDRVERSNUM < 10726
42 return m_recording ? m_recording->start : 0;
43 +#else
44 + return m_recording ? m_recording->Start() : 0;
45 +#endif
46 }
47
48 const string EpgRecording::Name() const
49 diff --git a/recman.cpp b/recman.cpp
50 index fb315d2..6a2fc00 100644
51 --- a/recman.cpp
52 +++ b/recman.cpp
53 @@ -383,7 +383,11 @@ namespace vdrlive {
54
55 time_t RecordingsItemRec::StartTime() const
56 {
57 +#if VDRVERSNUM < 10726
58 return m_recording->start;
59 +#else
60 + return m_recording->Start();
61 +#endif
62 }
63
64 long RecordingsItemRec::Duration() const