mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

CamMenu: add "no other CI channel" option to usable channels while recording

Browse Source 
Origin commit data
------------------
Commit: f790f6d05d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
This commit is contained in:
FlatTV
2016-10-25 18:17:29 +02:00
parent 3d37c18a62
commit 5f14ad95b0
6 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -312,6 +312,7 @@ ci.inserted CAM im Slot
ci.mode CI Kanäle während einer Aufnahme ci.mode CI Kanäle während einer Aufnahme
ci.mode_0 alle Kanäle ci.mode_0 alle Kanäle
ci.mode_1 gleicher Transponder ci.mode_1 gleicher Transponder
ci.mode_2 keine CI Kanäle
ci.rec_zapto Umschalten bei Aufnahmen mit CAM ci.rec_zapto Umschalten bei Aufnahmen mit CAM
ci.removed CAM entfernt -> Slot ci.removed CAM entfernt -> Slot
ci.reset Reset ci.reset Reset

1
data/locale/english.locale
View File

@@ -312,6 +312,7 @@ ci.inserted CAM inserted in slot
ci.mode Usable CI channel while recording ci.mode Usable CI channel while recording
ci.mode_0 all channels ci.mode_0 all channels
ci.mode_1 same transponder ci.mode_1 same transponder
ci.mode_2 no other CI channel
ci.rec_zapto Zap when recording needs CAM ci.rec_zapto Zap when recording needs CAM
ci.removed CAM removed from slot ci.removed CAM removed from slot
ci.reset Reset ci.reset Reset

3
src/gui/cam_menu.cpp
View File

@@ -68,7 +68,8 @@ const CMenuOptionChooser::keyval OPTIONS_CA_INIT_OPTIONS[] =
const CMenuOptionChooser::keyval OPTIONS_CI_MODE_OPTIONS[] = const CMenuOptionChooser::keyval OPTIONS_CI_MODE_OPTIONS[] =
{ {
{ 0, LOCALE_CI_MODE_0 }, { 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)) #define OPTIONS_CI_MODE_OPTION_COUNT (sizeof(OPTIONS_CI_MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval))

10
src/gui/channellist.cpp
View File

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

1
src/system/locals.h
View File

@@ -339,6 +339,7 @@ typedef enum
LOCALE_CI_MODE, LOCALE_CI_MODE,
LOCALE_CI_MODE_0, LOCALE_CI_MODE_0,
LOCALE_CI_MODE_1, LOCALE_CI_MODE_1,
LOCALE_CI_MODE_2,
LOCALE_CI_REC_ZAPTO, LOCALE_CI_REC_ZAPTO,
LOCALE_CI_REMOVED, LOCALE_CI_REMOVED,
LOCALE_CI_RESET, LOCALE_CI_RESET,

1
src/system/locals_intern.h
View File

@@ -339,6 +339,7 @@ const char * locale_real_names[] =
"ci.mode", "ci.mode",
"ci.mode_0", "ci.mode_0",
"ci.mode_1", "ci.mode_1",
"ci.mode_2",
"ci.rec_zapto", "ci.rec_zapto",
"ci.removed", "ci.removed",
"ci.reset", "ci.reset",