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

timerd: rename TIMER_NEXTPROGRAM

Browse Source 
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)
This commit is contained in:
Stefan Seyfried
2014-01-12 16:56:41 +01:00
parent e2bcee0a0f
commit d1eebea381
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/timerdclient/timerdtypes.h
View File

@@ -61,7 +61,7 @@ class CTimerd
enum CTimerEventTypes enum CTimerEventTypes
{ {
TIMER_SHUTDOWN = 1, TIMER_SHUTDOWN = 1,
TIMER_NEXTPROGRAM, __TIMER_NEXTPROGRAM, /* unused, here to keep compatibility with old timerd.conf */
TIMER_ZAPTO, TIMER_ZAPTO,
TIMER_STANDBY, TIMER_STANDBY,
TIMER_RECORD, TIMER_RECORD,

4
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -884,7 +884,7 @@ std::string CNeutrinoYParser::func_get_timer_list(CyhookHandler *, std::string
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
CTimerd::TIMER_RECORD = 5 CTimerd::TIMER_RECORD = 5
CTimerd::TIMER_STANDBY = 4 CTimerd::TIMER_STANDBY = 4
CTimerd::TIMER_NEXTPROGRAM = 2 CTimerd::TIMER_NEXTPROGRAM = 2 !!! no longer used !!!
CTimerd::TIMER_ZAPTO = 3 CTimerd::TIMER_ZAPTO = 3
CTimerd::TIMER_REMIND = 6 CTimerd::TIMER_REMIND = 6
CTimerd::TIMER_EXEC_PLUGIN = 8 CTimerd::TIMER_EXEC_PLUGIN = 8
@@ -945,7 +945,7 @@ std::string CNeutrinoYParser::func_set_timer_form(CyhookHandler *hh, std::strin
std::string sel; std::string sel;
for(int i=1; i<=8;i++) for(int i=1; i<=8;i++)
{ {
if(i!=(int)CTimerd::TIMER_NEXTPROGRAM) if (i != (int)CTimerd::__TIMER_NEXTPROGRAM)
{ {
std::string zType = NeutrinoAPI->timerEventType2Str((CTimerd::CTimerEventTypes) i); std::string zType = NeutrinoAPI->timerEventType2Str((CTimerd::CTimerEventTypes) i);
if(cmd != "new") if(cmd != "new")