mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

system/settings: use integers for shutdown_count/_min

Browse Source 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
This commit is contained in:
martii
2013-12-24 09:53:20 +01:00
committed by Jacek Jendrzej
parent 2cee6929d6
commit d125301ede
5 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/driver/shutdown_count.cpp
View File

@@ -63,8 +63,8 @@ void* SHTDCNT::TimeThread(void *)
void SHTDCNT::init()
{
shutdown_cnt = atoi(g_settings.shutdown_count) * 60;
sleep_cnt = atoi(g_settings.shutdown_min)*60;
shutdown_cnt = g_settings.shutdown_count * 60;
sleep_cnt = g_settings.shutdown_min * 60;
if (pthread_create (&thrTime, NULL, TimeThread, NULL) != 0 )
{
perror("[SHTDCNT]: pthread_create(TimeThread)");
@@ -75,7 +75,7 @@ void SHTDCNT::init()
void SHTDCNT::shutdown_counter()
{
static bool sleeptimer_active = true;
if (atoi(g_settings.shutdown_count) > 0)
if (g_settings.shutdown_count > 0)
{
if ((CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_standby) && (!CNeutrinoApp::getInstance ()->recordingstatus))
{
@@ -95,11 +95,11 @@ void SHTDCNT::shutdown_counter()
else
{
// reset counter
shutdown_cnt = atoi(g_settings.shutdown_count) * 60;
shutdown_cnt = g_settings.shutdown_count * 60;
}
}
if(atoi(g_settings.shutdown_min) > 0) {
if(g_settings.shutdown_min > 0) {
if(sleep_cnt > 0) {
sleeptimer_active = true;
sleep_cnt--;
@@ -118,5 +118,5 @@ void SHTDCNT::shutdown_counter()
void SHTDCNT::resetSleepTimer()
{
sleep_cnt = atoi(g_settings.shutdown_min)*60;
sleep_cnt = g_settings.shutdown_min * 60;
}