mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-06 05:08:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: Rename hardware defined macros for coolstream stb

Browse Source 
BOXMODEL_NEVIS  => BOXMODEL_CS_HD1
  BOXMODEL_APOLLO => BOXMODEL_CS_HD2
This commit is contained in:
M. Liebmann
2017-02-12 07:33:01 +01:00
parent bb2a848ae1
commit 0d66899cbd
26 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/driver/fade.cpp
View File

@@ -54,14 +54,14 @@ void COSDFader::StartFadeIn()
fadeIn = true;
fadeOut = false;
fadeValue = 100;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_UNIFORM_ALPHA); // Global alpha multiplied with pixel alpha
#else
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
#endif
frameBuffer->setBlendLevel(fadeValue);
#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_CS_HD2))
usleep(60000);
#endif
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
@@ -78,7 +78,7 @@ bool COSDFader::StartFadeOut()
if ((!fadeOut) && g_settings.widget_fade) {
fadeOut = true;
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_UNIFORM_ALPHA); // Global alpha multiplied with pixel alpha
#else
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
@@ -92,12 +92,12 @@ void COSDFader::StopFade()
{
if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer);
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
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))
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
usleep(60000);
#endif
fadeIn = fadeOut = false;
@@ -123,12 +123,12 @@ bool COSDFader::FadeDone()
fadeValue = max_alpha;
g_RCInput->killTimer (fadeTimer);
fadeIn = false;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
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))
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
usleep(60000);
#endif
} else