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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-29 10:49:27 +02:00
parent 452f155f04 99cc7f850a
commit 4fc73acffc
27 changed files with 89 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -778,7 +778,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
int pos = selected;
int retval = menu_return::RETURN_REPAINT;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
bool bAllowRepeatLR_override = keyActionMap.find(CRCInput::RC_left) != keyActionMap.end() || keyActionMap.find(CRCInput::RC_right) != keyActionMap.end();
do {
@@ -790,7 +790,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
int handled= false;
if ( msg <= CRCInput::RC_MaxRC ) {
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
std::map<neutrino_msg_t, keyAction>::iterator it = keyActionMap.find(msg);
if (it != keyActionMap.end()) {
@@ -1005,7 +1005,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
}
if(msg == CRCInput::RC_timeout) {
if(fade && fader.StartFadeOut()) {
timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
timeoutEnd = CRCInput::calcTimeoutEnd(1);
msg = 0;
continue;
}
@@ -1014,7 +1014,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if ( msg <= CRCInput::RC_MaxRC )
{
// recalculate timeout for RC-keys
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
}
frameBuffer->blit();
}