X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4c9d04cb33fb06dfa075b431e36e7ea938a5f963..1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 92982e5b..6bf0bb97 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -21,6 +21,12 @@
 #include <lib/python/python.h>
 #include <lib/python/connections.h>
 
+#include <lib/gui/elistboxcontent.h>
+
+#include <lib/driver/rc.h>
+
+#include <lib/actions/action.h>
+
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
@@ -49,25 +55,71 @@ 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)
+{
+	ePtr<eActionMap> ptr;
+	eActionMap::getInstance(ptr);
+	ptr->keyPressed(0, key.code, key.flags);
+//	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;
+/************************************************/
 
-// typedef struct _object PyObject;
-
-void print(int i)
-{
-	printf("C++ says: it's a %d!!!\n", i);
-}
 
 int main(int argc, char **argv)
 {
@@ -76,9 +128,10 @@ int main(int argc, char **argv)
 #endif
 
 
-#if 1
+	ePython python;
 	eMain main;
 
+#if 1
 	ePtr<gFBDC> my_dc;
 	gFBDC::getInstance(my_dc);
 
@@ -112,11 +165,15 @@ int main(int argc, char **argv)
 		/* redrawing is done in an idle-timer, so we have to set the context */
 	dsk.setRedrawTask(main);
 	
-	ePython python;
+	eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
 	
 	printf("executing main\n");
+
 	python.execute("mytest", "__main__");
 
+
+//	eApp->exec();
+
 	return 0;
 }
 
@@ -129,3 +186,8 @@ void runMainloop()
 {
 	eApp->exec();
 }
+
+void quitMainloop()
+{
+	eApp->quit(0);
+}