From 54c9128b894dc3f09623b0c83a8994870e2e4281 Mon Sep 17 00:00:00 2001
From: FlatTV <FlatTV@gmx.de>
Date: Tue, 25 Oct 2016 18:17:29 +0200
Subject: [PATCH] CamMenu: add "no other CI channel" option to usable channels
 while recording

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/f790f6d05df932c92f0fe0e9ee8f64add3a1e67c
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)


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

------------------
This commit was generated by Migit
---
 data/locale/deutsch.locale |  1 +
 data/locale/english.locale |  1 +
 src/gui/cam_menu.cpp       |  3 ++-
 src/gui/channellist.cpp    | 10 ++++++----
 src/system/locals.h        |  1 +
 src/system/locals_intern.h |  1 +
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 97beeb96f..325b39feb 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -312,6 +312,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
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 37f6eb128..26bffbd5a 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -312,6 +312,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
diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp
index 32b941047..109165b03 100644
--- a/src/gui/cam_menu.cpp
+++ b/src/gui/cam_menu.cpp
@@ -68,7 +68,8 @@ const CMenuOptionChooser::keyval OPTIONS_CA_INIT_OPTIONS[] =
 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))
 
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 0fb5eeb3e..9d31576ee 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -2289,10 +2289,12 @@ bool CChannelList::SameTP(CZapitChannel * channel)
 		if (IS_WEBTV(channel->getChannelID()))
 			return true;
 
-		//NI
-		if(g_settings.ci_mode == 1) {
-			if(channel->bUseCI && CRecordManager::getInstance()->getUseCI())
-				return (CRecordManager::getInstance()->SameTransponder(channel->getChannelID()));
+		//NI - 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);
diff --git a/src/system/locals.h b/src/system/locals.h
index 4f9f86c42..855fd9343 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -339,6 +339,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,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index efafae68e..6ac49c195 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -339,6 +339,7 @@ const char * locale_real_names[] =
 	"ci.mode",
 	"ci.mode_0",
 	"ci.mode_1",
+	"ci.mode_2",
 	"ci.rec_zapto",
 	"ci.removed",
 	"ci.reset",