summaryrefslogtreecommitdiff
path: root/menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/menu.c b/menu.c
index 759cfe0d..eea024c9 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.438 2006/05/28 10:47:40 kls Exp $
+ * $Id: menu.c 1.439 2006/05/28 15:05:42 kls Exp $
*/
#include "menu.h"
@@ -512,20 +512,8 @@ eOSState cMenuChannels::Delete(void)
if (Interface->Confirm(tr("Delete channel?"))) {
if (CurrentChannel && channel == CurrentChannel) {
int n = Channels.GetNextNormal(CurrentChannel->Index());
-#if APIVERSNUM == 10400
- if (n < 0) {
- int Idx = CurrentChannel->Index();
- cChannel *channel = Channels.Get(--Idx);
- while (channel && channel->GroupSep())
- channel = Channels.Get(--Idx);
- if (channel)
- n = Idx;
- }
-#else
-#warning ******* API version changed - remove old stuff
if (n < 0)
n = Channels.GetPrevNormal(CurrentChannel->Index());
-#endif
CurrentChannel = Channels.Get(n);
CurrentChannelNr = 0; // triggers channel switch below
}
@@ -536,11 +524,8 @@ eOSState cMenuChannels::Delete(void)
if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
Channels.SwitchTo(CurrentChannel->Number());
-#if APIVERSNUM != 10400
-#warning ******* API version changed - activate new code
else
cDevice::SetCurrentChannel(CurrentChannel);
-#endif
}
}
}
@@ -563,11 +548,8 @@ void cMenuChannels::Move(int From, int To)
if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
Channels.SwitchTo(CurrentChannel->Number());
-#if APIVERSNUM != 10400
-#warning ******* API version changed - activate new code
else
cDevice::SetCurrentChannel(CurrentChannel);
-#endif
}
}
}