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

Merge branch 'next' of coolstreamtech.de:cst-private-neutrino into next

Browse Source
This commit is contained in:
[CST] Bas
2013-01-29 01:21:50 +08:00
parent 1babe68529 d591e90395
commit 34187b12cd
20 changed files with 156 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/fade.cpp
View File

@@ -88,10 +88,11 @@ void COSDFader::Stop()
{
if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer);
usleep(40000);
#ifdef BOXMODEL_APOLLO
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
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#endif
fadeIn = fadeOut = false;
}

2
src/driver/framebuffer.cpp
View File

@@ -543,7 +543,7 @@ void CFrameBuffer::setBlendLevel(int level)
if (ioctl(fd, FBIO_SETOPACITY, value))
printf("FBIO_SETOPACITY failed.\n");
#ifndef ISAPOLLO
#if 0
if(level == 100) // TODO: sucks.
usleep(20000);
#endif