mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use new class to fade

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1946 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-12-06 13:07:53 +00:00
parent 4210a40244
commit e0ef7a0680
1 changed files with 10 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/gui/bouquetlist.cpp
View File

@@ -49,6 +49,7 @@
#include <driver/fontrenderer.h> #include <driver/fontrenderer.h>
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/rcinput.h> #include <driver/rcinput.h>
#include <driver/fade.h>
#include <daemonc/remotecontrol.h> #include <daemonc/remotecontrol.h>
#include <system/settings.h> #include <system/settings.h>
@@ -318,16 +319,8 @@ int CBouquetList::show(bool bShowChannelList)
while ((i= i/10)!=0) while ((i= i/10)!=0)
lmaxpos++; lmaxpos++;
bool fadeIn = g_settings.widget_fade; COSDFader fader(g_settings.menu_Content_alpha);
bool fadeOut = false; fader.StartFadeIn();
uint32_t fadeTimer = 0;
int fadeValue = g_settings.menu_Content_alpha;
if ( fadeIn ) {
fadeValue = 100;
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
frameBuffer->setBlendLevel(fadeValue, fadeValue);
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
}
paintHead(); paintHead();
paint(); paint();
@@ -348,39 +341,16 @@ int CBouquetList::show(bool bShowChannelList)
if ( msg <= CRCInput::RC_MaxRC ) if ( msg <= CRCInput::RC_MaxRC )
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]);
if((msg == NeutrinoMessages::EVT_TIMER) && (data == fadeTimer)) { if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetTimer())) {
if (fadeOut) { // disappear if(fader.Fade())
fadeValue += FADE_STEP;
if (fadeValue >= 100) {
fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer);
loop = false; loop = false;
} else
frameBuffer->setBlendLevel(fadeValue, fadeValue);
} else { // appears
fadeValue -= FADE_STEP;
if (fadeValue <= g_settings.menu_Content_alpha) {
fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer);
fadeIn = false;
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
} else
frameBuffer->setBlendLevel(fadeValue, fadeValue);
}
} }
else if ((msg == CRCInput::RC_timeout ) || else if ((msg == CRCInput::RC_timeout ) ||
(msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) (msg == (neutrino_msg_t)g_settings.key_channelList_cancel))
{ {
selected = oldselected; selected = oldselected;
if ( fadeIn ) { if(fader.StartFadeOut()) {
g_RCInput->killTimer(fadeTimer);
fadeIn = false;
}
if ((!fadeOut) && g_settings.widget_fade) {
fadeOut = true;
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
timeoutEnd = CRCInput::calcTimeoutEnd( 1 ); timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
msg = 0; msg = 0;
} else } else
loop=false; loop=false;
@@ -544,10 +514,9 @@ int CBouquetList::show(bool bShowChannelList)
}; };
} }
hide(); hide();
if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); fader.Stop();
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
}
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
if(zapOnExit) { if(zapOnExit) {
return (selected); return (selected);