Cam Menu: init CI|CARD|BOTH

Signed-off-by: GetAway <get-away@t-online.de>

data/locale/deutsch.locale

@@ -247,6 +247,10 @@ buildinfo.compiler_flags Compiler Flags
 buildinfo.creator Ersteller
 buildinfo.kernel Kernel Version
 buildinfo.menu Build Informationen
+ca_init Aktives CA-System
+ca_init_0 Conax-Karte
+ca_init_1 CI-Modul
+ca_init_2 Conax-Karte und CI-Modul
 cablesetup.provider Kabelanbieter
 channellist.additional Zusatzinformationen
 channellist.additional_desc Beschreibung
@@ -312,6 +316,7 @@ ci.inserted CAM im Slot
 ci.mode CI Kanäle während einer Aufnahme
 ci.mode_0 alle Kanäle
 ci.mode_1 gleicher Transponder
+ci.mode_2 keine CI Kanäle
 ci.rec_zapto Umschalten bei Aufnahmen mit CAM
 ci.removed CAM entfernt -> Slot
 ci.reset Reset
@@ -1089,6 +1094,7 @@ menu.hint_backlight Konfigurieren Sie die Hintergrundbeleuchtung der Buttons
 menu.hint_backup Sichern von Konfigurationen und Kanallisten
 menu.hint_bedit Bearbeiten ihrer Favoriten und der Bouquets
 menu.hint_buildinfo Informationen über Compiler, Compilerflags, Kernel
+menu.hint_ca_init Konfiguration der CA-Systemhardware, CA-Modul und Kartenschächte
 menu.hint_cache_txt Startet das Zwischenspeichern des Videotextes nach einem Kanalwechsel
 menu.hint_cec_mode CEC-Modus
 menu.hint_cec_standby CEC-Standby

data/locale/english.locale

@@ -247,6 +247,10 @@ buildinfo.compiler_flags Compiler flags
 buildinfo.creator Creator
 buildinfo.kernel Kernel version
 buildinfo.menu Build information
+ca_init active CA-System
+ca_init_0 Conax-Card
+ca_init_1 CI module
+ca_init_2 Conax-Card and CI module
 cablesetup.provider cable provider
 channellist.additional Additional informations
 channellist.additional_desc Description
@@ -312,6 +316,7 @@ ci.inserted CAM inserted in slot
 ci.mode Usable CI channel while recording
 ci.mode_0 all channels
 ci.mode_1 same transponder
+ci.mode_2 no other CI channel
 ci.rec_zapto Zap when recording needs CAM
 ci.removed CAM removed from slot
 ci.reset Reset
@@ -1089,6 +1094,7 @@ menu.hint_backlight Configure buttons backlight
 menu.hint_backup Backup configs and channels to selected dir
 menu.hint_bedit Edit favorites and bouquets
 menu.hint_buildinfo Information about compilers, compiler flags, kernel
+menu.hint_ca_init Configuration of CA-system hardware, CA-module and card slots
 menu.hint_cache_txt Start teletext caching after channel switch
 menu.hint_cec_mode CEC mode
 menu.hint_cec_standby CEC standby

src/gui/cam_menu.cpp

@@ -54,10 +54,9 @@
 #include <zapit/zapit.h>
 #include <driver/abstime.h>
 
-#if 0 //CA init
+// CA init
 extern Zapit_config zapitCfg;
 
-
 const CMenuOptionChooser::keyval OPTIONS_CA_INIT_OPTIONS[] =
 {
 	{ 0, LOCALE_CA_INIT_0 },
@@ -65,11 +64,12 @@ 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 }
+	{ 1, LOCALE_CI_MODE_1 },
+	{ 2, LOCALE_CI_MODE_2 }
 };
 #define OPTIONS_CI_MODE_OPTION_COUNT (sizeof(OPTIONS_CI_MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
 
@@ -132,13 +132,13 @@ int CCAMMenuHandler::doMainMenu()
 	CMenuWidget* cammenu = new CMenuWidget(LOCALE_CI_SETTINGS, NEUTRINO_ICON_SETTINGS);
 	cammenu->addIntroItems();
 
-#if 0	//CA init CI|CARD|BOTH
+	// CA init CI|CARD|BOTH
 	CZapit::getInstance()->GetConfig(zapitCfg);
 	CMenuOptionChooser *ca_init = new CMenuOptionChooser(LOCALE_CA_INIT, (int *)&zapitCfg.cam_ci, OPTIONS_CA_INIT_OPTIONS, OPTIONS_CA_INIT_OPTION_COUNT, true, NULL);
-	ca_init->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_CA_INIT);
+	ca_init->setHint(NEUTRINO_ICON_HINT_DEFAULT, LOCALE_MENU_HINT_CA_INIT);
 	cammenu->addItem(ca_init);
 	cammenu->addItem(GenericMenuSeparator);
-#endif
+
 	int CiSlots = ca ? ca->GetNumberCISlots() : 0;
 	if(CiSlots) {
 		cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_RESET_STANDBY, &g_settings.ci_standby_reset, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
@@ -242,9 +242,9 @@ int CCAMMenuHandler::doMainMenu()
 	delete cammenu;
 	in_menu = false;
 
-#if 0	//CA init
+	// CA init
 	CZapit::getInstance()->SetConfig(&zapitCfg);
-#endif
+
 	return ret;
 }
 

src/gui/channellist.cpp

@@ -2422,9 +2422,12 @@ bool CChannelList::SameTP(CZapitChannel * channel)
 		if (IS_WEBCHAN(channel->getChannelID()))
 			return true;
 
-		if(g_settings.ci_mode == 1) {
-			if(channel->bUseCI && CRecordManager::getInstance()->getUseCI())
-				return (CRecordManager::getInstance()->SameTransponder(channel->getChannelID()));
+		// 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
 		}
 
 		iscurrent = CFEManager::getInstance()->canTune(channel);

src/system/locals.h

@@ -274,6 +274,10 @@ typedef enum
 	LOCALE_BUILDINFO_CREATOR,
 	LOCALE_BUILDINFO_KERNEL,
 	LOCALE_BUILDINFO_MENU,
+	LOCALE_CA_INIT,
+	LOCALE_CA_INIT_0,
+	LOCALE_CA_INIT_1,
+	LOCALE_CA_INIT_2,
 	LOCALE_CABLESETUP_PROVIDER,
 	LOCALE_CHANNELLIST_ADDITIONAL,
 	LOCALE_CHANNELLIST_ADDITIONAL_DESC,
@@ -339,6 +343,7 @@ typedef enum
 	LOCALE_CI_MODE,
 	LOCALE_CI_MODE_0,
 	LOCALE_CI_MODE_1,
+	LOCALE_CI_MODE_2,
 	LOCALE_CI_REC_ZAPTO,
 	LOCALE_CI_REMOVED,
 	LOCALE_CI_RESET,
@@ -1116,6 +1121,7 @@ typedef enum
 	LOCALE_MENU_HINT_BACKUP,
 	LOCALE_MENU_HINT_BEDIT,
 	LOCALE_MENU_HINT_BUILDINFO,
+	LOCALE_MENU_HINT_CA_INIT,
 	LOCALE_MENU_HINT_CACHE_TXT,
 	LOCALE_MENU_HINT_CEC_MODE,
 	LOCALE_MENU_HINT_CEC_STANDBY,

src/system/locals_intern.h

@@ -274,6 +274,10 @@ const char * locale_real_names[] =
 	"buildinfo.creator",
 	"buildinfo.kernel",
 	"buildinfo.menu",
+	"ca_init",
+	"ca_init_0",
+	"ca_init_1",
+	"ca_init_2",
 	"cablesetup.provider",
 	"channellist.additional",
 	"channellist.additional_desc",
@@ -339,6 +343,7 @@ const char * locale_real_names[] =
 	"ci.mode",
 	"ci.mode_0",
 	"ci.mode_1",
+	"ci.mode_2",
 	"ci.rec_zapto",
 	"ci.removed",
 	"ci.reset",
@@ -1116,6 +1121,7 @@ const char * locale_real_names[] =
 	"menu.hint_backup",
 	"menu.hint_bedit",
 	"menu.hint_buildinfo",
+	"menu.hint_ca_init",
 	"menu.hint_cache_txt",
 	"menu.hint_cec_mode",
 	"menu.hint_cec_standby",