X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/87bfe5dfced0fb7a4e9839fdafa898261a39c86c..94e20b4fa99280fc8fb0d7c4753286cefc32b114:/main/enigma.cpp diff --git a/main/enigma.cpp b/main/enigma.cpp index a798b727..e669b19b 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -1,8 +1,10 @@ #undef WITH_SDL + #ifdef WITH_SDL #error #define SDLDC #endif + #include #include #include @@ -14,6 +16,8 @@ #include #include +#include + #ifdef WITH_SDL #error #include @@ -69,7 +73,7 @@ void dumpRegion(const gRegion ®ion) } -eWidgetDesktop *wdsk; +eWidgetDesktop *wdsk, *lcddsk; // typedef struct _object PyObject; @@ -132,12 +136,14 @@ public: ~eMain() { + m_dvbdb->save(); m_scan = 0; } }; /************************************************/ +eLabel *lcd_label, *lcd_clock; int main(int argc, char **argv) { @@ -148,6 +154,8 @@ int main(int argc, char **argv) ePython python; eMain main; + + int double_buffer = 0; #if 1 #ifdef SDLDC @@ -156,17 +164,29 @@ int main(int argc, char **argv) #else ePtr my_dc; gFBDC::getInstance(my_dc); + + double_buffer = my_dc->haveDoubleBuffering(); #endif + ePtr 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)); -// dsk.setCompositionMode(eWidgetDesktop::cmBuffered); + 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 m_pm; loadPNG(m_pm, "data/pal.png"); @@ -181,6 +201,31 @@ 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, 10)); + lcd_label->resize(eSize(132, 36)); + ePtr 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, 20)); + //ePtr clkfont = new gFont("Arial", 18); + lcd_clock->setFont(font); + + //lcd_label->setText("bla bla bla, this lcd\nSUCKS!"); + //lcd_clock->setText("88:88:88"); + + lcd_win->show(); eRCInput::getInstance()->keyEvent.connect(slot(keyEvent)); @@ -207,3 +252,13 @@ void quitMainloop() { eApp->quit(0); } + +void setLCD(const char *string) +{ + lcd_label->setText(string); +} + +void setLCDClock(const char *string) +{ + lcd_clock->setText(string); +}