summaryrefslogtreecommitdiff
path: root/pages/whats_on.ecpp
diff options
context:
space:
mode:
Diffstat (limited to 'pages/whats_on.ecpp')
-rw-r--r--pages/whats_on.ecpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index 8232875..f9a66c3 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -38,8 +38,12 @@ string current_displaytime;
if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
+#if VDRVERSNUM >= 20301
+LOCK_SCHEDULES_READ;
+#else
cSchedulesLock schedulesLock;
const cSchedules* Schedules = cSchedules::Schedules(schedulesLock);
+#endif
string head;
time_t seektime = 0;
@@ -124,10 +128,19 @@ if (type == "now") {
// collect the broadcasts
if (type != "favs")
{
+#if VDRVERSNUM >= 20301
+ LOCK_CHANNELS_READ;
+ if (true) {
+#else
ReadLock channelsLock( Channels );
if (channelsLock) {
+#endif
// int evntNr = 0;
+#if VDRVERSNUM >= 20301
+ for (cChannel *Channel = (cChannel *)Channels->First(); Channel && Channel->Number() <= LiveSetup().GetLastChannel(); Channel = (cChannel *)Channels->Next(Channel)) {
+#else
for (cChannel *Channel = Channels.First(); Channel && Channel->Number() <= LiveSetup().GetLastChannel(); Channel = Channels.Next(Channel)) {
+#endif
if (Channel->GroupSep()) {
continue;
}