From 7b9f8e9720ac37be59072bc033512ef5d0245766 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 8 May 2017 08:41:28 +0200 Subject: [PATCH 1/2] - epgplus: fix progressbar's type --- src/gui/epgplus.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index e945d32ee..9fb8f0b57 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -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(¤tTime); From f1779d0a971125f9100ffb34c832767e539205b0 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 8 May 2017 12:14:36 +0200 Subject: [PATCH 2/2] movieplayer.cpp: prevent build error Avoid build error if build not configured with -D__STDC_LIMIT_MACROS --- src/gui/movieplayer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index b62e3d603..716c7262a 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -27,6 +27,9 @@ #include #endif +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS +#endif #include #include