From 4bc08995411e21f3564f09e136809be68ddf96a8 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Mon, 31 Jan 2005 22:51:14 +0000 Subject: - fixed dvb scan - fixed dvbdb (reading/writing lamedb) - fixed (i.e. disallow) operator= in iObject (destroyed refcounts before) - implemented listboxcontent for servicelists - implemented getServiceInformation for non-playing services (still not happy with the result, though) - implemented first try of serviceSelector component --- main/enigma.cpp | 95 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 81 insertions(+), 14 deletions(-) (limited to 'main/enigma.cpp') diff --git a/main/enigma.cpp b/main/enigma.cpp index df28bcd7..60bea8f5 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -21,6 +21,8 @@ #include #include +#include + #include #ifdef OBJECT_DEBUG @@ -51,17 +53,6 @@ void dumpRegion(const gRegion ®ion) } } - -class eMain: public eApplication, public Object -{ - eInit init; -public: - eMain() - { - init.setRunlevel(eAutoInitNumbers::main); - } -}; - eWidgetDesktop *wdsk; // typedef struct _object PyObject; @@ -84,6 +75,81 @@ void keyEvent(const eRCKey &key) keyPressed(key.code); } +/************************************************/ +#include +#include +#include +#include +#include +#include +#include + +class eMain: public eApplication, public Object +{ + eInit init; + + ePtr m_scan; + + ePtr m_mgr; + ePtr m_channel; + ePtr m_dvbdb; + + void scanEvent(int evt) + { + eDebug("scan event %d!", evt); + if (evt == eDVBScan::evtFinish) + { + m_scan->insertInto(m_dvbdb); + quit(0); + } + } + ePtr m_scan_event_connection; +public: + eMain() + { + init.setRunlevel(eAutoInitNumbers::main); + +#if 0 + 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(); + + fe->setDVBS(fesat); + + if (m_mgr->allocateRawChannel(m_channel)) + eDebug("shit it failed!"); + + eDebug("starting scan..."); + + std::list > 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() + { + m_scan = 0; + } +}; + +/************************************************/ + + int main(int argc, char **argv) { #ifdef OBJECT_DEBUG @@ -91,9 +157,10 @@ int main(int argc, char **argv) #endif -#if 1 + ePython python; eMain main; +#if 1 ePtr my_dc; gFBDC::getInstance(my_dc); @@ -129,11 +196,11 @@ int main(int argc, char **argv) eRCInput::getInstance()->keyEvent.connect(slot(keyEvent)); - ePython python; - printf("executing main\n"); python.execute("mytest", "__main__"); +// eApp->exec(); + return 0; } -- cgit v1.2.3