1 files changed, 0 insertions, 20 deletions

diff --git a/uservars.h b/uservars.h
index 15be5cf..f19ea06 100644
--- a/uservars.h
+++ b/uservars.h
@@ -176,12 +176,8 @@ public:
     string Evaluate(const cEvent* e, bool escapeStrings = false)
 	{
 	    if (!e) return "";
-#if VDRVERSNUM > 20300
 	    LOCK_CHANNELS_READ;
 	    const cChannels *vdrchannels = Channels;
-#else
-	    cChannels *vdrchannels = &Channels;
-#endif
 	    const cChannel *channel = vdrchannels->GetByChannelID(e->ChannelID(), true);
 	    if (!channel) return "";
 
@@ -421,12 +417,8 @@ public:
     string Evaluate(const cEvent* e, bool escapeStrings = false)
 	{
 	    if (!e) return "";
-#if VDRVERSNUM > 20300
 	    LOCK_CHANNELS_READ;
 	    const cChannels *vdrchannels = Channels;
-#else
-	    cChannels *vdrchannels = &Channels;
-#endif
 	    const cChannel *channel = vdrchannels->GetByChannelID(e->ChannelID(), true);
 	    string res = channel?channel->ShortName(true):"";
 	    if (escapeStrings) return "'" + EscapeString(res) + "'"; else return res;
@@ -439,12 +431,8 @@ public:
     string Evaluate(const cEvent* e, bool escapeStrings = false)
 	{
 	    if (!e) return "";
-#if VDRVERSNUM > 20300
 	    LOCK_CHANNELS_READ;
 	    const cChannels *vdrchannels = Channels;
-#else
-	    cChannels *vdrchannels = &Channels;
-#endif
 	    const cChannel *channel = vdrchannels->GetByChannelID(e->ChannelID(), true);
 	    string res = channel?channel->Name():"";
 	    if (escapeStrings) return "'" + EscapeString(res) + "'"; else return res;
@@ -457,12 +445,8 @@ class cChannelDataVar : public cInternalVar {
     string Evaluate(const cEvent* e, bool escapeStrings = false)
 	{
 	    if (!e) return "";
-#if VDRVERSNUM > 20300
 	    LOCK_CHANNELS_READ;
 	    const cChannels *vdrchannels = Channels;
-#else
-	    cChannels *vdrchannels = &Channels;
-#endif
 	    const cChannel *channel = vdrchannels->GetByChannelID(e->ChannelID(), true);
 	    return channel?CHANNELSTRING(channel):"";
 	}
@@ -475,12 +459,8 @@ public:
 	{
 	    if (!e) return "";
 	    ostringstream os;
-#if VDRVERSNUM > 20300
 	    LOCK_CHANNELS_READ;
 	    const cChannels *vdrchannels = Channels;
-#else
-	    cChannels *vdrchannels = &Channels;
-#endif
 	    const cChannel *channel = vdrchannels->GetByChannelID(e->ChannelID(), true);
 	    while(channel && !channel->GroupSep())
 	      channel = vdrchannels->Prev(channel);