API tools faq
paste
Advertisement
svenhoefer

Untitled

svenhoefer
Sep 27th, 2017
215
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.26 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp
  2. index 2cfafbc..c7e1a9a 100644
  3. --- a/src/driver/rcinput.cpp
  4. +++ b/src/driver/rcinput.cpp
  5. @@ -539,6 +539,12 @@ int CRCInput::checkTimers()
  6.     return _id;
  7.  }
  8.  
  9. +int64_t CRCInput::calcTimeoutEnd_GUI(const unsigned long long int _timeout_in_seconds)
  10. +{
  11. +   int timeout_in_seconds = (_timeout_in_seconds == 0) ? ULLONG_MAX : _timeout_in_seconds;
  12. +   return time_monotonic_us() + ((uint64_t)timeout_in_seconds * (uint64_t) 1000000);
  13. +}
  14. +
  15.  int64_t CRCInput::calcTimeoutEnd(const int timeout_in_seconds)
  16.  {
  17.     return time_monotonic_us() + ((uint64_t)timeout_in_seconds * (uint64_t) 1000000);
  18. diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h
  19. index d2c29e5..b6abcc0 100644
  20. --- a/src/driver/rcinput.h
  21. +++ b/src/driver/rcinput.h
  22. @@ -312,6 +312,7 @@ class CRCInput
  23.  
  24.         static int64_t calcTimeoutEnd_MS(const int timeout_in_milliseconds);
  25.         static int64_t calcTimeoutEnd(const int timeout_in_seconds);
  26. +       static int64_t calcTimeoutEnd_GUI(const unsigned long long int timeout_in_seconds);
  27.  
  28.         void getMsgAbsoluteTimeout(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint64_t *TimeoutEnd, bool bAllowRepeatLR= false);
  29.         void getMsg(neutrino_msg_t * msg, neutrino_msg_data_t * data, int Timeout, bool bAllowRepeatLR= false);        //get message, timeout in 1/10 secs :)
  30. diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp
  31. index 90ce437..13bc223 100644
  32. --- a/src/gui/bedit/bouqueteditor_bouquets.cpp
  33. +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp
  34. @@ -221,7 +221,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
  35.  
  36.     bouquetsChanged = false;
  37.  
  38. -   uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
  39. +   uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_GUI(timeout);
  40.  
  41.     bool loop = true;
  42.     while (loop)
  43. @@ -229,7 +229,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
  44.         g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
  45.  
  46.         if (msg <= CRCInput::RC_MaxRC)
  47. -           timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
  48. +           timeoutEnd = CRCInput::calcTimeoutEnd_GUI(timeout);
  49.  
  50.         if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel))
  51.         {
  52. diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp
  53. index 5bb25a8..be6e6ef 100644
  54. --- a/src/gui/bedit/bouqueteditor_channels.cpp
  55. +++ b/src/gui/bedit/bouqueteditor_channels.cpp
  56. @@ -312,7 +312,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
  57.  
  58.     channelsChanged = false;
  59.  
  60. -   uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
  61. +   uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_GUI(timeout);
  62.  
  63.     bool loop = true;
  64.     while (loop)
  65. @@ -320,7 +320,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
  66.         g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
  67.  
  68.         if (msg <= CRCInput::RC_MaxRC)
  69. -           timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
  70. +           timeoutEnd = CRCInput::calcTimeoutEnd_GUI(timeout);
  71.  
  72.         if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel))
  73.         {
  74. diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp
  75. index 11bba6f..aa7af5e 100644
  76. --- a/src/gui/bedit/bouqueteditor_chanselect.cpp
  77. +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp
  78. @@ -315,7 +315,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti
  79.     paintFoot();
  80.     paintItems();
  81.  
  82. -   uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
  83. +   uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_GUI(timeout);
  84.  
  85.     channelChanged = false;
  86.     bool loop = true;
  87. @@ -324,7 +324,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti
  88.         g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
  89.  
  90.         if (msg <= CRCInput::RC_MaxRC)
  91. -           timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
  92. +           timeoutEnd = CRCInput::calcTimeoutEnd_GUI(timeout);
  93.  
  94.         if ((msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home))
  95.         {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!