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

- bouqueteditor: fix timeout; editor doesn't open when timeout was "off"

Browse Source
This commit is contained in:
svenhoefer
2017-09-27 08:33:15 +02:00
committed by Jacek Jendrzej
parent db5af2d9ca
commit db80514499
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
bouquetsChanged = false; bouquetsChanged = false;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
bool loop = true; bool loop = true;
while (loop) while (loop)
@@ -229,7 +229,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(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
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))
{ {

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

@@ -312,7 +312,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
channelsChanged = false; channelsChanged = false;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
bool loop = true; bool loop = true;
while (loop) while (loop)
@@ -320,7 +320,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(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
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))
{ {

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

@@ -315,7 +315,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti
paintFoot(); paintFoot();
paintItems(); paintItems();
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
channelChanged = false; channelChanged = false;
bool loop = true; bool loop = true;
@@ -324,7 +324,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(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
if ((msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home)) if ((msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home))
{ {

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

@@ -53,6 +53,8 @@ CBEGlobals::CBEGlobals()
x = getScreenStartX(width); x = getScreenStartX(width);
y = getScreenStartY(height); y = getScreenStartY(height);
timeout = g_settings.timing[SNeutrinoSettings::TIMING_MENU];
} }
CBEGlobals::~CBEGlobals() CBEGlobals::~CBEGlobals()

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

@@ -56,6 +56,8 @@ class CBEGlobals
int action_icon_width; int action_icon_width;
int status_icon_width; int status_icon_width;
int timeout;
}; };
#endif #endif