mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

suppleental to last commit: fix time corrections for remote timers

Browse Source
This commit is contained in:
TangoCash
2016-10-21 10:47:37 +02:00
committed by svenhoefer
parent 716e9f4d9b
commit 9d19834340
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/timerlist.cpp
View File

@@ -342,8 +342,8 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
r_url = "http://"; r_url = "http://";
r_url += g_settings.remotebox_address; r_url += g_settings.remotebox_address;
r_url += "/control/timer?action=new"; r_url += "/control/timer?action=new";
r_url += "&alarm=" + to_string((int)timerlist[selected].alarmTime); r_url += "&alarm=" + to_string((int)timerlist[selected].alarmTime + rem_pre);
r_url += "&stop=" + to_string((int)timerlist[selected].stopTime); r_url += "&stop=" + to_string((int)timerlist[selected].stopTime - rem_post);
r_url += "&announce=" + to_string((int)timerlist[selected].announceTime); r_url += "&announce=" + to_string((int)timerlist[selected].announceTime);
r_url += "&channel_id=" + string_printf_helper(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timerlist[selected].channel_id); r_url += "&channel_id=" + string_printf_helper(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timerlist[selected].channel_id);
r_url += "&aj=on"; r_url += "&aj=on";
@@ -366,8 +366,10 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
r_url = httpTool.downloadString(r_url); r_url = httpTool.downloadString(r_url);
//printf("[remotetimer] status:%s\n",r_url.c_str()); //printf("[remotetimer] status:%s\n",r_url.c_str());
if (r_url=="ok") { if (r_url=="ok") {
Timer->addRecordTimerEvent(timerlist[selected].channel_id, timerlist[selected].alarmTime, int pre,post;
timerlist[selected].stopTime, 0, 0, timerlist[selected].announceTime, Timer->getRecordingSafety(pre,post);
Timer->addRecordTimerEvent(timerlist[selected].channel_id, timerlist[selected].alarmTime + pre,
timerlist[selected].stopTime - post, 0, 0, timerlist[selected].announceTime,
TIMERD_APIDS_CONF, true, timerlist[selected].announceTime > time(NULL)); TIMERD_APIDS_CONF, true, timerlist[selected].announceTime > time(NULL));
} }
} }
@@ -587,6 +589,12 @@ void CTimerList::remoteTimerList(CTimerd::TimerList &rtimerlist)
printf("Failed to parse JSON\n"); printf("Failed to parse JSON\n");
printf("%s\n", reader.getFormattedErrorMessages().c_str()); printf("%s\n", reader.getFormattedErrorMessages().c_str());
} }
Json::Value delays = root["data"]["timer"][0];
rem_pre = atoi(delays["config"].get("pre_delay","").asString());
rem_post = atoi(delays["config"].get("post_delay","").asString());
//printf("[remotetimer] pre:%d - post:%d\n", rem_pre, rem_post);
Json::Value remotetimers = root["data"]["timer"][0]["timer_list"]; Json::Value remotetimers = root["data"]["timer"][0]["timer_list"];
@@ -743,7 +751,7 @@ int CTimerList::show()
if ((timerlist[selected].eventType == CTimerd::TIMER_REMOTEBOX) && (timerlist[selected].eventState < CTimerd::TIMERSTATE_ISRUNNING)) if ((timerlist[selected].eventType == CTimerd::TIMER_REMOTEBOX) && (timerlist[selected].eventState < CTimerd::TIMERSTATE_ISRUNNING))
exec(this,"del_remotetimer"); exec(this,"del_remotetimer");
else else
Timer->removeTimerEvent(timerlist[selected].eventID); Timer->removeTimerEvent(timerlist[selected].eventID);
update = true; update = true;
} }
} }

1
src/gui/timerlist.h
View File

@@ -87,6 +87,7 @@ class CTimerList : public CMenuTarget, public CListHelpers
int saved_dispmode; int saved_dispmode;
void remoteTimerList(CTimerd::TimerList &timerlist); void remoteTimerList(CTimerd::TimerList &timerlist);
void enterRemoteBox(); void enterRemoteBox();
int rem_pre,rem_post;
public: public:
CTimerList(); CTimerList();