- sdl is now default output

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index faff4d89be2bb865bcaf1681dfabbc5c4a68f77e..222bdebc3526ad9e9c769057fc77e316dcd838df 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,3 +1,4 @@
+#define SDLDC
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
@@ -9,6 +10,7 @@
 
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
+#include <lib/gdi/sdl.h>
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
@@ -21,6 +23,12 @@
 #include <lib/python/python.h>
 #include <lib/python/connections.h>
 
+#include <lib/gui/elistboxcontent.h>
+
+#include <lib/driver/rc.h>
+
+#include <lib/actions/action.h>
+
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
@@ -49,25 +57,71 @@ void dumpRegion(const gRegion &region)
        }
 }
 
+eWidgetDesktop *wdsk;
+
+// typedef struct _object PyObject;
+
+void print(int i)
+{
+       printf("C++ says: it's a %d!!!\n", i);
+}
+
+PSignal1<void,int> keyPressed;
+
+PSignal1<void,int> &keyPressedSignal()
+{
+       return keyPressed;
+}
+
+void keyEvent(const eRCKey &key)
+{
+       ePtr<eActionMap> ptr;
+       eActionMap::getInstance(ptr);
+       ptr->keyPressed(0, key.code, key.flags);
+//     if (!key.flags)
+//             keyPressed(key.code);
+}
+
+/************************************************/
+#include <unistd.h>
+#include <lib/components/scan.h>
+#include <lib/dvb/idvb.h>
+#include <lib/dvb/dvb.h>
+#include <lib/dvb/db.h>
 
 class eMain: public eApplication, public Object
 {
        eInit init;
+       
+       ePtr<eDVBResourceManager> m_mgr;
+       ePtr<eDVBDB> m_dvbdb;
+
+       ePtr<eComponentScan> m_scan;
+       
 public:
        eMain()
        {
                init.setRunlevel(eAutoInitNumbers::main);
+
+                               /* TODO: put into init */
+               m_dvbdb = new eDVBDB();
+               m_mgr = new eDVBResourceManager();
+               
+               m_mgr->setChannelList(m_dvbdb);
+               
+//             m_scan = new eComponentScan();
+//             m_scan->start();
+
+       }
+       
+       ~eMain()
+       {
+               m_scan = 0;
        }
 };
 
-eWidgetDesktop *wdsk;
-
-// typedef struct _object PyObject;
+/************************************************/
 
-void print(int i)
-{
-       printf("C++ says: it's a %d!!!\n", i);
-}
 
 int main(int argc, char **argv)
 {
@@ -76,11 +130,17 @@ int main(int argc, char **argv)
 #endif
 
 
-#if 1
+       ePython python;
        eMain main;
 
+#if 1
+#ifdef SDLDC
+       ePtr<gSDLDC> my_dc;
+       gSDLDC::getInstance(my_dc);
+#else
        ePtr<gFBDC> my_dc;
        gFBDC::getInstance(my_dc);
+#endif
 
        gPainter p(my_dc);
        
@@ -98,24 +158,33 @@ int main(int argc, char **argv)
                pal[a | 0x30] = (0x110011 * a) | 0xFF00;
        for (int a=0; a<0x10; ++a)
                pal[a | 0x40] = (0x001111 * a) | 0xFF0000;
+       
+       pal[0x50] = 0x586D88;
+       pal[0x51] = 0x4075a7;
+       
        p.setPalette(pal, 0, 256);
 
-       fontRenderClass::getInstance()->AddFont("/dbox2/cdkroot/share/fonts/arial.ttf", "Arial", 100);
+       fontRenderClass::getInstance()->AddFont("/home/tmbinc/enigma2/fonts/arial.ttf", "Arial", 100);
 
        eWidgetDesktop dsk(eSize(720, 576));
        
        wdsk = &dsk;
+       dsk.setBackgroundColor(gColor(0));
        dsk.setDC(my_dc);
 #endif
 
                /* redrawing is done in an idle-timer, so we have to set the context */
        dsk.setRedrawTask(main);
        
-       ePython python;
+       eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
        
        printf("executing main\n");
+
        python.execute("mytest", "__main__");
 
+
+//     eApp->exec();
+
        return 0;
 }
 
@@ -128,3 +197,8 @@ void runMainloop()
 {
        eApp->exec();
 }
+
+void quitMainloop()
+{
+       eApp->quit(0);
+}