From 88db59f61ac47bced386f1c991aa21e0592fdb13 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 29 Nov 2002 14:19:08 +0100 Subject: No longer displaying channel group delimiters without text --- menu.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'menu.c') diff --git a/menu.c b/menu.c index 0210e2d5..25795fb8 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.226 2002/11/24 14:34:41 kls Exp $ + * $Id: menu.c 1.227 2002/11/29 14:06:38 kls Exp $ */ #include "menu.h" @@ -684,15 +684,10 @@ public: cMenuChannels::cMenuChannels(void) :cOsdMenu(tr("Channels"), CHNUMWIDTH) { - //TODO - int i = 0; - cChannel *channel; - int curr = ((channel = Channels.GetByNumber(cDevice::CurrentChannel())) != NULL) ? channel->Index() : -1; - - while ((channel = Channels.Get(i)) != NULL) { - Add(new cMenuChannelItem(channel), i == curr); - i++; - } + for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) { + if (!channel->GroupSep() || *channel->Name()) + Add(new cMenuChannelItem(channel), channel->Number() == cDevice::CurrentChannel()); + } SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark")); } -- cgit v1.2.3