mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix initializers and shadows

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@124 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
mws
2009-12-29 13:56:52 +00:00
parent 00353cf75d
commit 474790557f
10 changed files with 196 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/driver/rcinput.cpp
View File

@@ -824,16 +824,16 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, unsig
{
case CSectionsdClient::EVT_TIMESET:
{
struct timeval tv;
gettimeofday( &tv, NULL );
long long timeOld = (long long) tv.tv_usec + (long long)((long long) tv.tv_sec * (long long) 1000000);
struct timeval ltv;
gettimeofday( &ltv, NULL );
long long timeOld = (long long) ltv.tv_usec + (long long)((long long) ltv.tv_sec * (long long) 1000000);
//printf("[neutrino] event TIMESET from SECTIONSD %x %x\n", emsg.eventID, *(unsigned*) p);
//g_Sectionsd->registerEvent(CSectionsdClient::EVT_TIMESET, 222, NEUTRINO_UDS_NAME);
stime((time_t*) p);
gettimeofday( &tv, NULL );
long long timeNew = (long long) tv.tv_usec + (long long)((long long) tv.tv_sec * (long long) 1000000);
gettimeofday( &ltv, NULL );
long long timeNew = (long long) ltv.tv_usec + (long long)((long long) ltv.tv_sec * (long long) 1000000);
delete[] p;//new [] delete []
p= new unsigned char[ sizeof(long long) ];
@@ -1440,13 +1440,13 @@ const char * CRCInput::getSpecialKeyName(const unsigned int key)
std::string CRCInput::getKeyName(const unsigned int key)
{
int unicode_value = getUnicodeValue(key);
if (unicode_value == -1)
int lunicode_value = getUnicodeValue(key);
if (lunicode_value == -1)
return getSpecialKeyName(key);
else
{
char tmp[2];
tmp[0] = unicode_value;
tmp[0] = lunicode_value;
tmp[1] = 0;
return std::string(tmp);
}