zapit/bouquets: rename bAlwaysLocked => bLockCount

Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a52a97fce
Author: martii <m4rtii@gmx.de>
Date: 2014-05-25 (Sun, 25 May 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-05-25 15:44:27 +02:00
committed by Jacek Jendrzej
parent ce7cb28d85
commit 8bd99bea8e
6 changed files with 12 additions and 12 deletions

View File

@@ -352,7 +352,7 @@ int CChannelList::doChannelMenu(void)
* a channel could be added/removed to/from an unlocked bouquet and so made
* accessible. */
if (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED &&
!!chanlist[selected]->bAlwaysLocked != g_settings.parentallock_defaultlocked)
!!chanlist[selected]->bLockCount != g_settings.parentallock_defaultlocked)
unlocked = (chanlist[selected]->last_unlocked_time + 3600 > time_monotonic());
snprintf(cnt, sizeof(cnt), "%d", i);
@@ -1298,7 +1298,7 @@ void CChannelList::zapToChannel(CZapitChannel *channel, bool force)
}
selected_chid = channel->getChannelID();
g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), (!!channel->bAlwaysLocked == g_settings.parentallock_defaultlocked));
g_RemoteControl->zapTo_ChannelID(selected_chid, channel->getName(), (!!channel->bLockCount == g_settings.parentallock_defaultlocked));
CNeutrinoApp::getInstance()->channelList->adjustToChannelID(channel->getChannelID());
}
if(new_zap_mode != 2 /* not active */) {