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

Allow killTimer to check and reset timer id

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1562 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c8429673a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2011-07-21 10:04:05 +00:00
parent 0076e718cd
commit 10c65d19e5
10 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/eventlist.cpp
View File

@@ -300,7 +300,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
if (fadeValue >= 100) {
fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
loop = false;
} else
frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -309,7 +308,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
if (fadeValue <= g_settings.menu_Content_alpha) {
fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
fadeIn = false;
//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -322,7 +320,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
selected = oldselected;
if ( fadeIn ) {
g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
fadeIn = false;
}
if ((!fadeOut) && g_settings.widget_fade) {
@@ -543,7 +540,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
selected = oldselected;
if ( fadeIn ) {
g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
fadeIn = false;
}
if ((!fadeOut) && g_settings.widget_fade) {
@@ -669,7 +665,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
hide();
if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
}