mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +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


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:
[CST] Focus
2011-04-23 10:24:09 +00:00
parent bf7b9ce077
commit 4b4208e9ef
12 changed files with 102 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/epgview.cpp
View File

@@ -589,7 +589,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
uint32_t fadeTimer = 0;
if ( fadeIn ) {
fadeValue = 100;
frameBuffer->setBlendLevel(fadeValue, fadeValue);
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
frameBuffer->setBlendLevel(fadeValue, fadeValue);
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
}
@@ -733,7 +734,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
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 only
} else
frameBuffer->setBlendLevel(fadeValue, fadeValue);
}
@@ -910,6 +912,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
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;
@@ -922,8 +925,21 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
default:
// konfigurierbare Keys handlen...
if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)
loop = false;
if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) {
if ( fadeIn ) {
g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
fadeIn = false;
}
if ((!fadeOut) && g_settings.widget_fade) {
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;
}
else
{
if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all )
@@ -938,7 +954,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
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 only
}
}
return res;