X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/036d2ec4dc7a66f9d591c00f65fa54bbddb24769..e6ca11b5b7c734505f84206b196701828136f81a:/lib/driver/rc.cpp diff --git a/lib/driver/rc.cpp b/lib/driver/rc.cpp index 1a2cc1d8..c7acd113 100644 --- a/lib/driver/rc.cpp +++ b/lib/driver/rc.cpp @@ -79,7 +79,7 @@ eRCShortDriver::eRCShortDriver(const char *filename): eRCDriver(eRCInput::getIns sn=0; } else { - sn=new eSocketNotifier(eApp, handle, eSocketNotifier::Read); + sn=eSocketNotifier::create(eApp, handle, eSocketNotifier::Read); CONNECT(sn->activated, eRCShortDriver::keyPressed); eRCInput::getInstance()->setFile(handle); } @@ -89,8 +89,6 @@ eRCShortDriver::~eRCShortDriver() { if (handle>=0) close(handle); - if (sn) - delete sn; } void eRCInputEventDriver::keyPressed(int) @@ -102,7 +100,7 @@ void eRCInputEventDriver::keyPressed(int) break; if (enabled && !input->islocked()) for (std::list::iterator i(listeners.begin()); i!=listeners.end(); ++i) - (*i)->handleCode((int)&ev); + (*i)->handleCode((long)&ev); } } @@ -115,7 +113,7 @@ eRCInputEventDriver::eRCInputEventDriver(const char *filename): eRCDriver(eRCInp sn=0; } else { - sn=new eSocketNotifier(eApp, handle, eSocketNotifier::Read); + sn=eSocketNotifier::create(eApp, handle, eSocketNotifier::Read); CONNECT(sn->activated, eRCInputEventDriver::keyPressed); eRCInput::getInstance()->setFile(handle); } @@ -133,8 +131,6 @@ eRCInputEventDriver::~eRCInputEventDriver() { if (handle>=0) close(handle); - if (sn) - delete sn; } eRCConfig::eRCConfig() @@ -171,7 +167,7 @@ eRCInput::eRCInput() instance=this; handle = -1; locked = 0; - keyboardMode = kmAll; + keyboardMode = kmNone; } eRCInput::~eRCInput()