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

driver/framebuffer.cpp: move fade sleep workaround to fade.cpp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f7ddf58a5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-23 (Wed, 23 Jan 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-01-23 11:57:27 +04:00
parent b8f8b97318
commit 13bc0aee80
2 changed files with 4 additions and 3 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 ) { if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); g_RCInput->killTimer(fadeTimer);
usleep(40000);
#ifdef BOXMODEL_APOLLO #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 #else
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#endif #endif
fadeIn = fadeOut = false; 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)) if (ioctl(fd, FBIO_SETOPACITY, value))
printf("FBIO_SETOPACITY failed.\n"); printf("FBIO_SETOPACITY failed.\n");
#ifndef ISAPOLLO #if 0
if(level == 100) // TODO: sucks. if(level == 100) // TODO: sucks.
usleep(20000); usleep(20000);
#endif #endif