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

bedit: ensure apply of possible changed timeout settings on runtime

Browse Source
This commit is contained in:
Thilo Graf
2017-10-12 12:26:02 +02:00
parent 61a29f061a
commit b7124973de
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/bedit/bouqueteditor_bouquets.cpp
View File

@@ -211,7 +211,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
bouquetsChanged = false; bouquetsChanged = false;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr);
bool loop = true; bool loop = true;
while (loop) while (loop)
@@ -219,7 +219,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
if (msg <= CRCInput::RC_MaxRC) if (msg <= CRCInput::RC_MaxRC)
timeoutEnd = CRCInput::calcTimeoutEnd(timeout); timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr);
if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel))
{ {
@@ -354,7 +354,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
paintFoot(); paintFoot();
paintItems(); paintItems();
timeoutEnd = CRCInput::calcTimeoutEnd(timeout); timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr);
} }
} }
else if (state == beMoving) else if (state == beMoving)

6
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -251,7 +251,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
channelsChanged = false; channelsChanged = false;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr);
bool loop = true; bool loop = true;
while (loop) while (loop)
@@ -259,7 +259,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
if (msg <= CRCInput::RC_MaxRC) if (msg <= CRCInput::RC_MaxRC)
timeoutEnd = CRCInput::calcTimeoutEnd(timeout); timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr);
if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel))
{ {
@@ -296,7 +296,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
if (state == beDefault) if (state == beDefault)
addChannel(); addChannel();
timeoutEnd = CRCInput::calcTimeoutEnd(timeout); timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr);
} }
else if (msg == CRCInput::RC_yellow) else if (msg == CRCInput::RC_yellow)
{ {

4
src/gui/bedit/bouqueteditor_chanselect.cpp
View File

@@ -251,7 +251,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti
paintFoot(); paintFoot();
paintItems(); paintItems();
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr);
channelChanged = false; channelChanged = false;
bool loop = true; bool loop = true;
@@ -260,7 +260,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
if (msg <= CRCInput::RC_MaxRC) if (msg <= CRCInput::RC_MaxRC)
timeoutEnd = CRCInput::calcTimeoutEnd(timeout); timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr);
if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home)) if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home))
{ {

2
src/gui/bedit/bouqueteditor_globals.cpp
View File

@@ -53,7 +53,7 @@ CBEGlobals::CBEGlobals()
x = getScreenStartX(width); x = getScreenStartX(width);
y = getScreenStartY(height); y = getScreenStartY(height);
timeout = g_settings.timing[SNeutrinoSettings::TIMING_MENU]; timeout_ptr = &g_settings.timing[SNeutrinoSettings::TIMING_MENU];
dline = NULL; dline = NULL;
ibox = NULL; ibox = NULL;

2
src/gui/bedit/bouqueteditor_globals.h
View File

@@ -54,7 +54,7 @@ class CBEGlobals
int status_icon_width; int status_icon_width;
unsigned int items_count; unsigned int items_count;
int timeout; int* timeout_ptr;
void paintBody(); void paintBody();