mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-10 15:18:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: de1be9b239
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
This commit is contained in:
vanhofen
2017-02-23 12:22:30 +01:00
parent d724062514 daf29c0d9c
commit 40df044204
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/rcinput.cpp
View File

@@ -1382,7 +1382,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
} }
uint32_t trkey = translate(ev.code); uint32_t trkey = translate(ev.code);
d_printf("key: %04x value %d, translate: %04x -%s-\n", ev.code, ev.value, trkey, getKeyName(trkey).c_str()); printf("key: %04x value %d, translate: %04x -%s-\n", ev.code, ev.value, trkey, getKeyName(trkey).c_str());
if (trkey == RC_nokey) if (trkey == RC_nokey)
continue; continue;

2
src/neutrino.cpp
View File

@@ -3808,7 +3808,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
return messages_return::handled; return messages_return::handled;
} }
if ((msg >= CRCInput::RC_WithData) && (msg < CRCInput::RC_WithData + 0x10000000)) { if ((msg >= CRCInput::RC_WithData) && (msg < CRCInput::RC_WithData + 0x10000000)) {
INFO("###################################### DELETED msg %x data %x\n", msg, data); INFO("###################################### DELETED msg %lX data %lX\n", msg, data);
delete [] (unsigned char*) data; delete [] (unsigned char*) data;
return messages_return::handled; return messages_return::handled;
} }

4
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -893,8 +893,8 @@ void CControlAPI::RCEmCGI(CyhookHandler *hh)
#endif #endif
int evd = open(EVENTDEV, O_RDWR); int evd = open(EVENTDEV, O_RDWR);
if (evd < 0) { if (evd < 0) {
perror("opening " EVENTDEV " failed");
hh->SendError(); hh->SendError();
perror("opening event0 failed");
return; return;
} }
if (rc_send(evd, sendcode, KEY_PRESSED) < 0) { if (rc_send(evd, sendcode, KEY_PRESSED) < 0) {
@@ -905,8 +905,8 @@ void CControlAPI::RCEmCGI(CyhookHandler *hh)
} }
if (rc_send(evd, sendcode, KEY_RELEASED) < 0) { if (rc_send(evd, sendcode, KEY_RELEASED) < 0) {
perror("writing 'KEY_RELEASED' event failed"); perror("writing 'KEY_RELEASED' event failed");
close(evd);
hh->SendError(); hh->SendError();
close(evd);
return; return;
} }
close(evd); close(evd);

2
src/rcsim.c
View File

@@ -219,7 +219,7 @@ int main (int argc, char **argv){
#if defined (EVENTDEV) #if defined (EVENTDEV)
evd=open (EVENTDEV,O_RDWR); evd=open (EVENTDEV,O_RDWR);
if (evd<0){ if (evd<0){
perror ("opening event0 failed"); perror ("opening " EVENTDEV " failed");
return 1; return 1;
} }
#else #else