Merge remote-tracking branch 'check/next-cc'

Origin commit data
------------------
Branch: ni/coolstream
Commit: f6d8c02313
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-19 (Wed, 19 Feb 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-02-19 11:29:29 +01:00
5 changed files with 14 additions and 10 deletions

View File

@@ -1266,7 +1266,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
firstKey = false;
CTimerManager::getInstance()->cancelShutdownOnWakeup();
}
uint32_t trkey = translate(ev.code, i);
uint32_t trkey = translate(ev.code);
#ifdef _DEBUG
printf("key: %04x value %d, translate: %04x -%s-\n", ev.code, ev.value, trkey, getKeyName(trkey).c_str());
#endif
@@ -1627,7 +1627,7 @@ const char *CRCInput::getKeyNameC(const unsigned int key)
* transforms the rc-key to generic - internal use only!
*
**************************************************************************/
int CRCInput::translate(int code, int /*num*/)
int CRCInput::translate(int code)
{
switch(code)
{
@@ -1650,8 +1650,8 @@ int CRCInput::translate(int code, int /*num*/)
}
if ((code >= 0) && (code <= KEY_MAX))
return code;
else
return ( unsigned int)RC_nokey;
return (int)RC_nokey;
}
void CRCInput::close_click()