mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +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
This commit is contained in:
focus
2011-07-21 10:04:05 +00:00
parent 7252d01f14
commit 5c8429673a
10 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver/rcinput.cpp
View File

@@ -380,9 +380,12 @@ int CRCInput::addTimer(const time_t *Timeout)
return addTimer( (uint64_t)*Timeout* (uint64_t) 1000000, true, false ); return addTimer( (uint64_t)*Timeout* (uint64_t) 1000000, true, false );
} }
void CRCInput::killTimer(uint32_t id) void CRCInput::killTimer(uint32_t &id)
{ {
//printf("killing timer %d\n", id); //printf("killing timer %d\n", id);
if(id == 0)
return;
std::vector<timer>::iterator e; std::vector<timer>::iterator e;
for ( e= timers.begin(); e!= timers.end(); ++e ) for ( e= timers.begin(); e!= timers.end(); ++e )
if ( e->id == id ) if ( e->id == id )
@@ -390,6 +393,7 @@ void CRCInput::killTimer(uint32_t id)
timers.erase(e); timers.erase(e);
break; break;
} }
id = 0;
} }
int CRCInput::checkTimers() int CRCInput::checkTimers()
@@ -1017,7 +1021,7 @@ printf("[neutrino] CSectionsdClient::EVT_GOT_CN_EPG\n");
break; break;
case CZapitClient::EVT_PMT_CHANGED: case CZapitClient::EVT_PMT_CHANGED:
*msg = NeutrinoMessages::EVT_PMT_CHANGED; *msg = NeutrinoMessages::EVT_PMT_CHANGED;
*data = 0; *data = (neutrino_msg_data_t) p;
break; break;
default: default:
printf("[neutrino] event INITID_ZAPIT - unknown eventID 0x%x\n", emsg.eventID ); printf("[neutrino] event INITID_ZAPIT - unknown eventID 0x%x\n", emsg.eventID );

2
src/driver/rcinput.h
View File

@@ -267,7 +267,7 @@ class CRCInput
int addTimer(struct timeval Timeout); int addTimer(struct timeval Timeout);
int addTimer(const time_t *Timeout); int addTimer(const time_t *Timeout);
void killTimer(uint32_t id); void killTimer(uint32_t &id);
static int64_t calcTimeoutEnd_MS(const int timeout_in_milliseconds); static int64_t calcTimeoutEnd_MS(const int timeout_in_milliseconds);
static int64_t calcTimeoutEnd(const int timeout_in_seconds); static int64_t calcTimeoutEnd(const int timeout_in_seconds);

4
src/gui/audioplayer.cpp
View File

@@ -2294,9 +2294,7 @@ void CAudioPlayerGui::screensaver(bool on)
} }
else else
{ {
if (stimer) g_RCInput->killTimer(stimer);
g_RCInput->killTimer(stimer);
stimer = 0;
m_screensaver = false; m_screensaver = false;
#if 0 #if 0
m_frameBuffer->loadPal("radiomode.pal", 18, COL_MAXFREE); m_frameBuffer->loadPal("radiomode.pal", 18, COL_MAXFREE);

4
src/gui/bouquetlist.cpp
View File

@@ -354,7 +354,6 @@ int CBouquetList::show(bool bShowChannelList)
if (fadeValue >= 100) { if (fadeValue >= 100) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
loop = false; loop = false;
} else } else
frameBuffer->setBlendLevel(fadeValue, fadeValue); frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -363,7 +362,6 @@ int CBouquetList::show(bool bShowChannelList)
if (fadeValue <= g_settings.menu_Content_alpha) { if (fadeValue <= g_settings.menu_Content_alpha) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
fadeIn = false; 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -377,7 +375,6 @@ int CBouquetList::show(bool bShowChannelList)
selected = oldselected; selected = oldselected;
if ( fadeIn ) { if ( fadeIn ) {
g_RCInput->killTimer(fadeTimer); g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
fadeIn = false; fadeIn = false;
} }
if ((!fadeOut) && g_settings.widget_fade) { if ((!fadeOut) && g_settings.widget_fade) {
@@ -536,7 +533,6 @@ int CBouquetList::show(bool bShowChannelList)
hide(); hide();
if ( fadeIn || fadeOut ) { if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
} }

4
src/gui/dboxinfo.cpp
View File

@@ -113,7 +113,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
if (fadeValue >= 100) { if (fadeValue >= 100) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
doLoop = false; doLoop = false;
} else } else
frameBuffer->setBlendLevel(fadeValue, fadeValue); frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -122,7 +121,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
if (fadeValue <= g_settings.menu_Content_alpha) { if (fadeValue <= g_settings.menu_Content_alpha) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
fadeIn = false; 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -135,7 +133,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
( msg == CRCInput::RC_ok ) ) { ( msg == CRCInput::RC_ok ) ) {
if ( fadeIn ) { if ( fadeIn ) {
g_RCInput->killTimer(fadeTimer); g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
fadeIn = false; fadeIn = false;
} }
if ((!fadeOut) && g_settings.widget_fade) { if ((!fadeOut) && g_settings.widget_fade) {
@@ -174,7 +171,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
hide(); hide();
if ( fadeIn || fadeOut ) { if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
} }

4
src/gui/epgplus.cpp
View File

@@ -837,7 +837,6 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
if (fadeValue >= 100) { if (fadeValue >= 100) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
loop = false; loop = false;
} else } else
frameBuffer->setBlendLevel(fadeValue, fadeValue); frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -846,7 +845,6 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
if (fadeValue <= g_settings.menu_Content_alpha) { if (fadeValue <= g_settings.menu_Content_alpha) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
fadeIn = false; 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -857,7 +855,6 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
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)) {
if ( fadeIn ) { if ( fadeIn ) {
g_RCInput->killTimer(fadeTimer); g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
fadeIn = false; fadeIn = false;
} }
if ((!fadeOut) && g_settings.widget_fade) { if ((!fadeOut) && g_settings.widget_fade) {
@@ -1186,7 +1183,6 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
this->hide(); this->hide();
if ( fadeIn || fadeOut ) { if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
} }

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

4
src/gui/pluginlist.cpp
View File

@@ -165,7 +165,6 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
if (fadeValue >= 100) { if (fadeValue >= 100) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
loop = false; loop = false;
} else } else
frameBuffer->setBlendLevel(fadeValue, fadeValue); frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -174,7 +173,6 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
if (fadeValue <= g_settings.menu_Content_alpha) { if (fadeValue <= g_settings.menu_Content_alpha) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
fadeIn = false; 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -187,7 +185,6 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
{ {
if ( fadeIn ) { if ( fadeIn ) {
g_RCInput->killTimer(fadeTimer); g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
fadeIn = false; fadeIn = false;
} }
if ((!fadeOut) && g_settings.widget_fade) { if ((!fadeOut) && g_settings.widget_fade) {
@@ -285,7 +282,6 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
hide(); hide();
if ( fadeIn || fadeOut ) { if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
} }

4
src/gui/timerlist.cpp
View File

@@ -504,7 +504,6 @@ int CTimerList::show()
if (fadeValue >= 100) { if (fadeValue >= 100) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
loop = false; loop = false;
} else } else
frameBuffer->setBlendLevel(fadeValue, fadeValue); frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -513,7 +512,6 @@ int CTimerList::show()
if (fadeValue <= g_settings.menu_Content_alpha) { if (fadeValue <= g_settings.menu_Content_alpha) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
fadeIn = false; 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -526,7 +524,6 @@ int CTimerList::show()
{ //Exit after timeout or cancel key { //Exit after timeout or cancel key
if ( fadeIn ) { if ( fadeIn ) {
g_RCInput->killTimer(fadeTimer); g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
fadeIn = false; fadeIn = false;
} }
if ((!fadeOut) && g_settings.widget_fade) { if ((!fadeOut) && g_settings.widget_fade) {
@@ -663,7 +660,6 @@ int CTimerList::show()
} }
if ( fadeIn || fadeOut ) { if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
} }

5
src/gui/widget/menue.cpp
View File

@@ -501,7 +501,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if (fadeValue >= 100) { if (fadeValue >= 100) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
msg = CRCInput::RC_timeout; msg = CRCInput::RC_timeout;
} else } else
frameBuffer->setBlendLevel(fadeValue, fadeValue); frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -510,7 +509,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if (fadeValue <= g_settings.menu_Content_alpha) { if (fadeValue <= g_settings.menu_Content_alpha) {
fadeValue = g_settings.menu_Content_alpha; fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
fadeIn = false; 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -638,7 +636,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
item->msg = msg; item->msg = msg;
if ( fadeIn ) { if ( fadeIn ) {
g_RCInput->killTimer(fadeTimer); g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
fadeIn = false; 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -687,7 +684,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if(msg == CRCInput::RC_timeout) { if(msg == CRCInput::RC_timeout) {
if ( fadeIn ) { if ( fadeIn ) {
g_RCInput->killTimer(fadeTimer); g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
fadeIn = false; fadeIn = false;
} }
if ((!fadeOut) && g_settings.widget_fade && fade) { if ((!fadeOut) && g_settings.widget_fade && fade) {
@@ -712,7 +708,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if ( fadeIn || fadeOut ) { if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); 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 frameBuffer->setBlendMode(1); // Set back to per pixel alpha
} }