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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/cam_menu.cpp
	src/gui/info_menue.cpp
	src/gui/mediaplayer.cpp
	src/gui/network_setup.cpp
	src/gui/record_setup.cpp
	src/gui/settings_manager.cpp
	src/gui/update_menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d5f5578ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-13 15:05:33 +02:00
parent 46e5e5e202 f55d2b44a6
commit 612837a196
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/cam_menu.cpp
View File

@@ -123,8 +123,6 @@ int CCAMMenuHandler::doMainMenu()
char name1[255]={0};
char str1[255]={0};
int CiSlots = ca ? ca->GetNumberCISlots() : 0;
CMenuWidget* cammenu = new CMenuWidget(LOCALE_CI_SETTINGS, NEUTRINO_ICON_SETTINGS);
cammenu->addIntroItems();
@@ -135,11 +133,7 @@ int CCAMMenuHandler::doMainMenu()
cammenu->addItem(ca_init);
cammenu->addItem(GenericMenuSeparator);
#ifdef BOXMODEL_CS_HD2
int fecount = CFEManager::getInstance()->getFrontendCount();
char fename[fecount+1][255];
#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));
cammenu->addItem( new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, true, 6, 12, this));
@@ -153,6 +147,9 @@ int CCAMMenuHandler::doMainMenu()
cammenu->addItem(ci_mode);
#ifdef BOXMODEL_CS_HD2
int fecount = CFEManager::getInstance()->getFrontendCount();
char fename[fecount+1][255];
CMenuOptionChooser::keyval_ext feselect[fecount+1];
feselect[0].key = -1;
feselect[0].value = NONEXISTANT_LOCALE;