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

Reset CI after standby option

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@493 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 60d6db15d4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-03-17 (Wed, 17 Mar 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-03-17 11:11:15 +00:00
parent 9c4a638fe9
commit 4ee1005472
6 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/cam_menu.cpp
View File

@@ -81,14 +81,26 @@ printf("CCAMMenuHandler::exec: actionkey %s\n", actionkey.c_str());
} else if(actionkey == "cam2") {
return doMenu(1);
} else if(actionkey == "reset1") {
ci->Reset(0);
if(ci->CamPresent(0))
ci->Reset(0);
} else if(actionkey == "reset2") {
ci->Reset(1);
if(ci->CamPresent(1))
ci->Reset(1);
}
if(!parent)
return 0;
return doMainMenu ();
}
#define OPTIONS_OFF0_ON1_OPTION_COUNT 2
const CMenuOptionChooser::keyval OPTIONS_OFF0_ON1_OPTIONS[OPTIONS_OFF0_ON1_OPTION_COUNT] =
{
{ 0, LOCALE_OPTIONS_OFF },
{ 1, LOCALE_OPTIONS_ON }
};
int CCAMMenuHandler::doMainMenu ()
{
int ret;
@@ -104,6 +116,9 @@ int CCAMMenuHandler::doMainMenu ()
cammenu->addItem( GenericMenuBack );
cammenu->addItem( GenericMenuSeparatorLine );
cammenu->addItem( new CMenuOptionChooser(LOCALE_CAM_RESET_STANDBY, &g_settings.ci_standby_reset, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
cammenu->addItem( GenericMenuSeparatorLine );
CMenuWidget * tempMenu;
if(ci->CamPresent(0)) {
ci->GetName(0, name1);