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

Merge branch 'tuxbox-fixed'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4aab7d37f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-02-22 20:06:27 +01:00
parent 192b4158fe 2614197ccd
commit 16d44b0f70
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver/rcinput.cpp
View File

@@ -1344,9 +1344,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
}
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
if (trkey == RC_nokey)
continue;
@@ -1380,9 +1378,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
}
if (ev.value) {
#ifdef RCDEBUG
printf("rc_last_key %04x rc_last_repeat_key %04x\n\n", rc_last_key, rc_last_repeat_key);
#endif
d_printf("rc_last_key %04x rc_last_repeat_key %04x\n\n", rc_last_key, rc_last_repeat_key);
bool keyok = true;
#if 0
uint64_t now_pressed;
@@ -1735,7 +1731,7 @@ void CRCInput::setKeyRepeatDelay(unsigned int start_ms, unsigned int repeat_ms)
std::string path = (*it).path;
if (path == "/tmp/neutrino.input")
continue; /* setting repeat rate does not work here */
#ifdef HAVE_COOL_HARDWARE
#ifdef BOXMODEL_CS_HD1
/* this is ugly, but the driver does not support anything advanced... */
if (path == "/dev/input/nevis_ir") {
d_printf("[rcinput:%s] %s(fd %d) using proprietary ioctl\n", __func__, path.c_str(), fd);

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

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

2
src/rcsim.c
View File

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