mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cam Menu: Allow switching to all or same transponder channels

Browse Source 
while CI recording

Signed-off-by: GetAway <get-away@t-online.de>
This commit is contained in:
FlatTV
2020-01-01 14:17:30 +01:00
committed by GetAway
parent f291dfb445
commit 250be1184a
8 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/cam_menu.cpp
View File

@@ -65,14 +65,14 @@ const CMenuOptionChooser::keyval OPTIONS_CA_INIT_OPTIONS[] =
{ 2, LOCALE_CA_INIT_2 }
};
#define OPTIONS_CA_INIT_OPTION_COUNT (sizeof(OPTIONS_CA_INIT_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
#endif
const CMenuOptionChooser::keyval OPTIONS_CI_MODE_OPTIONS[] =
{
{ 0, LOCALE_CI_MODE_0 },
{ 1, LOCALE_CI_MODE_1 },
{ 2, LOCALE_CI_MODE_2 }
{ 1, LOCALE_CI_MODE_1 }
};
#define OPTIONS_CI_MODE_OPTION_COUNT (sizeof(OPTIONS_CI_MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
#endif
#define CI_CLOCK_OPTION_COUNT 2
static const CMenuOptionChooser::keyval CI_CLOCK_OPTIONS[CI_CLOCK_OPTION_COUNT] = {
{ 6, LOCALE_CI_CLOCK_NORMAL },
@@ -151,11 +151,10 @@ int CCAMMenuHandler::doMainMenu()
cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_SAVE_PINCODE, &g_settings.ci_save_pincode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_REC_ZAPTO, &g_settings.ci_rec_zapto, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
#if 0
CMenuOptionChooser *ci_mode = new CMenuOptionChooser(LOCALE_CI_MODE, &g_settings.ci_mode, OPTIONS_CI_MODE_OPTIONS, OPTIONS_CI_MODE_OPTION_COUNT, true, NULL);
ci_mode->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_CI_MODE);
ci_mode->setHint(NEUTRINO_ICON_HINT_DEFAULT, LOCALE_MENU_HINT_CI_MODE);
cammenu->addItem(ci_mode);
#endif
#ifdef BOXMODEL_CS_HD2
int fecount = CFEManager::getInstance()->getFrontendCount();
char fename[fecount+1][255];

12
src/gui/channellist.cpp
View File

@@ -2422,16 +2422,10 @@ bool CChannelList::SameTP(CZapitChannel * channel)
if (IS_WEBCHAN(channel->getChannelID()))
return true;
#if 0 //Usable CI channel while recording
if(g_settings.ci_mode != 0 && channel->bUseCI && CRecordManager::getInstance()->getUseCI()) {
if(g_settings.ci_mode == 1)
return (CRecordManager::getInstance()->SameTransponder(channel->getChannelID())); // SameTransponder
else
return false; // No other CI channel
if(g_settings.ci_mode == 1) {
if(channel->bUseCI && CRecordManager::getInstance()->getUseCI())
return (CRecordManager::getInstance()->SameTransponder(channel->getChannelID()));
}
#endif
if(channel->bUseCI && CRecordManager::getInstance()->getUseCI())
return false;
iscurrent = CFEManager::getInstance()->canTune(channel);
}