diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2005-02-25 01:46:44 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2005-02-25 01:46:44 +0000 |
| commit | 1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b (patch) | |
| tree | 5bd4dbac6538cf499f641849d26193958b48a187 /main | |
| parent | e677ac4a7bf81391877c909a703e5918ce4a511b (diff) | |
| download | enigma2-1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b.tar.gz enigma2-1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b.zip | |
- work on actions
- changed time when screens are acutally constructed
- added service name (not working atm) and event info (now&next)
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile.am | 1 | ||||
| -rw-r--r-- | main/enigma.cpp | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index a8ecca4f..1fdf8c32 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -8,6 +8,7 @@ enigma2_SOURCES = \ enigma.cpp enigma2_LDADD_WHOLE = \ + $(top_builddir)/lib/actions/libenigma_actions.a \ $(top_builddir)/lib/base/libenigma_base.a \ $(top_builddir)/lib/components/libenigma_components.a \ $(top_builddir)/lib/driver/libenigma_driver.a \ diff --git a/main/enigma.cpp b/main/enigma.cpp index b055619e..6bf0bb97 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -25,6 +25,8 @@ #include <lib/driver/rc.h> +#include <lib/actions/action.h> + #ifdef OBJECT_DEBUG int object_total_remaining; @@ -71,8 +73,11 @@ PSignal1<void,int> &keyPressedSignal() 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"); + python.execute("mytest", "__main__"); + // eApp->exec(); return 0; |