mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

timerd/timermanager.cpp: rename CONFIGFILE to TIMERDCONFIGFILE to avoid conflicts

Browse Source
This commit is contained in:
[CST] Focus
2015-01-15 15:17:13 +03:00
parent 6876dcdf23
commit 8952a4c79a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/timerd/timermanager.cpp
View File

@@ -414,10 +414,10 @@ void CTimerManager::loadEventsFromConfig()
{ {
CConfigFile config(','); CConfigFile config(',');
if(!config.loadConfig(CONFIGFILE)) if(!config.loadConfig(TIMERDCONFIGFILE))
{ {
/* set defaults if no configuration file exists */ /* set defaults if no configuration file exists */
dprintf("%s not found\n", CONFIGFILE); dprintf("%s not found\n", TIMERDCONFIGFILE);
} }
else else
{ {
@@ -624,13 +624,13 @@ void CTimerManager::loadRecordingSafety()
{ {
CConfigFile config(','); CConfigFile config(',');
if(!config.loadConfig(CONFIGFILE)) if(!config.loadConfig(TIMERDCONFIGFILE))
{ {
/* set defaults if no configuration file exists */ /* set defaults if no configuration file exists */
dprintf("%s not found\n", CONFIGFILE); dprintf("%s not found\n", TIMERDCONFIGFILE);
m_extraTimeStart = 300; m_extraTimeStart = 300;
m_extraTimeEnd = 300; m_extraTimeEnd = 300;
config.saveConfig(CONFIGFILE); config.saveConfig(TIMERDCONFIGFILE);
} }
else else
{ {
@@ -659,8 +659,8 @@ void CTimerManager::saveEventsToConfig()
dprintf("setting EXTRA_TIME_START to %d\n",m_extraTimeStart); dprintf("setting EXTRA_TIME_START to %d\n",m_extraTimeStart);
config.setInt32 ("EXTRA_TIME_END", m_extraTimeEnd); config.setInt32 ("EXTRA_TIME_END", m_extraTimeEnd);
dprintf("setting EXTRA_TIME_END to %d\n",m_extraTimeEnd); dprintf("setting EXTRA_TIME_END to %d\n",m_extraTimeEnd);
dprintf("now saving config to %s...\n",CONFIGFILE); dprintf("now saving config to %s...\n",TIMERDCONFIGFILE);
config.saveConfig(CONFIGFILE); config.saveConfig(TIMERDCONFIGFILE);
dprintf("config saved!\n"); dprintf("config saved!\n");
m_saveEvents=false; m_saveEvents=false;

2
src/timerd/timermanager.h
View File

@@ -35,7 +35,7 @@
#include <eventserver.h> #include <eventserver.h>
#include <timerdclient/timerdtypes.h> #include <timerdclient/timerdtypes.h>
#define CONFIGFILE CONFIGDIR "/timerd.conf" #define TIMERDCONFIGFILE CONFIGDIR "/timerd.conf"
class CTimerEvent class CTimerEvent
{ {