X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4bc08995411e21f3564f09e136809be68ddf96a8..ec6cfceaa66fc2243e08001178c70fb5db9fcc50:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 60bea8f5..258c5ad2 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,3 +1,4 @@
+#define SDLDC
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
@@ -9,6 +10,7 @@
 
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
+#include <lib/gdi/sdl.h>
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
@@ -25,6 +27,10 @@
 
 #include <lib/driver/rc.h>
 
+#include <lib/actions/action.h>
+
+#include <lib/gdi/epng.h>
+
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
@@ -71,74 +77,43 @@ PSignal1<void,int> &keyPressedSignal()
 
 void keyEvent(const eRCKey &key)
 {
-	if (!key.flags)
-		keyPressed(key.code);
+	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>
-#include <lib/dvb/isection.h>
-#include <lib/dvb/esection.h>
-#include <lib/dvb_si/pmt.h>
-#include <lib/dvb/scan.h>
-#include <unistd.h>
 
 class eMain: public eApplication, public Object
 {
 	eInit init;
 	
-	ePtr<eDVBScan> m_scan;
-
 	ePtr<eDVBResourceManager> m_mgr;
-	ePtr<iDVBChannel> m_channel;
 	ePtr<eDVBDB> m_dvbdb;
 
-	void scanEvent(int evt)
-	{
-		eDebug("scan event %d!", evt);
-		if (evt == eDVBScan::evtFinish)
-		{
-			m_scan->insertInto(m_dvbdb);
-			quit(0);
-		}
-	}
-	ePtr<eConnection> m_scan_event_connection;
+	ePtr<eComponentScan> m_scan;
+	
 public:
 	eMain()
 	{
 		init.setRunlevel(eAutoInitNumbers::main);
 
-#if 0
+				/* TODO: put into init */
 		m_dvbdb = new eDVBDB();
 		m_mgr = new eDVBResourceManager();
-
-		eDVBFrontendParametersSatellite fesat;
 		
-		fesat.frequency = 11817000; // 12070000;
-		fesat.symbol_rate = 27500000;
-		fesat.polarisation = eDVBFrontendParametersSatellite::Polarisation::Vertical;
-		fesat.fec = eDVBFrontendParametersSatellite::FEC::f3_4;
-		fesat.inversion = eDVBFrontendParametersSatellite::Inversion::Off;
-		fesat.orbital_position = 192;
-
-		eDVBFrontendParameters *fe = new eDVBFrontendParameters();
+		m_mgr->setChannelList(m_dvbdb);
 		
-		fe->setDVBS(fesat);
+//		m_scan = new eComponentScan();
+//		m_scan->start();
 
-		if (m_mgr->allocateRawChannel(m_channel))
-			eDebug("shit it failed!");
-
-		eDebug("starting scan...");
-		
-		std::list<ePtr<iDVBFrontendParameters> > list;
-		
-		list.push_back(fe);
-		
-		m_scan = new eDVBScan(m_channel);
-		m_scan->start(list);
-		m_scan->connectEvent(slot(*this, &eMain::scanEvent), m_scan_event_connection);
-#endif
 	}
 	
 	~eMain()
@@ -161,34 +136,32 @@ int main(int argc, char **argv)
 	eMain main;
 
 #if 1
+#ifdef SDLDC
+	ePtr<gSDLDC> my_dc;
+	gSDLDC::getInstance(my_dc);
+#else
 	ePtr<gFBDC> my_dc;
 	gFBDC::getInstance(my_dc);
+#endif
 
-	gPainter p(my_dc);
-	
-	gRGB pal[256];
-	pal[0] = 0;
-	pal[1] = 0xff00ff;
-	pal[2] = 0xffFFff;
-	pal[3] = 0x00ff00;
-	
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x10] = 0x111111 * a;
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x20] = (0x111100 * a) | 0xFF;
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x30] = (0x110011 * a) | 0xFF00;
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x40] = (0x001111 * a) | 0xFF0000;
-	p.setPalette(pal, 0, 256);
-
-	fontRenderClass::getInstance()->AddFont("/dbox2/cdkroot/share/fonts/arial.ttf", "Arial", 100);
+	fontRenderClass::getInstance()->AddFont("/home/tmbinc/enigma2/fonts/arial.ttf", "Arial", 100);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	
 	wdsk = &dsk;
-	dsk.setBackgroundColor(gColor(0));
+
+
 	dsk.setDC(my_dc);
+
+	ePtr<gPixmap> m_pm;
+	loadPNG(m_pm, "data/info-bg.png");
+	if (!m_pm)
+	{
+		eDebug("can't load info-bg :)");
+	} else
+		dsk.setPalette(*m_pm);
+
+	dsk.setBackgroundColor(gRGB(0,0,0,0));
 #endif
 
 		/* redrawing is done in an idle-timer, so we have to set the context */
@@ -197,6 +170,7 @@ int main(int argc, char **argv)
 	eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
 	
 	printf("executing main\n");
+
 	python.execute("mytest", "__main__");
 
 //	eApp->exec();
@@ -213,3 +187,8 @@ void runMainloop()
 {
 	eApp->exec();
 }
+
+void quitMainloop()
+{
+	eApp->quit(0);
+}