mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fade: fix if-else-endif logic

Browse Source
This commit is contained in:
svenhoefer
2016-10-01 11:06:11 +02:00
parent 9976307997
commit d67de1d5ff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/fade.cpp
View File

@@ -96,9 +96,9 @@ void COSDFader::StopFade()
frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha
#else #else
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#endif
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO)) #if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO))
usleep(60000); usleep(60000);
#endif
#endif #endif
fadeIn = fadeOut = false; fadeIn = fadeOut = false;
} }
@@ -127,9 +127,9 @@ bool COSDFader::FadeDone()
frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha
#else #else
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#endif
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO)) #if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO))
usleep(60000); usleep(60000);
#endif
#endif #endif
} else } else
frameBuffer->setBlendLevel(fadeValue); frameBuffer->setBlendLevel(fadeValue);