From d1eebea38173f2649a84b8c23ddeb44a2370b41b Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 12 Jan 2014 16:56:41 +0100 Subject: [PATCH] timerd: rename TIMER_NEXTPROGRAM 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) --- lib/timerdclient/timerdtypes.h | 2 +- src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/timerdclient/timerdtypes.h b/lib/timerdclient/timerdtypes.h index b91d0ee79..a57a2009f 100644 --- a/lib/timerdclient/timerdtypes.h +++ b/lib/timerdclient/timerdtypes.h @@ -61,7 +61,7 @@ class CTimerd enum CTimerEventTypes { TIMER_SHUTDOWN = 1, - TIMER_NEXTPROGRAM, + __TIMER_NEXTPROGRAM, /* unused, here to keep compatibility with old timerd.conf */ TIMER_ZAPTO, TIMER_STANDBY, TIMER_RECORD, diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp index 28f6b49f4..9d557fbbb 100644 --- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp @@ -884,7 +884,7 @@ std::string CNeutrinoYParser::func_get_timer_list(CyhookHandler *, std::string /*------------------------------------------------------------------------------ CTimerd::TIMER_RECORD = 5 CTimerd::TIMER_STANDBY = 4 - CTimerd::TIMER_NEXTPROGRAM = 2 + CTimerd::TIMER_NEXTPROGRAM = 2 !!! no longer used !!! CTimerd::TIMER_ZAPTO = 3 CTimerd::TIMER_REMIND = 6 CTimerd::TIMER_EXEC_PLUGIN = 8 @@ -945,7 +945,7 @@ std::string CNeutrinoYParser::func_set_timer_form(CyhookHandler *hh, std::strin std::string sel; 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); if(cmd != "new")