Merge branch 'bug_668_segfault_on_e2_restart_with_running_record_timer'

[enigma2.git] / main / enigma-gdi.cpp

diff --git a/main/enigma-gdi.cpp b/main/enigma-gdi.cpp
index 144e2d3a658ff02b81a94c839309c2732dd3442b..f21c8701e96bfcfc6b8937caedbb54376d223218 100644 (file)
--- a/main/enigma-gdi.cpp
+++ b/main/enigma-gdi.cpp
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>

+#include <lib/base/eenv.h>

 #include <lib/base/eerror.h>
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 #include <lib/base/eerror.h>
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>


@@ -8,7 +9,7 @@
 #include <unistd.h>
 
 #include <lib/gdi/grc.h>
 #include <unistd.h>
 
 #include <lib/gdi/grc.h>

-#include <lib/gdi/gfbdc.h>
+#include <lib/gdi/gmaindc.h>

 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>


@@ -52,8 +53,8 @@ int main()
        eInit init;
 
        init.setRunlevel(eAutoInitNumbers::main);
        eInit init;
 
        init.setRunlevel(eAutoInitNumbers::main);

-       ePtr<gFBDC> my_dc;
-       gFBDC::getInstance(my_dc);
+       ePtr<gMainDC> my_dc;
+       gMainDC::getInstance(my_dc);

 
        gPainter p(my_dc);
        
 
        gPainter p(my_dc);
        


@@ -67,7 +68,7 @@ int main()
                pal[a | 0x10] = (0x111111 * a) | 0xFF;
        p.setPalette(pal, 0, 256);
 
                pal[a | 0x10] = (0x111111 * a) | 0xFF;
        p.setPalette(pal, 0, 256);
 

-       fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Regular", 100);
+       fontRenderClass::getInstance()->AddFont(eEnv::resolve("${datadir}/fonts/arial.ttf"), "Regular", 100);

 
        p.resetClip(gRegion(eRect(0, 0, 720, 576)));
        
 
        p.resetClip(gRegion(eRect(0, 0, 720, 576)));