git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
dd3c451
)
hack: clear LCD on shutdown until we have proper code for that
author
Felix Domke
<tmbinc@elitedvb.net>
Sat, 11 Mar 2006 02:02:48 +0000
(
02:02
+0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Sat, 11 Mar 2006 02:02:48 +0000
(
02:02
+0000)
main/enigma.cpp
patch
|
blob
|
history
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index 1260a10407c98eec482a724b81a09078dac38b2a..b40c5ee212372ca472a871b4712df6b36ee07530 100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-3,40
+3,35
@@
#endif
#include <stdio.h>
#endif
#include <stdio.h>
+#include <unistd.h>
#include <libsig_comp.h>
#include <libsig_comp.h>
+
+#include <lib/actions/action.h>
+#include <lib/driver/rc.h>
#include <lib/base/ebase.h>
#include <lib/base/eerror.h>
#include <lib/base/init.h>
#include <lib/base/init_num.h>
#include <lib/base/ebase.h>
#include <lib/base/eerror.h>
#include <lib/base/init.h>
#include <lib/base/init_num.h>
-
-#include <unistd.h>
-
-#include <lib/gdi/grc.h>
#include <lib/gdi/gfbdc.h>
#include <lib/gdi/glcddc.h>
#include <lib/gdi/gfbdc.h>
#include <lib/gdi/glcddc.h>
-
+#include <lib/gdi/grc.h>
#ifdef WITH_SDL
#include <lib/gdi/sdl.h>
#endif
#ifdef WITH_SDL
#include <lib/gdi/sdl.h>
#endif
+#include <lib/gdi/epng.h>
#include <lib/gdi/font.h>
#include <lib/gdi/font.h>
-
+#include <lib/gui/ebutton.h>
+#include <lib/gui/elabel.h>
+#include <lib/gui/elistboxcontent.h>
#include <lib/gui/ewidget.h>
#include <lib/gui/ewidgetdesktop.h>
#include <lib/gui/ewidget.h>
#include <lib/gui/ewidgetdesktop.h>
-#include <lib/gui/elabel.h>
-#include <lib/gui/ebutton.h>
-
#include <lib/gui/ewindow.h>
#include <lib/gui/ewindow.h>
-
-#include <lib/python/python.h>
#include <lib/python/connections.h>
#include <lib/python/connections.h>
+#include <lib/python/python.h>
-#include <lib/gui/elistboxcontent.h>
-
-#include <lib/driver/rc.h>
-
-#include <lib/actions/action.h>
-
-#include <lib/gdi/epng.h>
+#ifdef HAVE_GSTREAMER
+#include <gst/gst.h>
+#endif
#ifdef OBJECT_DEBUG
int object_total_remaining;
#ifdef OBJECT_DEBUG
int object_total_remaining;
@@
-143,6
+138,12
@@
int main(int argc, char **argv)
atexit(object_dump);
#endif
atexit(object_dump);
#endif
+#ifdef HAVE_GSTREAMER
+ gst_init(&argc, &argv);
+#else
+#error bla
+#endif
+
// set pythonpath if unset
setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
// set pythonpath if unset
setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
@@
-216,6
+217,13
@@
int main(int argc, char **argv)
dsk.paint();
dsk_lcd.paint();
dsk.paint();
dsk_lcd.paint();
+ {
+ gPainter p(my_lcd_dc);
+ p.resetClip(eRect(0, 0, 132, 64));
+ p.clear();
+ p.flush();
+ }
+
return exit_code;
}
return exit_code;
}