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

Remove extern; remove timer reset

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9dadf4ff05
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:11:55 +00:00
parent d1b8c9c144
commit 6dbea5476e
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/epgview.cpp
View File

@@ -444,7 +444,7 @@ static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent& b)
return a.startTime< b.startTime; return a.startTime< b.startTime;
} }
extern char recDir[255]; //extern char recDir[255];
void sectionsd_getEventsServiceKey(t_channel_id serviceUniqueKey, CChannelEventList &eList, char search = 0, std::string search_text = ""); void sectionsd_getEventsServiceKey(t_channel_id serviceUniqueKey, CChannelEventList &eList, char search = 0, std::string search_text = "");
bool sectionsd_getComponentTagsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::ComponentTagList& tags); bool sectionsd_getComponentTagsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::ComponentTagList& tags);
extern tallchans allchans; extern tallchans allchans;
@@ -722,7 +722,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
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);
@@ -731,7 +730,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
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 only frameBuffer->setBlendMode(1); // set back to per pixel alpha only
@@ -791,6 +789,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
case CRCInput::RC_red: case CRCInput::RC_red:
if (!g_settings.minimode && (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF)) if (!g_settings.minimode && (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF))
{ {
char recDir[255];
//CTimerdClient timerdclient; //CTimerdClient timerdclient;
if (g_Timerd->isTimerdAvailable()) if (g_Timerd->isTimerdAvailable())
{ {
@@ -904,7 +903,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
case CRCInput::RC_timeout: case 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) { if ((!fadeOut) && g_settings.widget_fade) {
@@ -927,7 +925,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) { if (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) {
@@ -952,7 +949,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
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 only frameBuffer->setBlendMode(1); // set back to per pixel alpha only
} }