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

- controlapi/timer: fix json output

Browse Source
This commit is contained in:
vanhofen
2016-02-26 09:02:30 +01:00
committed by svenhoefer
parent 9615f547d5
commit 63333053f5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -2432,7 +2432,7 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
repeat += hh->outPair("text", zRep, true); repeat += hh->outPair("text", zRep, true);
repeat += hh->outPair("weekdays", weekdays, false); repeat += hh->outPair("weekdays", weekdays, false);
timer_item += hh->outObject("repeat", repeat, true); timer_item += hh->outObject("repeat", repeat, false);
// channel infos // channel infos
std::string channel_name = NeutrinoAPI->GetServiceName(timer->channel_id); std::string channel_name = NeutrinoAPI->GetServiceName(timer->channel_id);
@@ -2460,6 +2460,7 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
#endif #endif
case CTimerd::TIMER_ZAPTO : { case CTimerd::TIMER_ZAPTO : {
timer_item += hh->outNext();
timer_item += hh->outPair("channel_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer->channel_id), true); timer_item += hh->outPair("channel_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer->channel_id), true);
timer_item += hh->outPair("channel_name", channel_name, true); timer_item += hh->outPair("channel_name", channel_name, true);
timer_item += hh->outPair("title", title, false); timer_item += hh->outPair("title", title, false);
@@ -2467,6 +2468,7 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
break; break;
case CTimerd::TIMER_RECORD : { case CTimerd::TIMER_RECORD : {
timer_item += hh->outNext();
timer_item += hh->outPair("channel_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer->channel_id), true); timer_item += hh->outPair("channel_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer->channel_id), true);
timer_item += hh->outPair("channel_name", channel_name, true); timer_item += hh->outPair("channel_name", channel_name, true);
timer_item += hh->outPair("title", title, true); timer_item += hh->outPair("title", title, true);
@@ -2502,6 +2504,7 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
break; break;
case CTimerd::TIMER_STANDBY : { case CTimerd::TIMER_STANDBY : {
timer_item += hh->outNext();
timer_item += hh->outPair("status", (timer->standby_on) ? "on" : "off", false); timer_item += hh->outPair("status", (timer->standby_on) ? "on" : "off", false);
} }
break; break;
@@ -2509,11 +2512,13 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
case CTimerd::TIMER_REMIND : { case CTimerd::TIMER_REMIND : {
std::string _message; std::string _message;
_message = std::string(timer->message).substr(0,20); _message = std::string(timer->message).substr(0,20);
timer_item += hh->outNext();
timer_item += hh->outPair("message", _message, false); timer_item += hh->outPair("message", _message, false);
} }
break; break;
case CTimerd::TIMER_EXEC_PLUGIN : { case CTimerd::TIMER_EXEC_PLUGIN : {
timer_item += hh->outNext();
timer_item += hh->outPair("plugin", timer->pluginName, false); timer_item += hh->outPair("plugin", timer->pluginName, false);
} }
break; break;