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

9
src/gui/eventlist.cpp
View File

@@ -276,6 +276,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
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 );
}
@@ -319,7 +320,8 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
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);
}
@@ -336,6 +338,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
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;
@@ -556,6 +559,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
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;
@@ -675,7 +679,8 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
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
}
return res;