diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2004-10-01 13:21:35 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2004-10-01 13:21:35 +0000 |
| commit | ddc3964ed95d01e72229dc9af968a327cd84e56c (patch) | |
| tree | 93e6694c639db3d188f5b2868f6b2b2951d21d60 /main | |
| parent | 1aeefd997cc362c3b37c1587c5f08891b35c3a75 (diff) | |
| download | enigma2-ddc3964ed95d01e72229dc9af968a327cd84e56c.tar.gz enigma2-ddc3964ed95d01e72229dc9af968a327cd84e56c.zip | |
- add python, missing gui
- remove console (needs to be rewritten anyway)
- eString -> std::string
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile.am | 3 | ||||
| -rw-r--r-- | main/enigma-playlist.cpp | 2 | ||||
| -rw-r--r-- | main/enigma.cpp | 16 |
3 files changed, 17 insertions, 4 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index ff99797d..6b0fb416 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -14,6 +14,7 @@ enigma2_LDADD_WHOLE = \ $(top_builddir)/lib/dvb_si/libenigma_dvb_si.a \ $(top_builddir)/lib/gdi/libenigma_gdi.a \ $(top_builddir)/lib/gui/libenigma_gui.a \ + $(top_builddir)/lib/python/libenigma_python.a \ $(top_builddir)/lib/nav/libenigma_nav.a \ $(top_builddir)/lib/network/libenigma_network.a \ $(top_builddir)/lib/service/libenigma_service.a @@ -25,7 +26,7 @@ enigma2_LDADD = \ @MAD_LIBS@ \ @PNG_LIBS@ \ @SIGC_LIBS@ \ - -ldl -lpthread -lcrypt -lresolv + -ldl -lpthread -lcrypt -lresolv -lpython2.3 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE) @rm -f enigma2$(EXEEXT) diff --git a/main/enigma-playlist.cpp b/main/enigma-playlist.cpp index 43dcb1d9..bafefe9a 100644 --- a/main/enigma-playlist.cpp +++ b/main/enigma-playlist.cpp @@ -112,7 +112,7 @@ public: eDebug("failed to get iserviceinformation"); break; } - eString name; + std::string name; m_serviceInformation->getName(name); eDebug("NEW running service: %s", name.c_str()); break; diff --git a/main/enigma.cpp b/main/enigma.cpp index dd9084a2..81391c32 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -17,6 +17,8 @@ #include <lib/gui/ewindow.h> +#include <lib/python/python.h> + #ifdef OBJECT_DEBUG int object_total_remaining; @@ -50,10 +52,12 @@ int main() #ifdef OBJECT_DEBUG atexit(object_dump); #endif - eInit init; - + init.setRunlevel(eAutoInitNumbers::main); + + // gui stuff +#if 0 ePtr<gFBDC> my_dc; gFBDC::getInstance(my_dc); #if 1 @@ -164,5 +168,13 @@ int main() // dumpRegion(dsk.m_dirty_region); dsk.paint(); + +#endif + + ePython python; + + printf("about to execute TEST :)\n"); + python.execute("mytest", "test"); + return 0; } |