From 81139eddb642f4567151ebe98656ef67a72bd9d3 Mon Sep 17 00:00:00 2001 From: Jasmin Jessich Date: Sun, 11 Jun 2017 21:08:35 +0200 Subject: Fixed compilation for VDR 2.3.7 - Removed unused variable cSchedulesLock schedulesLock in epg_events.cpp - Removed unused variable schedulesLockPtr in epginfo.ecpp --- epg_events.cpp | 1 - pages/epginfo.ecpp | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/epg_events.cpp b/epg_events.cpp index bda7ce3..58efe62 100644 --- a/epg_events.cpp +++ b/epg_events.cpp @@ -281,7 +281,6 @@ namespace vdrlive EpgInfoPtr CreateEpgInfo(string const &epgid, cSchedules const *schedules) { string const errorInfo(tr("Epg error")); - cSchedulesLock schedulesLock; tEventID eventId = tEventID(); tChannelID channelId = tChannelID(); diff --git a/pages/epginfo.ecpp b/pages/epginfo.ecpp index f177771..9aa96a9 100644 --- a/pages/epginfo.ecpp +++ b/pages/epginfo.ecpp @@ -7,6 +7,7 @@ #include #include +#if VDRVERSNUM < 20301 namespace vdrlive { class SchedulesLock { @@ -23,6 +24,7 @@ namespace vdrlive { typedef std::tr1::shared_ptr SchedulesLockPtr; } +#endif using namespace vdrlive; using namespace std; @@ -48,10 +50,12 @@ using namespace std; bool aboutBox = false; +#if VDRVERSNUM < 20301 // One of these get initialized when needed. When freed by getting // out of scope they will release (if initialized) important // Semaphores/Locks. SchedulesLockPtr schedulesLockPtr; +#endif RecordingsManagerPtr recordings; if (!epgid.empty()) { @@ -127,9 +131,11 @@ using namespace std; if (recordings) { tools_component = epgEvent->Archived().empty() ? "recordings.rec_tools" : "recordings.archived_disc" ; } +#if VDRVERSNUM < 20301 if (schedulesLockPtr) { tools_component = "epginfo.epgTools"; } +#endif <& pageelems.epg_tt_box boxId=(epgEvent->Id()) caption=(epgEvent->Caption()) tools_comp=(tools_component) time=(start) title=(epgEvent->Title()) short_descr=(epgEvent->ShortDescr()) long_descr=(epgEvent->LongDescr()) archived=(epgEvent->Archived()) elapsed=(epgEvent->Elapsed()) &> <%cpp> -- cgit v1.2.3