mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43bdc2be1c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-06-16 13:13:03 +02:00
parent c0c6ceeb49 1ba0a9b971
commit 1dc592af4c
7 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nhttpd/tuxboxapi/neutrinoapi.cpp
View File

@@ -29,6 +29,7 @@
#include <driver/pictureviewer/pictureviewer.h>
#include <system/helpers.h>
#include <system/httptool.h>
#include <system/helpers.h>
#include <gui/color.h>
#include <gui/widget/icons.h>
#include <gui/movieplayer.h>
@@ -556,14 +557,13 @@ void CNeutrinoAPI::SendAllTimers(std::string url, bool force)
timerlist.clear();
Timerd->getTimerList(timerlist);
sort(timerlist.begin(), timerlist.end());
CTimerd::TimerList::iterator timer = timerlist.begin();
int pre,post;
Timerd->getRecordingSafety(pre,post);
CHTTPTool httpTool;
std::string r_url;
for(int i = 0; timer != timerlist.end(); ++timer)
for(CTimerd::TimerList::iterator timer = timerlist.begin(); timer != timerlist.end(); ++timer)
{
if (timer->eventType == CTimerd::TIMER_RECORD) {
r_url = "http://";