X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ba02fb4aced5868d047a5bffbd2ed87583daee4d..54bd4123728628a6f77bad2584b70d1353a91666:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index d350f445..b055619e 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -19,6 +19,11 @@
 #include <lib/gui/ewindow.h>
 
 #include <lib/python/python.h>
+#include <lib/python/connections.h>
+
+#include <lib/gui/elistboxcontent.h>
+
+#include <lib/driver/rc.h>
 
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
@@ -28,11 +33,6 @@ void object_dump()
 	printf("%d items left\n", object_total_remaining);
 }
 #endif
-using namespace std;
-	void print(const string &str, const char *c)
-	{
-		printf("%s (%s)\n", str.c_str(), c);
-	}
 
 void dumpRegion(const gRegion &region)
 {
@@ -53,18 +53,68 @@ void dumpRegion(const gRegion &region)
 	}
 }
 
+eWidgetDesktop *wdsk;
+
+// typedef struct _object PyObject;
+
+void print(int i)
+{
+	printf("C++ says: it's a %d!!!\n", i);
+}
+
+PSignal1<void,int> keyPressed;
+
+PSignal1<void,int> &keyPressedSignal()
+{
+	return keyPressed;
+}
+
+void keyEvent(const eRCKey &key)
+{
+	if (!key.flags)
+		keyPressed(key.code);
+}
+
+/************************************************/
+#include <unistd.h>
+#include <lib/components/scan.h>
+#include <lib/dvb/idvb.h>
+#include <lib/dvb/dvb.h>
+#include <lib/dvb/db.h>
 
 class eMain: public eApplication, public Object
 {
 	eInit init;
+	
+	ePtr<eDVBResourceManager> m_mgr;
+	ePtr<eDVBDB> m_dvbdb;
+
+	ePtr<eComponentScan> m_scan;
+	
 public:
 	eMain()
 	{
 		init.setRunlevel(eAutoInitNumbers::main);
+
+				/* TODO: put into init */
+		m_dvbdb = new eDVBDB();
+		m_mgr = new eDVBResourceManager();
+		
+		m_mgr->setChannelList(m_dvbdb);
+		
+//		m_scan = new eComponentScan();
+//		m_scan->start();
+
+	}
+	
+	~eMain()
+	{
+		m_scan = 0;
 	}
 };
 
-eWidgetDesktop *wdsk;
+/************************************************/
+
 
 int main(int argc, char **argv)
 {
@@ -73,9 +123,10 @@ int main(int argc, char **argv)
 #endif
 
 
-#if 1
+	ePython python;
 	eMain main;
 
+#if 1
 	ePtr<gFBDC> my_dc;
 	gFBDC::getInstance(my_dc);
 
@@ -102,64 +153,19 @@ int main(int argc, char **argv)
 	eWidgetDesktop dsk(eSize(720, 576));
 	
 	wdsk = &dsk;
+	dsk.setBackgroundColor(gColor(0));
 	dsk.setDC(my_dc);
-
-	eWindow *wnd = new eWindow(&dsk);
-	wnd->move(ePoint(100, 100));
-	wnd->resize(eSize(200, 200));
-	wnd->show();
-
-	eLabel *label = new eButton(wnd);
-	label->setText("Hello!!");
-	label->move(ePoint(40, 40));
-	label->resize(eSize(100, 40));
-
-	label = new eButton(wnd);
-	label->setText("2nd!!");
-	label->move(ePoint(40, 90));
-	label->resize(eSize(100, 40));
-
-#if 0	
-	eWidget *bla2 = new eWidget(0);
-	dsk.addRootWidget(bla2, 0);
-	
-	bla2->move(ePoint(160, 160));
-	bla2->resize(eSize(200, 200));
-	bla2->show();
 #endif
 
-//	dsk.recalcClipRegions();
-//	dsk.paint();
-//	dsk.invalidate(gRegion(eRect(0, 0, 720, 576)));
-
-//	dumpRegion(wnd->m_visible_region);
-//	dumpRegion(label->m_visible_region);
-//	dumpRegion(label->m_visible_region);
+		/* redrawing is done in an idle-timer, so we have to set the context */
+	dsk.setRedrawTask(main);
 	
-	eDebug("painting!");
+	eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
 	
+	printf("executing main\n");
+	python.execute("mytest", "__main__");
 
-	ePython python;
-	
-	printf("about to execute TEST :)\n");
-	python.execute("mytest", "test");
-
-	sleep(2);
-#endif
-
-#if 0
-
-		// connections mit parametern: geht! :)
-	using namespace std;
-	using namespace SigC;
-
-	
-	Signal1<void,const string &> printer;
-	int i;
-	for (i=1; i<argc; ++i)
-		printer.connect(bind(slot(print), argv[i]));
-	printer("hello world\n");
-#endif
+//	eApp->exec();
 
 	return 0;
 }
@@ -169,3 +175,12 @@ eWidgetDesktop *getDesktop()
 	return wdsk;
 }
 
+void runMainloop()
+{
+	eApp->exec();
+}
+
+void quitMainloop()
+{
+	eApp->quit(0);
+}