minor changes

2 files changed, 8 insertions, 9 deletions

diff --git a/handler.h b/handler.h
index 53b7211..d00e1f2 100644
--- a/handler.h
+++ b/handler.h
@@ -8,6 +8,8 @@
 #ifndef __HANDLER_H
 #define __HANDLER_H
 
+#include "lib/vdrlocks.h"
+
 #include "update.h"
 
 #define CHANNELMARKOBSOLETE "OBSOLETE"
@@ -1031,12 +1033,7 @@ class cEpg2VdrEpgHandler : public cEpgHandler
 
          // channel lock scope
          {
-#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
-            LOCK_CHANNELS_READ;
-            const cChannels* channels = Channels;
-#else
-            cChannels* channels = &Channels;
-#endif
+            GET_CHANNELS_READ(channels);
 
             for (int f = selectAll->find(); f; f = selectAll->fetch())
             {
diff --git a/menutimers.c b/menutimers.c
index 9c7b8d3..bd71e97 100644
--- a/menutimers.c
+++ b/menutimers.c
@@ -8,6 +8,7 @@
 #include <vdr/menu.h>
 #include <vdr/interface.h>
 
+#include "lib/vdrlocks.h"
 #include "plgconfig.h"
 #include "menu.h"
 
@@ -133,11 +134,12 @@ eOSState cMenuEpgEditTimer::ProcessKey(eKeys Key)
          {
             int recording = no;
 
+            GET_CHANNELS_READ(channels);
+
 #if APIVERSNUM >= 20301
-            LOCK_CHANNELS_READ;
-            const cChannel* ch = Channels->GetByNumber(channelNr);
+            const cChannel* ch = channels->GetByNumber(channelNr);
 #else
-            cChannel* ch = Channels.GetByNumber(channelNr);
+            cChannel* ch = channels.GetByNumber(channelNr);
 #endif
 
             if (!ch)