From 56b9b9bcc50b69b5d84faa7fe17d8d7159def43c Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 4 Mar 2012 19:35:21 +0100 Subject: [PATCH] neutrino: enable 'standby after inactivity' for Tripledragon --- src/gui/miscsettings_menu.cpp | 4 +++- src/neutrino.cpp | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 70187127e..d1ff423f2 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -193,6 +193,9 @@ int CMiscMenue::showMiscSettingsMenu() #if !HAVE_TRIPLEDRAGON //cec settings misc_menue->addItem(new CMenuForwarder(LOCALE_VIDEOMENU_HDMI_CEC, true, NULL, new CCECSetup() , NULL, CRCInput::RC_1)); +#else + // if (cs_get_revision() == 1) + misc_menue->addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_SLEEPTIMER, true, g_settings.shutdown_min, new CSleepTimerWidget, "permanent", CRCInput::RC_1)); #endif //channellist @@ -248,7 +251,6 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) void CMiscMenue::showMiscSettingsMenuEnergy(CMenuWidget *ms_energy) { ms_energy->addIntroItems(LOCALE_MISCSETTINGS_ENERGY); - CMenuOptionChooser *m1 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_SHUTDOWN_REAL_RCDELAY, &g_settings.shutdown_real_rcdelay, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, !g_settings.shutdown_real); CStringInput * miscSettings_shutdown_count = new CStringInput(LOCALE_MISCSETTINGS_SHUTDOWN_COUNT, g_settings.shutdown_count, 3, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT1, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT2, "0123456789 "); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 380fa7cdc..a993eb6f6 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -403,7 +403,7 @@ int CNeutrinoApp::loadSetup(const char * fname) strcpy(g_settings.shutdown_count, configfile.getString("shutdown_count","0").c_str()); strcpy(g_settings.shutdown_min, "000"); - if(cs_get_revision() > 7) + if (cs_get_revision() > 7 || cs_get_revision() == 1) strcpy(g_settings.shutdown_min, configfile.getString("shutdown_min","180").c_str()); g_settings.infobar_sat_display = configfile.getBool("infobar_sat_display" , true ); @@ -2744,6 +2744,12 @@ _repeat: return messages_return::handled; } else { + if (cs_get_revision() == 1) + { + /* TD has no FP for real shutdown -> do standby instead */ + standbyMode(true); + return messages_return::handled; + } printf("NeutrinoMessages::SLEEPTIMER: shutdown\n"); ExitRun(true, (cs_get_revision() > 7)); }