mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-01-26 17:26:26 +01:00
parent ba282cf8c4 7189a98486
commit 2263c8bd2e
106 changed files with 6374 additions and 5374 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(',');
if(!config.loadConfig(CONFIGFILE))
if(!config.loadConfig(TIMERDCONFIGFILE))
{
/* set defaults if no configuration file exists */
dprintf("%s not found\n", CONFIGFILE);
dprintf("%s not found\n", TIMERDCONFIGFILE);
}
else
{
@@ -624,13 +624,13 @@ void CTimerManager::loadRecordingSafety()
{
CConfigFile config(',');
if(!config.loadConfig(CONFIGFILE))
if(!config.loadConfig(TIMERDCONFIGFILE))
{
/* set defaults if no configuration file exists */
dprintf("%s not found\n", CONFIGFILE);
dprintf("%s not found\n", TIMERDCONFIGFILE);
m_extraTimeStart = 300;
m_extraTimeEnd = 300;
config.saveConfig(CONFIGFILE);
config.saveConfig(TIMERDCONFIGFILE);
}
else
{
@@ -659,8 +659,8 @@ void CTimerManager::saveEventsToConfig()
dprintf("setting EXTRA_TIME_START to %d\n",m_extraTimeStart);
config.setInt32 ("EXTRA_TIME_END", m_extraTimeEnd);
dprintf("setting EXTRA_TIME_END to %d\n",m_extraTimeEnd);
dprintf("now saving config to %s...\n",CONFIGFILE);
config.saveConfig(CONFIGFILE);
dprintf("now saving config to %s...\n",TIMERDCONFIGFILE);
config.saveConfig(TIMERDCONFIGFILE);
dprintf("config saved!\n");
m_saveEvents=false;

2
src/timerd/timermanager.h
View File

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