mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
Revert "- rc_input: just cosmetics to satisfy syntax-highlighters"
This reverts commitbab85d298c
. Origin commit data ------------------ Branch: ni/coolstream Commit:3d7f6f13c4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de> Date: 2017-02-22 (Wed, 22 Feb 2017) ------------------ This commit was generated by Migit
This commit is contained in:
@@ -575,6 +575,8 @@ int CRCInput::checkTimers()
|
||||
return _id;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int64_t CRCInput::calcTimeoutEnd(const int timeout_in_seconds)
|
||||
{
|
||||
return time_monotonic_us() + ((uint64_t)timeout_in_seconds * (uint64_t) 1000000);
|
||||
@@ -1427,13 +1429,13 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
|
||||
if (trkey == rc_last_key) {
|
||||
/* only allow selected keys to be repeated */
|
||||
if (mayRepeat(trkey, bAllowRepeatLR) ||
|
||||
(g_settings.shutdown_real_rcdelay && ((trkey == RC_standby) &&
|
||||
(g_settings.shutdown_real_rcdelay &&
|
||||
((trkey == RC_standby) &&
|
||||
#if HAVE_COOL_HARDWARE
|
||||
(cs_get_revision() > 7)
|
||||
(cs_get_revision() > 7))))
|
||||
#else
|
||||
(g_info.hw_caps->can_shutdown)
|
||||
(g_info.hw_caps->can_shutdown))))
|
||||
#endif
|
||||
)))
|
||||
{
|
||||
#ifdef ENABLE_REPEAT_CHECK
|
||||
if (rc_last_repeat_key != trkey) {
|
||||
|
Reference in New Issue
Block a user