add dvb time handling with transponder time correction algo.. this use a rtc, when...

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 6bf0bb9759e711a7a910859862de8f8542bcd308..21c1d30a68ef471588c0db2c5f6ee31a767ca831 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>
@@ -27,6 +29,8 @@
 
 #include <lib/actions/action.h>
 
+#include <lib/gdi/epng.h>
+
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
@@ -86,6 +90,7 @@ void keyEvent(const eRCKey &key)
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/db.h>
+#include <lib/dvb/dvbtime.h>
 
 class eMain: public eApplication, public Object
 {
@@ -93,9 +98,9 @@ class eMain: public eApplication, public Object
        
        ePtr<eDVBResourceManager> m_mgr;
        ePtr<eDVBDB> m_dvbdb;
-
+       ePtr<eDVBLocalTimeHandler> m_locale_time_handler;
        ePtr<eComponentScan> m_scan;
-       
+
 public:
        eMain()
        {
@@ -104,7 +109,7 @@ public:
                                /* TODO: put into init */
                m_dvbdb = new eDVBDB();
                m_mgr = new eDVBResourceManager();
-               
+               m_locale_time_handler = new eDVBLocalTimeHandler();
                m_mgr->setChannelList(m_dvbdb);
                
 //             m_scan = new eComponentScan();
@@ -132,34 +137,32 @@ int main(int argc, char **argv)
        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);
-       
-       gRGB pal[256];
-       pal[0] = 0;
-       pal[1] = 0xff00ff;
-       pal[2] = 0xffFFff;
-       pal[3] = 0x00ff00;
-       
-       for (int a=0; a<0x10; ++a)
-               pal[a | 0x10] = 0x111111 * a;
-       for (int a=0; a<0x10; ++a)
-               pal[a | 0x20] = (0x111100 * a) | 0xFF;
-       for (int a=0; a<0x10; ++a)
-               pal[a | 0x30] = (0x110011 * a) | 0xFF00;
-       for (int a=0; a<0x10; ++a)
-               pal[a | 0x40] = (0x001111 * a) | 0xFF0000;
-       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);
+
+       ePtr<gPixmap> m_pm;
+       loadPNG(m_pm, "data/pal.png");
+       if (!m_pm)
+       {
+               eFatal("hi ghost, please copy pal.png into your ./data, thanks!");
+       } else
+               dsk.setPalette(*m_pm);
+
+       dsk.setBackgroundColor(gRGB(0,0,0,0xFF));
 #endif
 
                /* redrawing is done in an idle-timer, so we have to set the context */
@@ -171,7 +174,6 @@ int main(int argc, char **argv)
 
        python.execute("mytest", "__main__");
 
-
 //     eApp->exec();
 
        return 0;