Merge branch 'bug_538_ignore_global_actions_in_standby'

[enigma2.git] / lib / driver / rcconsole.cpp

diff --git a/lib/driver/rcconsole.cpp b/lib/driver/rcconsole.cpp
index 946f8d313d6f3a8c80836e4517fb11d2d4337fbf..eb5aee3db7187cc99cc1c0108fee87f0fb657c38 100644 (file)
--- a/lib/driver/rcconsole.cpp
+++ b/lib/driver/rcconsole.cpp
@@ -14,9 +14,8 @@ eRCConsoleDriver::eRCConsoleDriver(const char *filename): eRCDriver(eRCInput::ge
                sn=0;
        } else
        {
-               sn=new eSocketNotifier(eApp, handle, eSocketNotifier::Read);
+               sn=eSocketNotifier::create(eApp, handle, eSocketNotifier::Read);
                CONNECT(sn->activated, eRCConsoleDriver::keyPressed);
-               eRCInput::getInstance()->setFile(handle);
        }
        
                /* set console mode */
@@ -32,8 +31,6 @@ eRCConsoleDriver::~eRCConsoleDriver()
        tcsetattr(handle,TCSANOW, &ot);
        if (handle>=0)
                close(handle);
-       if (sn)
-               delete sn;
 }
 
 void eRCConsoleDriver::keyPressed(int)
@@ -72,11 +69,9 @@ void eRCConsoleDriver::keyPressed(int)
                                code = -1;
                        else switch(code)
                        {
-                       case 0x71:              // KEY_MUTE
-                       case 0x7F:              // KEY_COMPOSE
-                       case 0x6F:              // KEY_DELETE
-                       case 0x6E:              // KEY_INSERT
-                               code = -1;
+                       case 0x7E:  // mute, einfg, entf
+                       case 0x7F:  // backspace
+                       code = -1;
                        default:
                                break;
                        }
@@ -91,7 +86,7 @@ void eRCConsoleDriver::keyPressed(int)
        }
 }
 
-void eRCConsole::handleCode(int code)
+void eRCConsole::handleCode(long code)
 {
        input->keyPressed(eRCKey(this, code, eRCKey::flagAscii));
 }