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

fix repeating remotetimers

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
TangoCash
2018-08-31 22:07:18 +02:00
committed by Thilo Graf
parent e5a76941fe
commit 32354d558c
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/timerlist.cpp
View File

@@ -457,6 +457,14 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
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";
r_url += "&rs=on"; r_url += "&rs=on";
if (timerlist[selected].eventRepeat > CTimerd::TIMERREPEAT_ONCE) {
r_url += "&rep=" + to_string((int)timerlist[selected].eventRepeat);
r_url += "&repcount=" + to_string((int)timerlist[selected].repeatCount);
}
if (timerlist[selected].eventRepeat >= CTimerd::TIMERREPEAT_WEEKDAYS) {
Timer->setWeekdaysToStr(timerlist[selected].eventRepeat, m_weekdaysStr);
r_url += "&wd=" + m_weekdaysStr;
}
//printf("[remotetimer] url:%s\n",r_url.c_str()); //printf("[remotetimer] url:%s\n",r_url.c_str());
r_url = httpTool.downloadString(r_url, -1, httpConnectTimeout); r_url = httpTool.downloadString(r_url, -1, httpConnectTimeout);
//printf("[remotetimer] status:%s\n",r_url.c_str()); //printf("[remotetimer] status:%s\n",r_url.c_str());
@@ -483,6 +491,12 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
TIMERD_APIDS_CONF, true, timerlist[selected].announceTime > time(NULL),"",true); TIMERD_APIDS_CONF, true, timerlist[selected].announceTime > time(NULL),"",true);
} }
} }
if (res > 0)
Timer->modifyTimerEvent(res, timerlist[selected].announceTime + timerlist[selected].rem_pre,
timerlist[selected].alarmTime + timerlist[selected].rem_pre,
timerlist[selected].stopTime - timerlist[selected].rem_post,
timerlist[selected].eventRepeat,
timerlist[selected].repeatCount);
CHTTPTool httpTool; CHTTPTool httpTool;
std::string r_url; std::string r_url;
@@ -520,6 +534,14 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
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";
r_url += "&rs=on"; r_url += "&rs=on";
if (timerlist[selected].eventRepeat > CTimerd::TIMERREPEAT_ONCE) {
r_url += "&rep=" + to_string((int)timerlist[selected].eventRepeat);
r_url += "&repcount=" + to_string((int)timerlist[selected].repeatCount);
}
if (timerlist[selected].eventRepeat >= CTimerd::TIMERREPEAT_WEEKDAYS) {
Timer->setWeekdaysToStr(timerlist[selected].eventRepeat, m_weekdaysStr);
r_url += "&wd=" + m_weekdaysStr;
}
//printf("[remotetimer] url:%s\n",r_url.c_str()); //printf("[remotetimer] url:%s\n",r_url.c_str());
r_url = httpTool.downloadString(r_url, -1, httpConnectTimeout); r_url = httpTool.downloadString(r_url, -1, httpConnectTimeout);
//printf("[remotetimer] status:%s\n",r_url.c_str()); //printf("[remotetimer] status:%s\n",r_url.c_str());