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

Revert "- rc_input: just cosmetics to satisfy syntax-highlighters"

Browse Source 
This reverts commit d7ed439e53.
This commit is contained in:
Stefan Seyfried
2017-02-22 20:05:54 +01:00
parent 63dce04974
commit 3d7f6f13c4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/rcinput.cpp
View File

@@ -575,6 +575,8 @@ int CRCInput::checkTimers()
return _id; return _id;
} }
int64_t CRCInput::calcTimeoutEnd(const int timeout_in_seconds) int64_t CRCInput::calcTimeoutEnd(const int timeout_in_seconds)
{ {
return time_monotonic_us() + ((uint64_t)timeout_in_seconds * (uint64_t) 1000000); 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) { if (trkey == rc_last_key) {
/* only allow selected keys to be repeated */ /* only allow selected keys to be repeated */
if (mayRepeat(trkey, bAllowRepeatLR) || if (mayRepeat(trkey, bAllowRepeatLR) ||
(g_settings.shutdown_real_rcdelay && ((trkey == RC_standby) && (g_settings.shutdown_real_rcdelay &&
((trkey == RC_standby) &&
#if HAVE_COOL_HARDWARE #if HAVE_COOL_HARDWARE
(cs_get_revision() > 7) (cs_get_revision() > 7))))
#else #else
(g_info.hw_caps->can_shutdown) (g_info.hw_caps->can_shutdown))))
#endif #endif
)))
{ {
#ifdef ENABLE_REPEAT_CHECK #ifdef ENABLE_REPEAT_CHECK
if (rc_last_repeat_key != trkey) { if (rc_last_repeat_key != trkey) {