From e65a3e61853681397f38b481488a3e486b07ebf0 Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Sun, 19 Apr 2020 17:47:19 +0200 Subject: [PATCH] fix after pick: fb_accel_arm Conflicts: src/driver/fb_accel.h src/driver/fb_accel_arm.cpp src/gui/channellist.cpp Signed-off-by: Thilo Graf This can be only a hack with limited effect to fix render errors in channel list window. . There must be another solution. --- src/driver/fb_accel.h | 2 +- src/driver/fb_accel_arm.cpp | 4 ++-- src/gui/channellist.cpp | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/driver/fb_accel.h b/src/driver/fb_accel.h index ac9c5735a..79f261a64 100644 --- a/src/driver/fb_accel.h +++ b/src/driver/fb_accel.h @@ -225,7 +225,7 @@ class CFbAccelARM int scale2Res(int size); bool fullHdAvailable(); void setOsdResolutions(); -#if BOXMODEL_HD51 +#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7 void paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col); #endif }; diff --git a/src/driver/fb_accel_arm.cpp b/src/driver/fb_accel_arm.cpp index 6bc15e9a0..654df3f1c 100644 --- a/src/driver/fb_accel_arm.cpp +++ b/src/driver/fb_accel_arm.cpp @@ -56,7 +56,7 @@ static bool supportblendingflags = true; static int fb_fd = -1; static int exec_list(void); -#if BOXMODEL_HD51 +#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7 static bool accumulateoperations = false; bool bcm_accel_has_alphablending() @@ -390,7 +390,7 @@ bool CFbAccelARM::fullHdAvailable() return false; } -#if BOXMODEL_HD51 +#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7 void CFbAccelARM::paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col) { if(dx <1 || dy <1 ) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index de821b3f1..cfe35117b 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2535,6 +2535,10 @@ void CChannelList::paint_events(CChannelEventList &evtlist) ffheight = g_Font[eventFont]->getHeight(); frameBuffer->paintBoxRel(x+ width,y+ theight+pig_height, infozone_width, infozone_height,COL_MENUCONTENT_PLUS_0); +#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7 + usleep(300); +#endif + char startTime[10]; int eventStartTimeWidth = 4 * g_Font[eventFont]->getMaxDigitWidth() + g_Font[eventFont]->getRenderWidth(":") + OFFSET_INNER_SMALL; // use a fixed value int startTimeWidth = 0;