Merge remote branch 'remotes/origin/bug_319_dvdburnsettings_languagechoices' into...

[vuplus_dvbapp] / lib / driver / rcinput.cpp

diff --git a/lib/driver/rcinput.cpp b/lib/driver/rcinput.cpp
index 59106c9..0aada8d 100644 (file)
--- a/lib/driver/rcinput.cpp
+++ b/lib/driver/rcinput.cpp
@@ -11,7 +11,7 @@
 #include <lib/base/init_num.h>
 #include <lib/driver/input_fake.h>
 
-void eRCDeviceInputDev::handleCode(int rccode)
+void eRCDeviceInputDev::handleCode(long rccode)
 {
        struct input_event *ev = (struct input_event *)rccode;
        if (ev->type!=EV_KEY)
@@ -44,9 +44,9 @@ void eRCDeviceInputDev::handleCode(int rccode)
                        case KEY_RIGHTSHIFT:
                        case KEY_LEFTALT:
                        case KEY_CAPSLOCK:
-                       case KEY_COMPOSE:
                        case KEY_INSERT:
                        case KEY_DELETE:
+                       case KEY_MUTE:
                                filtered=false;
                        default:
                                break;
@@ -75,7 +75,7 @@ eRCDeviceInputDev::eRCDeviceInputDev(eRCInputEventDriver *driver)
 {
        int len=id.length();
        int idx=0;
-       while(idx < len)
+       while(idx <= len-8)
        {
                if (!strncasecmp(&id[idx++], "KEYBOARD", 8))
                {
@@ -83,6 +83,7 @@ eRCDeviceInputDev::eRCDeviceInputDev(eRCInputEventDriver *driver)
                        break;
                }
        }
+       driver->setExclusive(!iskeyboard);
        eDebug("Input device \"%s\" is %sa keyboard.", id.c_str(), iskeyboard ? "" : "not ");
 
 }