X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2334840aabb952e3b6ee5cc60c368f7f2884d9dd..7c8c5bc3e04718569b1b848d252d515b81545130:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 3102c20a..a370d55c 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -3,40 +3,35 @@
 #endif
 
 #include <stdio.h>
+#include <unistd.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 <unistd.h>
-
-#include <lib/gdi/grc.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
+#include <lib/gdi/epng.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/elabel.h>
-#include <lib/gui/ebutton.h>
-
 #include <lib/gui/ewindow.h>
-
-#include <lib/python/python.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;
@@ -135,8 +130,6 @@ public:
 
 /************************************************/
 
-eLabel *lcd_label, *lcd_clock;
-
 int exit_code;
 
 int main(int argc, char **argv)
@@ -145,6 +138,10 @@ int main(int argc, char **argv)
 	atexit(object_dump);
 #endif
 
+#ifdef HAVE_GSTREAMER
+	gst_init(&argc, &argv);
+#endif
+
 	// set pythonpath if unset
 	setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
 	printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
@@ -209,48 +206,28 @@ int main(int argc, char **argv)
 	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("Regular", 19);
-	//ePtr<gFont> font = new gFont("Regular", 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("Regular", 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));
 	
 	printf("executing main\n");
 
 	python.execute("mytest", "__main__");
 	
-	lcd_win->hide();
-	
 	dsk.paint();
 	dsk_lcd.paint();
 
+	{
+		gPainter p(my_lcd_dc);
+		p.resetClip(eRect(0, 0, 132, 64));
+		p.clear();
+		p.flush();
+	}
+
 	return exit_code;
 }
 
-eWidgetDesktop *getDesktop()
+eWidgetDesktop *getDesktop(int which)
 {
-	return wdsk;
+	return which ? lcddsk : wdsk;
 }
 
 eApplication *getApplication()
@@ -271,10 +248,8 @@ void quitMainloop(int exitCode)
 
 void setLCD(const char *string)
 {
-	lcd_label->setText(string);
 }
 
 void setLCDClock(const char *string)
 {
-	lcd_clock->setText(string);
 }