Fixed return value of cIptvMenuInfo::ProcessKey().

This commit is contained in:
Rolf Ahrenberg 2007-10-07 15:13:48 +00:00
parent 773937d59d
commit dc6330bfaf
1 changed files with 6 additions and 7 deletions

13
setup.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: setup.c,v 1.23 2007/10/07 10:13:45 ajhseppa Exp $ * $Id: setup.c,v 1.24 2007/10/07 15:13:48 rahrenbe Exp $
*/ */
#include <string.h> #include <string.h>
@ -475,7 +475,7 @@ class cIptvMenuInfo : public cOsdMenu
{ {
private: private:
enum { enum {
INFO_TIMEOUT = 2000 INFO_TIMEOUT_MS = 2000
}; };
cString text; cString text;
cTimeMs timeout; cTimeMs timeout;
@ -489,7 +489,7 @@ public:
}; };
cIptvMenuInfo::cIptvMenuInfo() cIptvMenuInfo::cIptvMenuInfo()
:cOsdMenu(tr("IPTV Information")), text(""), timeout(INFO_TIMEOUT) :cOsdMenu(tr("IPTV Information")), text(""), timeout(INFO_TIMEOUT_MS)
{ {
UpdateInfo(0, "kbytes", 1024); UpdateInfo(0, "kbytes", 1024);
} }
@ -506,7 +506,7 @@ void cIptvMenuInfo::UpdateInfo(uint64_t elapsed, const char* unit, const int uni
else else
text = cString(tr("IPTV information not available!")); text = cString(tr("IPTV information not available!"));
Display(); Display();
timeout.Set(INFO_TIMEOUT); timeout.Set(INFO_TIMEOUT_MS);
} }
void cIptvMenuInfo::Display(void) void cIptvMenuInfo::Display(void)
@ -539,10 +539,9 @@ eOSState cIptvMenuInfo::ProcessKey(eKeys Key)
if (state == osUnknown) { if (state == osUnknown) {
switch (Key) { switch (Key) {
case kOk: return osBack; case kOk: return osBack;
default: if (timeout.TimedOut()) { default: if (timeout.TimedOut())
UpdateInfo(INFO_TIMEOUT, "kb/s", 1024); UpdateInfo(INFO_TIMEOUT_MS, "kb/s", 1024);
return osContinue; return osContinue;
}
} }
} }
return state; return state;