X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2Fenigma.cpp;h=b8554d582c1b72f6788002509a36ae3c6a4f698d;hp=7f3ba44ba303517d608a499e9ae756261f3ffca5;hb=9ec5fc545cfff7addbfd5b50ee9d6d60ab419e0d;hpb=4ea054ce5a814666d8d7af7f9951ffb783820889 diff --git a/main/enigma.cpp b/main/enigma.cpp index 7f3ba44..b8554d5 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -172,11 +172,11 @@ int main(int argc, char **argv) eTextPara::forceReplacementGlyph(i); eWidgetDesktop dsk(eSize(720, 576)); - eWidgetDesktop dsk_lcd(eSize(132, 64)); - + eWidgetDesktop dsk_lcd(my_lcd_dc->size()); + dsk.setStyleID(0); - dsk_lcd.setStyleID(1); - + dsk_lcd.setStyleID(my_lcd_dc->size().width() == 96 ? 2 : 1); + /* if (double_buffer) { eDebug(" - double buffering found, enable buffered graphics mode."); @@ -245,6 +245,9 @@ int main(int argc, char **argv) // python.execute("mytest", "__main__"); python.execFile("/usr/lib/enigma2/python/mytest.py"); + extern void setFullsize(); // definend in lib/gui/evideo.cpp + setFullsize(); + if (exit_code == 5) /* python crash */ { eDebug("(exit code 5)"); @@ -306,14 +309,21 @@ void quitMainloop(int exitCode) const char *getEnigmaVersionString() { - return -#ifdef ENIGMA2_CHECKOUT_TAG - ENIGMA2_CHECKOUT_TAG + std::string date = +#ifdef ENIGMA2_LAST_CHANGE_DATE + ENIGMA2_LAST_CHANGE_DATE; +#else + __DATE__; +#endif + std::string branch = +#ifdef ENIGMA2_BRANCH + ENIGMA2_BRANCH; #else - "HEAD" + "HEAD"; #endif - "-" __DATE__; + return std::string(date + '-' + branch).c_str(); } + #include void dump_malloc_stats(void)