mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fb_accel: move hd2 specific parts from fader to fb_accel

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9287d66472
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-02-22 21:23:11 +01:00
parent 47d8dbc86c
commit 5806b3b6df
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/driver/fade.cpp
View File

@@ -55,11 +55,7 @@ void COSDFader::StartFadeIn()
fadeIn = true; fadeIn = true;
fadeOut = false; fadeOut = false;
fadeValue = 100; fadeValue = 100;
#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 frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
#endif
frameBuffer->setBlendLevel(fadeValue); frameBuffer->setBlendLevel(fadeValue);
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2)) #if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
@@ -79,11 +75,7 @@ bool COSDFader::StartFadeOut()
if ((!fadeOut) && g_settings.widget_fade) { if ((!fadeOut) && g_settings.widget_fade) {
fadeOut = true; fadeOut = true;
fadeTimer = g_RCInput->addTimer( FADE_TIME, false ); fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
#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 frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
#endif
ret = true; ret = true;
} }
return ret; return ret;
@@ -93,11 +85,7 @@ void COSDFader::StopFade()
{ {
if ( fadeIn || fadeOut ) { if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); g_RCInput->killTimer(fadeTimer);
#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 frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#endif
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2)) #if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
usleep(60000); usleep(60000);
#endif #endif
@@ -124,11 +112,7 @@ bool COSDFader::FadeDone()
fadeValue = max_alpha; fadeValue = max_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeIn = false; fadeIn = false;
#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 frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#endif
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2)) #if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
usleep(60000); usleep(60000);
#endif #endif

5
src/driver/fb_accel_cs_hd2.cpp
View File

@@ -241,7 +241,10 @@ fb_pixel_t * CFbAccelCSHD2::getBackBufferPointer() const
void CFbAccelCSHD2::setBlendMode(uint8_t mode) void CFbAccelCSHD2::setBlendMode(uint8_t mode)
{ {
if (ioctl(fd, FBIO_SETBLENDMODE, mode)) uint8_t arg = CNXTFB_BLEND_MODE_PER_PIXEL;
if (mode == 2)
arg = CNXTFB_BLEND_MODE_UNIFORM_ALPHA;
if (ioctl(fd, FBIO_SETBLENDMODE, arg))
printf("FBIO_SETBLENDMODE failed.\n"); printf("FBIO_SETBLENDMODE failed.\n");
} }