summaryrefslogtreecommitdiff
path: root/timerconflict.c
diff options
context:
space:
mode:
authorkamel5 <kamel5 (at) gmx (dot) net>2018-03-08 13:02:38 +0100
committerkamel5 <vdr.kamel5 (at) gmx (dot) net>2019-01-27 11:29:38 +0100
commitcbc6f442648a0aea4b94d81176f044c642a7d2b0 (patch)
tree3bfdc0baebcbaec7845edcc521b4041e6a25035c /timerconflict.c
parent8287bb5f7deef757f38b3e2a4ed5a08a57881f7e (diff)
downloadvdr-plugin-tvguide-cbc6f442648a0aea4b94d81176f044c642a7d2b0.tar.gz
vdr-plugin-tvguide-cbc6f442648a0aea4b94d81176f044c642a7d2b0.tar.bz2
Compile under VDR 2.3.1
Diffstat (limited to 'timerconflict.c')
-rw-r--r--timerconflict.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/timerconflict.c b/timerconflict.c
index e2a1fee..79f2ce4 100644
--- a/timerconflict.c
+++ b/timerconflict.c
@@ -86,7 +86,12 @@ void cTVGuideTimerConflicts::CalculateConflicts(void) {
cTimeInterval *unionSet = NULL;
int numTimers = conflicts[i]->timerIDs.size();
for (int j=0; j < numTimers; j++) {
+#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+ LOCK_TIMERS_READ;
+ const cTimer *timer = Timers->Get(conflicts[i]->timerIDs[j]);
+#else
const cTimer *timer = Timers.Get(conflicts[i]->timerIDs[j]);
+#endif
if (timer) {
if (!unionSet) {
unionSet = new cTimeInterval(timer->StartTime(), timer->StopTime());
@@ -105,7 +110,12 @@ void cTVGuideTimerConflicts::CalculateConflicts(void) {
cTimeInterval *intersect = NULL;
for (int j=0; j < numTimers; j++) {
+#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+ LOCK_TIMERS_READ;
+ const cTimer *timer = Timers->Get(conflicts[i]->timerIDs[j]);
+#else
const cTimer *timer = Timers.Get(conflicts[i]->timerIDs[j]);
+#endif
if (timer) {
if (!intersect) {
intersect = new cTimeInterval(timer->StartTime(), timer->StopTime());