From 02a5916f19c251c8c3a2b9a9568eee032faf7bae Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 1 Oct 2016 11:06:11 +0200 Subject: [PATCH] fade: fix if-else-endif logic Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d67de1d5ff3cede6228f8e52b5c9da2f5ac09cbf Author: vanhofen Date: 2016-10-01 (Sat, 01 Oct 2016) Origin message was: ------------------ - fade: fix if-else-endif logic ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/fade.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/driver/fade.cpp b/src/driver/fade.cpp index ae0fffd58..a0c2f45f7 100644 --- a/src/driver/fade.cpp +++ b/src/driver/fade.cpp @@ -96,9 +96,9 @@ void COSDFader::StopFade() frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha #else frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha +#endif #if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO)) usleep(60000); -#endif #endif fadeIn = fadeOut = false; } @@ -127,9 +127,9 @@ bool COSDFader::FadeDone() frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha #else frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha +#endif #if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO)) usleep(60000); -#endif #endif } else frameBuffer->setBlendLevel(fadeValue);