mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/bouquets: rename bAlwaysLocked => bLockCount

Browse Source
This commit is contained in:
martii
2014-05-25 15:44:27 +02:00
committed by Jacek Jendrzej
parent abe03ad749
commit 3a52a97fce
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/daemonc/remotecontrol.cpp
View File

@@ -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

10
src/gui/bedit/bouqueteditor_bouquets.cpp
View File

@@ -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)

4
src/gui/channellist.cpp
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 */) {

2
src/zapit/include/zapit/channel.h
View File

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

4
src/zapit/src/bouquets.cpp
View File

@@ -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());
}
}

2
src/zapit/src/channel.cpp
View File

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