git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add optional addNotifier(initial_call=False)-support
[enigma2.git]
/
lib
/
driver
/
rc.cpp
diff --git
a/lib/driver/rc.cpp
b/lib/driver/rc.cpp
index 790c5f6c4df88542e0f91340fb2c055e766a1db0..43c1f2b2e6aaf5d66a50193131f647835b218875 100644
(file)
--- a/
lib/driver/rc.cpp
+++ b/
lib/driver/rc.cpp
@@
-8,7
+8,6
@@
#include <lib/base/init.h>
#include <lib/base/init_num.h>
#include <lib/base/init.h>
#include <lib/base/init_num.h>
-#include <lib/base/econfig.h>
#include <lib/base/eerror.h>
/*
#include <lib/base/eerror.h>
/*
@@
-35,12
+34,7
@@
* actions. have fun.
*/
* actions. have fun.
*/
-int eRCDevice::getKeyCompatibleCode(const eRCKey &) const
-{
- return -1;
-}
-
-eRCDevice::eRCDevice(eString id, eRCDriver *driver): driver(driver), id(id)
+eRCDevice::eRCDevice(std::string id, eRCDriver *driver): driver(driver), id(id)
{
input=driver->getInput();
driver->addCodeListener(this);
{
input=driver->getInput();
driver->addCodeListener(this);
@@
-127,7
+121,7
@@
eRCInputEventDriver::eRCInputEventDriver(const char *filename): eRCDriver(eRCInp
}
}
}
}
-
eS
tring eRCInputEventDriver::getDeviceName()
+
std::s
tring eRCInputEventDriver::getDeviceName()
{
char name[128]="";
if (handle >= 0)
{
char name[128]="";
if (handle >= 0)
@@
-163,15
+157,10
@@
void eRCConfig::reload()
{
rdelay=500;
rrate=100;
{
rdelay=500;
rrate=100;
- if ( eConfig::getInstance()->getKey("/ezap/rc/repeatRate", rrate) )
- save();
- eConfig::getInstance()->getKey("/ezap/rc/repeatDelay", rdelay);
}
void eRCConfig::save()
{
}
void eRCConfig::save()
{
- eConfig::getInstance()->setKey("/ezap/rc/repeatRate", rrate);
- eConfig::getInstance()->setKey("/ezap/rc/repeatDelay", rdelay);
}
eRCInput *eRCInput::instance;
}
eRCInput *eRCInput::instance;
@@
-182,6
+171,7
@@
eRCInput::eRCInput()
instance=this;
handle = -1;
locked = 0;
instance=this;
handle = -1;
locked = 0;
+ keyboardMode = kmNone;
}
eRCInput::~eRCInput()
}
eRCInput::~eRCInput()
@@
-214,30
+204,30
@@
void eRCInput::setFile(int newh)
handle=newh;
}
handle=newh;
}
-void eRCInput::addDevice(const
eS
tring &id, eRCDevice *dev)
+void eRCInput::addDevice(const
std::s
tring &id, eRCDevice *dev)
{
{
- devices.insert(std::pair<
eS
tring,eRCDevice*>(id, dev));
+ devices.insert(std::pair<
std::s
tring,eRCDevice*>(id, dev));
}
}
-void eRCInput::removeDevice(const
eS
tring &id)
+void eRCInput::removeDevice(const
std::s
tring &id)
{
devices.erase(id);
}
{
devices.erase(id);
}
-eRCDevice *eRCInput::getDevice(const
eS
tring &id)
+eRCDevice *eRCInput::getDevice(const
std::s
tring &id)
{
{
- std::map<
eS
tring,eRCDevice*>::iterator i=devices.find(id);
+ std::map<
std::s
tring,eRCDevice*>::iterator i=devices.find(id);
if (i == devices.end())
{
eDebug("failed, possible choices are:");
if (i == devices.end())
{
eDebug("failed, possible choices are:");
- for (std::map<
eString,eRCDevice*>::iterator i=devices.begin(); i != devices.end(); ++i)
+ for (std::map<
std::string,eRCDevice*>::iterator i=devices.begin(); i != devices.end(); ++i)
eDebug("%s", i->first.c_str());
return 0;
}
return i->second;
}
eDebug("%s", i->first.c_str());
return 0;
}
return i->second;
}
-std::map<
eS
tring,eRCDevice*,eRCInput::lstr> &eRCInput::getDevices()
+std::map<
std::s
tring,eRCDevice*,eRCInput::lstr> &eRCInput::getDevices()
{
return devices;
}
{
return devices;
}