From 3f7ddf58a5c3ccb980e8bb1b673beade29a85790 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 23 Jan 2013 11:57:27 +0400 Subject: [PATCH] driver/framebuffer.cpp: move fade sleep workaround to fade.cpp --- src/driver/fade.cpp | 5 +++-- src/driver/framebuffer.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/driver/fade.cpp b/src/driver/fade.cpp index caefff571..fa6c9a5d9 100644 --- a/src/driver/fade.cpp +++ b/src/driver/fade.cpp @@ -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; } diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index 253d335d1..eb2e49089 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -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