Move left/right handling after user-defined keys

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1987 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-12-22 15:51:46 +00:00
parent ed0166e600
commit 83e0e1bc98

View File

@@ -376,20 +376,6 @@ int CBouquetList::show(bool bShowChannelList)
return -3;
}
}
else if(msg == CRCInput::RC_left || msg == CRCInput::RC_right) {
if(bShowChannelList) {
int mode = CNeutrinoApp::getInstance()->GetChannelMode();
mode += (msg == CRCInput::RC_left) ? -1 : 1;
if(mode < 0)
mode = LIST_MODE_LAST - 1;
else if(mode >= LIST_MODE_LAST)
mode = 0;
CNeutrinoApp::getInstance()->SetChannelMode(mode);
hide();
return -3;
}
}
else if(Bouquets.size() == 0)
continue; //FIXME msgs not forwarded to neutrino !!
else if ( msg == CRCInput::RC_setup) {
@@ -469,6 +455,20 @@ int CBouquetList::show(bool bShowChannelList)
else
paintItem(selected - liststart);
}
else if(msg == CRCInput::RC_left || msg == CRCInput::RC_right) {
if(bShowChannelList) {
int mode = CNeutrinoApp::getInstance()->GetChannelMode();
mode += (msg == CRCInput::RC_left) ? -1 : 1;
if(mode < 0)
mode = LIST_MODE_LAST - 1;
else if(mode >= LIST_MODE_LAST)
mode = 0;
CNeutrinoApp::getInstance()->SetChannelMode(mode);
hide();
return -3;
}
}
else if ( msg == CRCInput::RC_ok ) {
if(!bShowChannelList || Bouquets[selected]->channelList->getSize() > 0) {