X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b..94e20b4fa99280fc8fb0d7c4753286cefc32b114:/main/enigma.cpp diff --git a/main/enigma.cpp b/main/enigma.cpp index 6bf0bb97..e669b19b 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -1,3 +1,10 @@ +#undef WITH_SDL + +#ifdef WITH_SDL +#error +#define SDLDC +#endif + #include #include #include @@ -9,6 +16,12 @@ #include #include +#include + +#ifdef WITH_SDL +#error +#include +#endif #include #include @@ -27,6 +40,8 @@ #include +#include + #ifdef OBJECT_DEBUG int object_total_remaining; @@ -41,6 +56,7 @@ void dumpRegion(const gRegion ®ion) fprintf(stderr, "extends: %d %d -> %d %d (%d rects)\n", region.extends.left(), region.extends.top(), region.extends.right(), region.extends.bottom(), region.rects.size()); +#if 0 for (int y=0; y #include #include +#include +#include class eMain: public eApplication, public Object { @@ -93,9 +113,10 @@ class eMain: public eApplication, public Object ePtr m_mgr; ePtr m_dvbdb; - + ePtr m_locale_time_handler; ePtr m_scan; - + ePtr m_epgcache; + public: eMain() { @@ -104,7 +125,8 @@ public: /* TODO: put into init */ m_dvbdb = new eDVBDB(); m_mgr = new eDVBResourceManager(); - + m_locale_time_handler = new eDVBLocalTimeHandler(); + m_epgcache = new eEPGCache(); m_mgr->setChannelList(m_dvbdb); // m_scan = new eComponentScan(); @@ -114,12 +136,14 @@ public: ~eMain() { + m_dvbdb->save(); m_scan = 0; } }; /************************************************/ +eLabel *lcd_label, *lcd_clock; int main(int argc, char **argv) { @@ -130,40 +154,78 @@ int main(int argc, char **argv) ePython python; eMain main; + + int double_buffer = 0; #if 1 +#ifdef SDLDC + ePtr my_dc; + gSDLDC::getInstance(my_dc); +#else ePtr my_dc; gFBDC::getInstance(my_dc); - - 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); + 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)); + + if (double_buffer) + { + eDebug(" - double buffering found, enable buffered graphics mode."); + dsk.setCompositionMode(eWidgetDesktop::cmBuffered); + } wdsk = &dsk; - dsk.setBackgroundColor(gColor(0)); + lcddsk = &dsk_lcd; + dsk.setDC(my_dc); + dsk_lcd.setDC(my_lcd_dc); + + ePtr 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 */ 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)); @@ -171,7 +233,6 @@ int main(int argc, char **argv) python.execute("mytest", "__main__"); - // eApp->exec(); return 0; @@ -191,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); +}