mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +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@1942 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 3c2845d590
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-06 (Tue, 06 Dec 2011)
This commit is contained in:
[CST] Focus
2011-12-06 12:29:16 +00:00
parent b7b277ab19
commit 02e2745f22
1 changed files with 11 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/gui/channellist.cpp
View File

@@ -43,6 +43,7 @@
#include <driver/rcinput.h> #include <driver/rcinput.h>
#include <driver/abstime.h> #include <driver/abstime.h>
#include <driver/record.h> #include <driver/record.h>
#include <driver/fade.h>
#include <gui/color.h> #include <gui/color.h>
#include <gui/eventlist.h> #include <gui/eventlist.h>
@@ -568,16 +569,8 @@ int CChannelList::show()
calcSize(); calcSize();
displayNext = false; displayNext = false;
bool fadeIn = g_settings.widget_fade; COSDFader fader(g_settings.menu_Content_alpha);
bool fadeOut = false; fader.StartFadeIn();
int fadeValue = g_settings.menu_Content_alpha;
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 );
}
paintHead(); paintHead();
paint(); paint();
@@ -598,24 +591,9 @@ int CChannelList::show()
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; loop = false;
if (fadeValue >= 100) {
fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer);
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 ) || ( msg == (neutrino_msg_t)g_settings.key_channelList_cancel) ) { else if ( ( msg == CRCInput::RC_timeout ) || ( msg == (neutrino_msg_t)g_settings.key_channelList_cancel) ) {
@@ -627,16 +605,8 @@ int CChannelList::show()
res = -4; res = -4;
selected = selected_in_new_mode; selected = selected_in_new_mode;
} }
if(fader.StartFadeOut()) {
if ( fadeIn ) {
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;
@@ -691,6 +661,7 @@ int CChannelList::show()
} }
else if ( msg == CRCInput::RC_setup) { else if ( msg == CRCInput::RC_setup) {
old_b_id = bouquetList->getActiveBouquetNumber(); old_b_id = bouquetList->getActiveBouquetNumber();
fader.Stop();
g_channel_list_changed = doChannelMenu(); g_channel_list_changed = doChannelMenu();
if(g_channel_list_changed) { if(g_channel_list_changed) {
res = -4; res = -4;
@@ -962,10 +933,9 @@ int CChannelList::show()
} }
} }
hide(); hide();
if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); fader.Stop();
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
}
if (bShowBouquetList) { if (bShowBouquetList) {
res = bouquetList->exec(true); res = bouquetList->exec(true);
printf("CChannelList:: bouquetList->exec res %d\n", res); printf("CChannelList:: bouquetList->exec res %d\n", res);