projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- work on actions
[vuplus_dvbapp]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index
b055619
..
6bf0bb9
100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-25,6
+25,8
@@
#include <lib/driver/rc.h>
#include <lib/driver/rc.h>
+#include <lib/actions/action.h>
+
#ifdef OBJECT_DEBUG
int object_total_remaining;
#ifdef OBJECT_DEBUG
int object_total_remaining;
@@
-71,8
+73,11
@@
PSignal1<void,int> &keyPressedSignal()
void keyEvent(const eRCKey &key)
{
void keyEvent(const eRCKey &key)
{
- if (!key.flags)
- keyPressed(key.code);
+ ePtr<eActionMap> ptr;
+ eActionMap::getInstance(ptr);
+ ptr->keyPressed(0, key.code, key.flags);
+// if (!key.flags)
+// keyPressed(key.code);
}
/************************************************/
}
/************************************************/
@@
-163,8
+168,10
@@
int main(int argc, char **argv)
eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
printf("executing main\n");
eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
printf("executing main\n");
+
python.execute("mytest", "__main__");
python.execute("mytest", "__main__");
+
// eApp->exec();
return 0;
// eApp->exec();
return 0;