merge some code with enigma code

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 4f3287f57a0eeea26e1a955eed0d873262ad4399..217d71b6e77b41fce0950a23088fed3b08413c48 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,9 +10,7 @@
 
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
-#ifdef SDLDC
 #include <lib/gdi/sdl.h>
-#endif
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
@@ -145,7 +144,7 @@ int main(int argc, char **argv)
        gFBDC::getInstance(my_dc);
 #endif
 
-       fontRenderClass::getInstance()->AddFont("/usr/share/fonts/arial.ttf", "Arial", 100);
+       fontRenderClass::getInstance()->AddFont("/home/tmbinc/enigma2/fonts/arial.ttf", "Arial", 100);
 
        eWidgetDesktop dsk(eSize(720, 576));
        
@@ -162,7 +161,7 @@ int main(int argc, char **argv)
        } else
                dsk.setPalette(*m_pm);
 
-       dsk.setBackgroundColor(gRGB(0,0,0,0));
+       dsk.setBackgroundColor(gRGB(0,0,0,0xFF));
 #endif
 
                /* redrawing is done in an idle-timer, so we have to set the context */