diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2005-02-10 23:42:22 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2005-02-10 23:42:22 +0000 |
| commit | d7d291938c45893e28715fb12ae5b83d334084e9 (patch) | |
| tree | 56aefc1b03a6ce7e26e6f749aeac8992659c74cf /lib | |
| parent | 4953676fb9df2347981b4f3ddb17a4d725197b31 (diff) | |
| download | enigma2-d7d291938c45893e28715fb12ae5b83d334084e9.tar.gz enigma2-d7d291938c45893e28715fb12ae5b83d334084e9.zip | |
- add "getCurrent" to service listbox
- add python wrapper for navigation core
- use nav core - you can zap now :)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/nav/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/python/enigma_python.i | 3 | ||||
| -rw-r--r-- | lib/service/listboxservice.cpp | 8 | ||||
| -rw-r--r-- | lib/service/listboxservice.h | 1 |
4 files changed, 14 insertions, 1 deletions
diff --git a/lib/nav/Makefile.am b/lib/nav/Makefile.am index 90603693..02dbd961 100644 --- a/lib/nav/Makefile.am +++ b/lib/nav/Makefile.am @@ -4,5 +4,6 @@ INCLUDES = \ noinst_LIBRARIES = libenigma_nav.a libenigma_nav_a_SOURCES = \ - core.cpp playlist.cpp + core.cpp playlist.cpp pcore.cpp + diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index 270dd7f4..3562c3e9 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -60,6 +60,7 @@ is usually caused by not marking PSignals as immutable. #include <lib/gui/elistboxcontent.h> #include <lib/service/listboxservice.h> #include <lib/components/scan.h> +#include <lib/nav/pcore.h> extern void runMainloop(); extern void quitMainloop(); @@ -85,6 +86,7 @@ RefCount(eComponentScan) // TODO: embed these... %immutable eButton::selected; %immutable eComponentScan::statusChanged; +%immutable pNavigation::event; %include <lib/gdi/epoint.h> %include <lib/gdi/erect.h> @@ -100,6 +102,7 @@ RefCount(eComponentScan) %include <lib/gui/elistboxcontent.h> %include <lib/service/listboxservice.h> %include <lib/components/scan.h> +%include <lib/nav/pcore.h> template<class R> class PSignal0 { diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp index 011c96ca..881047df 100644 --- a/lib/service/listboxservice.cpp +++ b/lib/service/listboxservice.cpp @@ -18,6 +18,14 @@ void eListboxServiceContent::setRoot(const eServiceReference &root) cursorHome(); } +void eListboxServiceContent::getCurrent(eServiceReference &ref) +{ + if (cursorValid()) + ref = *m_cursor; + else + ref = eServiceReference(); +} + DEFINE_REF(eListboxServiceContent); eListboxServiceContent::eListboxServiceContent() diff --git a/lib/service/listboxservice.h b/lib/service/listboxservice.h index 45e5ba71..9d0cb721 100644 --- a/lib/service/listboxservice.h +++ b/lib/service/listboxservice.h @@ -12,6 +12,7 @@ class eListboxServiceContent: public virtual iListboxContent public: eListboxServiceContent(); void setRoot(const eServiceReference &ref); + void getCurrent(eServiceReference &ref); protected: void cursorHome(); |