parseactions: fix for unnamed enums

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index f81a3c28f7ddf0a0f4ee870464599b8daa6c249b..0d1ce6ec788b860cfd58c08acbbda84efe10d36f 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,8 +1,10 @@
 #undef WITH_SDL
+
 #ifdef WITH_SDL
 #error
 #define SDLDC
 #endif
+
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
@@ -14,6 +16,8 @@
 
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
+#include <lib/gdi/glcddc.h>
+
 #ifdef WITH_SDL
 #error
 #include <lib/gdi/sdl.h>
@@ -69,7 +73,7 @@ void dumpRegion(const gRegion &region)
 
 }
 
-eWidgetDesktop *wdsk;
+eWidgetDesktop *wdsk, *lcddsk;
 
 // typedef struct _object PyObject;
 
@@ -132,12 +136,16 @@ public:
        
        ~eMain()
        {
+               m_dvbdb->save();
                m_scan = 0;
        }
 };
 
 /************************************************/
 
+eLabel *lcd_label, *lcd_clock;
+
+int exit_code;
 
 int main(int argc, char **argv)
 {
@@ -145,6 +153,10 @@ int main(int argc, char **argv)
        atexit(object_dump);
 #endif
 
+       // set pythonpath if unset
+       setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
+       printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
+
 
        ePython python;
        eMain main;
@@ -162,25 +174,31 @@ int main(int argc, char **argv)
        double_buffer = my_dc->haveDoubleBuffering();
 #endif
 
+       ePtr<gLCDDC> my_lcd_dc;
+       gLCDDC::getInstance(my_lcd_dc);
+
        fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
 
        eWidgetDesktop dsk(eSize(720, 576));
+       eWidgetDesktop dsk_lcd(eSize(132, 64));
        
-       if (double_buffer)
+/*     if (double_buffer)
        {
                eDebug(" - double buffering found, enable buffered graphics mode.");
                dsk.setCompositionMode(eWidgetDesktop::cmBuffered);
-       }
+       } */
        
        wdsk = &dsk;
+       lcddsk = &dsk_lcd;
 
        dsk.setDC(my_dc);
+       dsk_lcd.setDC(my_lcd_dc);
 
        ePtr<gPixmap> m_pm;
-       loadPNG(m_pm, "data/pal.png");
+       loadPNG(m_pm, DATADIR "/enigma2/pal.png");
        if (!m_pm)
        {
-               eFatal("hi ghost, please copy pal.png into your ./data, thanks!");
+               eFatal("pal.png not found!");
        } else
                dsk.setPalette(*m_pm);
 
@@ -189,6 +207,32 @@ int main(int argc, char **argv)
 
                /* redrawing is done in an idle-timer, so we have to set the context */
        dsk.setRedrawTask(main);
+       dsk_lcd.setRedrawTask(main);
+
+       eWindow *lcd_win = new eWindow(&dsk_lcd);
+       
+       lcd_win->setFlag(eWindow::wfNoBorder);
+       
+       lcd_win->move(ePoint(0, 0));
+       lcd_win->resize(eSize(132, 64));
+       
+       lcd_label = new eLabel(lcd_win);
+       lcd_label->move(ePoint(0, 4));
+       lcd_label->resize(eSize(132, 42));
+       ePtr<gFont> font = new gFont("Arial", 19);
+       //ePtr<gFont> font = new gFont("Arial", 16);
+       lcd_label->setFont(font);
+
+       lcd_clock = new eLabel(lcd_win);
+       lcd_clock->move(ePoint(50, 46));
+       lcd_clock->resize(eSize(132, 18));
+       ePtr<gFont> clkfont = new gFont("Arial", 16);
+       lcd_clock->setFont(clkfont);
+
+       //lcd_label->setText("bla bla bla, this lcd\nSUCKS!");
+       //lcd_clock->setText("88:88:88");
+
+       lcd_win->show();
        
        eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
        
@@ -198,7 +242,7 @@ int main(int argc, char **argv)
 
 //     eApp->exec();
 
-       return 0;
+       return exit_code;
 }
 
 eWidgetDesktop *getDesktop()
@@ -208,10 +252,20 @@ eWidgetDesktop *getDesktop()
 
 void runMainloop()
 {
-       eApp->exec();
+       exit_code = eApp->exec();
+}
+
+void quitMainloop(int exitCode)
+{
+       eApp->quit(exitCode);
+}
+
+void setLCD(const char *string)
+{
+       lcd_label->setText(string);
 }
 
-void quitMainloop()
+void setLCDClock(const char *string)
 {
-       eApp->quit(0);
+       lcd_clock->setText(string);
 }