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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: f913ae1bfa
Author: vanhofen <vanhofen@gmx.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:
vanhofen
2017-02-22 13:43:10 +01:00
parent 2c2bbbc66d d66134ff78
commit ff829266ae
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@@ -13,3 +13,5 @@ libtoolize --force
autoconf --force autoconf --force
autoheader --force autoheader --force
automake --add-missing --force-missing --foreign automake --add-missing --force-missing --foreign
autoreconf -fi

10
src/driver/rcinput.cpp
View File

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