- fixed filter source (not yet fully implemented anyway)

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 60bea8f544e4026e21222998cdc5eaf649b21aeb..6bf0bb9759e711a7a910859862de8f8542bcd308 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -25,6 +25,8 @@
 
 #include <lib/driver/rc.h>
 
+#include <lib/actions/action.h>
+
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
@@ -71,74 +73,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()
@@ -197,8 +168,10 @@ int main(int argc, char **argv)
        eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
        
        printf("executing main\n");
+
        python.execute("mytest", "__main__");
 
+
 //     eApp->exec();
 
        return 0;
@@ -213,3 +186,8 @@ void runMainloop()
 {
        eApp->exec();
 }
+
+void quitMainloop()
+{
+       eApp->quit(0);
+}