mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
Fade changes for new fb driver
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1413 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1df85f6ea3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-04-23 (Sat, 23 Apr 2011)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -478,6 +478,7 @@ int CTimerList::show()
|
||||
uint32_t fadeTimer = 0;
|
||||
if ( fadeIn ) {
|
||||
fadeValue = 100;
|
||||
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
|
||||
frameBuffer->setBlendLevel(fadeValue, fadeValue);
|
||||
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
|
||||
}
|
||||
@@ -514,7 +515,8 @@ int CTimerList::show()
|
||||
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
|
||||
} else
|
||||
frameBuffer->setBlendLevel(fadeValue, fadeValue);
|
||||
}
|
||||
@@ -531,6 +533,7 @@ int CTimerList::show()
|
||||
fadeOut = true;
|
||||
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
|
||||
timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
|
||||
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
|
||||
msg = 0;
|
||||
} else
|
||||
loop=false;
|
||||
@@ -661,7 +664,8 @@ int CTimerList::show()
|
||||
if ( fadeIn || fadeOut ) {
|
||||
g_RCInput->killTimer(fadeTimer);
|
||||
fadeTimer = 0;
|
||||
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
|
||||
}
|
||||
hide();
|
||||
|
||||
|
Reference in New Issue
Block a user