neutrino: add the possibility to lock bouquets by default

This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3999e8d0e2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2011-10-30 11:53:44 +01:00
parent a46910dd27
commit af6edcdc68
10 changed files with 29 additions and 4 deletions

View File

@@ -1191,7 +1191,7 @@ void CChannelList::zapTo(int pos, bool /* forceStoreToLastChannels */)
tuned = pos;
CVFD::getInstance()->setEPGTitle("");
CVFD::getInstance()->showServicename(chan->name);
g_RemoteControl->zapTo_ChannelID(chan->channel_id, chan->name, !chan->bAlwaysLocked); // UTF-8
g_RemoteControl->zapTo_ChannelID(chan->channel_id, chan->name, (chan->bAlwaysLocked == g_settings.parentallock_defaultlocked));
// TODO check is it possible bouquetList is NULL ?
if (bouquetList != NULL) {
CNeutrinoApp::getInstance()->channelList->adjustToChannelID(chan->channel_id);
@@ -1231,7 +1231,7 @@ void CChannelList::NewZap(t_channel_id channel_id)
CVFD::getInstance()->setEPGTitle("");
CVFD::getInstance()->showServicename(chan->name);
selected_chid = chan->getChannelID();
g_RemoteControl->zapTo_ChannelID(chan->getChannelID(), chan->name, !chan->bAlwaysLocked);
g_RemoteControl->zapTo_ChannelID(selected_chid, chan->name, (chan->bAlwaysLocked == g_settings.parentallock_defaultlocked));
/* remove recordModeActive from infobar */
if(g_settings.auto_timeshift && !CNeutrinoApp::getInstance()->recordingstatus) {
g_InfoViewer->handleMsg(NeutrinoMessages::EVT_RECORDMODE, 0);