mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-27 23:42:58 +02:00
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
This commit is contained in:
committed by
Jacek Jendrzej
parent
386c2b4d09
commit
99cc7f850a
@@ -935,14 +935,14 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
|
||||
this->paint();
|
||||
|
||||
int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST];
|
||||
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
|
||||
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
|
||||
bool loop = true;
|
||||
while (loop)
|
||||
{
|
||||
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
|
||||
|
||||
if (msg <= CRCInput::RC_MaxRC)
|
||||
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
|
||||
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
|
||||
|
||||
|
||||
if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer()))
|
||||
@@ -954,7 +954,7 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
|
||||
{
|
||||
if (fader.StartFadeOut())
|
||||
{
|
||||
timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
|
||||
timeoutEnd = CRCInput::calcTimeoutEnd(1);
|
||||
msg = 0;
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user