diff --git a/configure.ac b/configure.ac index e9c0ce359..dd70d3451 100644 --- a/configure.ac +++ b/configure.ac @@ -229,6 +229,15 @@ if test "$enable_upnp" = "yes"; then fi AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes") +AC_ARG_ENABLE(arm-acc, + AS_HELP_STRING(--disable-arm-acc,disable arm hardware acceleration), + ,[enable_arm_acc=yes]) + +AM_CONDITIONAL(ENABLE_ARM_ACC,test "$enable_arm_acc" = "yes") +if test "$enable_arm_acc" = "yes"; then + AC_DEFINE(ENABLE_ARM_ACC,1,[enable arm hardware acceleration]) +fi + AC_ARG_ENABLE(extupdate, AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]), AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine])) diff --git a/src/driver/fb_accel.h b/src/driver/fb_accel.h index 79f261a64..f3592e0ba 100644 --- a/src/driver/fb_accel.h +++ b/src/driver/fb_accel.h @@ -225,9 +225,11 @@ class CFbAccelARM int scale2Res(int size); bool fullHdAvailable(); void setOsdResolutions(); -#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7 +#if ENABLE_ARM_ACC +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 void paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col); #endif +#endif }; class CFbAccelMIPS diff --git a/src/driver/fb_accel_arm.cpp b/src/driver/fb_accel_arm.cpp index 654df3f1c..1f4321ec8 100644 --- a/src/driver/fb_accel_arm.cpp +++ b/src/driver/fb_accel_arm.cpp @@ -390,7 +390,8 @@ bool CFbAccelARM::fullHdAvailable() return false; } -#if BOXMODEL_BRE2ZE4K || BOXMODEL_HD51 || BOXMODEL_H7 +#if ENABLE_ARM_ACC +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || 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 ) @@ -401,3 +402,4 @@ void CFbAccelARM::paintRect(const int x, const int y, const int dx, const int dy blit(); } #endif +#endif diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index cfe35117b..5c5df70ba 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2535,8 +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); +#if ENABLE_ARM_ACC +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 + usleep(300); // because of CFbAccelARM::paintRect() +#endif #endif char startTime[10];