mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 18:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

* reworked CA menu code

Browse Source 
* added support for internal cardreaders for future conax support
* added inactivity shutdown timer for EuP
WARNING: new libcoolstream and libOpenThreads needed.



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@925 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-12-07 10:00:52 +00:00
parent 987d09c77d
commit b8c1fa5cc1
35 changed files with 882 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/gui/sleeptimer.cpp
View File

@@ -48,30 +48,40 @@ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
#include <stdlib.h>
int CSleepTimerWidget::exec(CMenuTarget* parent, const std::string &)
int CSleepTimerWidget::exec(CMenuTarget* parent, const std::string &actionKey)
{
int res = menu_return::RETURN_REPAINT;
int shutdown_min = 0;
char value[16];
CStringInput *inbox;
bool permanent = (actionKey == "permanent");
if (parent)
parent->hide();
shutdown_min = g_Timerd->getSleepTimerRemaining(); // remaining shutdown time?
sprintf(value,"%03d", shutdown_min);
CSectionsdClient::CurrentNextInfo info_CurrentNext;
g_InfoViewer->getEPG(g_RemoteControl->current_channel_id, info_CurrentNext);
if ( info_CurrentNext.flags & CSectionsdClient::epgflags::has_current) {
time_t jetzt=time(NULL);
int current_epg_zeit_dauer_rest = (info_CurrentNext.current_zeit.dauer+150 - (jetzt - info_CurrentNext.current_zeit.startzeit ))/60 ;
if(shutdown_min == 0 && current_epg_zeit_dauer_rest > 0 && current_epg_zeit_dauer_rest < 1000)
{
sprintf(value,"%03d",current_epg_zeit_dauer_rest);
}
}
inbox = new CStringInput(LOCALE_SLEEPTIMERBOX_TITLE, value, 3, LOCALE_SLEEPTIMERBOX_HINT1, LOCALE_SLEEPTIMERBOX_HINT2, "0123456789 ");
if(permanent) {
sprintf(value,"%03d", g_settings.shutdown_min);
} else {
shutdown_min = g_Timerd->getSleepTimerRemaining(); // remaining shutdown time?
sprintf(value,"%03d", shutdown_min);
}
if(permanent) {
inbox = new CStringInput(LOCALE_SLEEPTIMERBOX_TITLE2, value, 3, LOCALE_SLEEPTIMERBOX_HINT1, LOCALE_SLEEPTIMERBOX_HINT3, "0123456789 ");
} else {
CSectionsdClient::CurrentNextInfo info_CurrentNext;
g_InfoViewer->getEPG(g_RemoteControl->current_channel_id, info_CurrentNext);
if ( info_CurrentNext.flags & CSectionsdClient::epgflags::has_current) {
time_t jetzt=time(NULL);
int current_epg_zeit_dauer_rest = (info_CurrentNext.current_zeit.dauer+150 - (jetzt - info_CurrentNext.current_zeit.startzeit ))/60 ;
if(shutdown_min == 0 && current_epg_zeit_dauer_rest > 0 && current_epg_zeit_dauer_rest < 1000)
{
sprintf(value,"%03d",current_epg_zeit_dauer_rest);
}
}
inbox = new CStringInput(LOCALE_SLEEPTIMERBOX_TITLE, value, 3, LOCALE_SLEEPTIMERBOX_HINT1, LOCALE_SLEEPTIMERBOX_HINT2, "0123456789 ");
}
int ret = inbox->exec (NULL, "");
inbox->hide ();
@@ -82,9 +92,13 @@ int CSleepTimerWidget::exec(CMenuTarget* parent, const std::string &)
return res;
int new_val = atoi(value);
if(shutdown_min != new_val) {
if(permanent) {
g_settings.shutdown_min = new_val;
printf("permanent sleeptimer min: %d\n", g_settings.shutdown_min);
}
else if(shutdown_min != new_val) {
shutdown_min = new_val;
printf("sleeptimer min: %d\n",shutdown_min);
printf("sleeptimer min: %d\n", shutdown_min);
if (shutdown_min == 0) // if set to zero remove existing sleeptimer
{
if(g_Timerd->getSleeptimerID() > 0) {