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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
Lightly tested only...
This commit is contained in:
Stefan Seyfried
2013-12-25 22:51:23 +01:00
parent 164ab9ab42 bc8b81a190
commit cdd065fc2e
90 changed files with 1583 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/driver/shutdown_count.cpp
View File

@@ -76,8 +76,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;
thread_running = true;
if (pthread_create (&thrTime, NULL, TimeThread, NULL) != 0 )
{
@@ -90,7 +90,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))
{
@@ -110,11 +110,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--;
@@ -133,5 +133,5 @@ void SHTDCNT::shutdown_counter()
void SHTDCNT::resetSleepTimer()
{
sleep_cnt = atoi(g_settings.shutdown_min)*60;
sleep_cnt = g_settings.shutdown_min * 60;
}