mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fade changes for new fb driver

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1413 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-04-23 10:24:09 +00:00
parent d570d0c7d2
commit 1df85f6ea3
12 changed files with 102 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/infoviewer.cpp
View File

@@ -499,6 +499,7 @@ void CInfoViewer::showMovieTitle(const int playState, const std::string Channel,
int fadeValue;
if (fadeIn) {
fadeValue = 100;
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
frameBuffer->setBlendLevel(fadeValue, fadeValue);
} else
fadeValue = g_settings.infobar_alpha;
@@ -605,6 +606,7 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
int fadeValue;
if (fadeIn) {
fadeValue = 100;
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
frameBuffer->setBlendLevel(fadeValue, fadeValue);
} else
fadeValue = g_settings.infobar_alpha;
@@ -775,7 +777,9 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn)
g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
fadeIn = false;
frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
frameBuffer->setBlendLevel(100, 100);//FIXME
} else
frameBuffer->setBlendLevel(fadeValue, fadeValue);
}
@@ -789,6 +793,7 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn)
fadeOut = true;
fadeTimer = g_RCInput->addTimer (FADE_TIME, false);
timeoutEnd = CRCInput::calcTimeoutEnd (1);
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
} else {
#if 0
if ((msg != CRCInput::RC_timeout) && (msg != CRCInput::RC_ok))
@@ -845,7 +850,9 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn)
sec_timer_id = 0;
if (fadeIn || fadeOut) {
g_RCInput->killTimer (fadeTimer);
frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
frameBuffer->setBlendLevel(100, 100);//FIXME
}
if (virtual_zap_mode) {
/* if bouquet cycle set, do virtual over current bouquet */