Merge branch 'master' into pu/fb-setmode

This commit is contained in:
2017-05-08 12:25:42 +02:00
2 changed files with 4 additions and 0 deletions

View File

@@ -243,6 +243,7 @@ void EpgPlus::TimeLine::paintMark(time_t _startTime, int pduration, int px, int
// paint new mark
CProgressBar pbbar = CProgressBar(px, this->y + this->font->getHeight(), pwidth, this->font->getHeight());
pbbar.setActiveColor(COL_MENUCONTENTSELECTED_PLUS_0);
pbbar.setType(CProgressBar::PB_TIMESCALE);
time_t currentTime;
time(&currentTime);

View File

@@ -27,6 +27,9 @@
#include <config.h>
#endif
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
#include <stdint.h>
#include <global.h>