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

src/daemonc/remotecontrol.cpp

@@ -147,7 +147,7 @@ int CRemoteControl::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
 				is_video_started = true;
 				if (channel) {
 					current_channel_name = channel->getName();
-					if (!!channel->bAlwaysLocked != g_settings.parentallock_defaultlocked)
+					if (!!channel->bLockCount != g_settings.parentallock_defaultlocked)
 						stopvideo();
 				}
 				CVFD::getInstance()->showServicename(current_channel_name); // UTF-8

src/gui/bedit/bouqueteditor_bouquets.cpp

@@ -433,11 +433,11 @@ void CBEBouquetWidget::deleteBouquet()
 	if ((*Bouquets)[selected]->bLocked) {
 		ZapitChannelList *channels = &(*Bouquets)[selected]->tvChannels;
 		for(unsigned int i = 0; i < channels->size(); i++)
-			((*channels)[i])->bAlwaysLocked--;
+			((*channels)[i])->bLockCount--;
 
 		channels = &(*Bouquets)[selected]->radioChannels;
 		for(unsigned int i = 0; i < channels->size(); i++)
-			((*channels)[i])->bAlwaysLocked--;
+			((*channels)[i])->bLockCount--;
 	}
 
 	g_bouquetManager->deleteBouquet(selected);
@@ -531,15 +531,15 @@ void CBEBouquetWidget::switchLockBouquet()
 	(*Bouquets)[selected]->bLocked = !(*Bouquets)[selected]->bLocked;
 	paint();
 
-	int add = (*Bouquets)[selected]->bLocked ? +1 : -1;
+	int add = (*Bouquets)[selected]->bLocked * 2 - 1;
 
 	ZapitChannelList *channels = &(*Bouquets)[selected]->tvChannels;
 	for(unsigned int i = 0; i < channels->size(); i++)
-		((*channels)[i])->bAlwaysLocked += add;
+		((*channels)[i])->bLockCount += add;
 
 	channels = &(*Bouquets)[selected]->radioChannels;
 	for(unsigned int i = 0; i < channels->size(); i++)
-		((*channels)[i])->bAlwaysLocked += add;
+		((*channels)[i])->bLockCount += add;
 }
 
 std::string CBEBouquetWidget::inputName(const char * const defaultName, const neutrino_locale_t caption)

src/gui/channellist.cpp

@@ -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 */) {

src/zapit/include/zapit/channel.h

@@ -178,7 +178,7 @@ class CZapitChannel
 		} channel_flags_t;
 		casys_map_t			camap;
 
-		unsigned int			bAlwaysLocked;
+		unsigned int			bLockCount;
 
 		int				number;
 		CChannelEvent			currentEvent,nextEvent;

src/zapit/src/bouquets.cpp

@@ -111,7 +111,7 @@ void CZapitBouquet::addService(CZapitChannel* newChannel)
 			break;
 	}
 	if (bLocked)
-		newChannel->bAlwaysLocked++;
+		newChannel->bLockCount++;
 }
 
 void CZapitBouquet::removeService(CZapitChannel* oldChannel)
@@ -131,7 +131,7 @@ void CZapitBouquet::removeService(CZapitChannel* oldChannel)
 		}
 
 		if (bLocked)
-			oldChannel->bAlwaysLocked--;
+			oldChannel->bLockCount--;
 		(*channels).erase(remove(channels->begin(), channels->end(), oldChannel), channels->end());
 	}
 }

src/zapit/src/channel.cpp

@@ -69,7 +69,7 @@ void CZapitChannel::Init()
 	polarization = 0;
 	flags = 0;
 	deltype = FE_QPSK;
-	bAlwaysLocked = 0;
+	bLockCount = 0;
 }
 
 CZapitChannel::~CZapitChannel(void)