git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show 'disabled' for disabled timers, instead of 'done'
[enigma2.git]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index 8a5dfa8c50e6708906c90d414803a4265c6ebbf5..631a3fb25561c4d56ae2430546b0080bab2ba64e 100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-99,19
+99,17
@@
void keyEvent(const eRCKey &key)
class eMain: public eApplication, public Object
{
eInit init;
class eMain: public eApplication, public Object
{
eInit init;
-
- ePtr<eDVBResourceManager> m_mgr;
+
ePtr<eDVBDB> m_dvbdb;
ePtr<eDVBDB> m_dvbdb;
+ ePtr<eDVBResourceManager> m_mgr;
ePtr<eDVBLocalTimeHandler> m_locale_time_handler;
ePtr<eDVBLocalTimeHandler> m_locale_time_handler;
- ePtr<eComponentScan> m_scan;
ePtr<eEPGCache> m_epgcache;
public:
eMain()
{
init.setRunlevel(eAutoInitNumbers::main);
ePtr<eEPGCache> m_epgcache;
public:
eMain()
{
init.setRunlevel(eAutoInitNumbers::main);
-
- /* TODO: put into init */
+ /* TODO: put into init */
m_dvbdb = new eDVBDB();
m_mgr = new eDVBResourceManager();
m_locale_time_handler = new eDVBLocalTimeHandler();
m_dvbdb = new eDVBDB();
m_mgr = new eDVBResourceManager();
m_locale_time_handler = new eDVBLocalTimeHandler();
@@
-122,7
+120,7
@@
public:
~eMain()
{
m_dvbdb->saveServicelist();
~eMain()
{
m_dvbdb->saveServicelist();
- m_
scan = 0
;
+ m_
mgr->releaseCachedChannel()
;
}
};
}
};
@@
-150,7
+148,7
@@
int main(int argc, char **argv)
ePython python;
eMain main;
ePython python;
eMain main;
-
+
#if 1
#ifdef SDLDC
ePtr<gSDLDC> my_dc;
#if 1
#ifdef SDLDC
ePtr<gSDLDC> my_dc;
@@
-231,6
+229,8
@@
int main(int argc, char **argv)
}
if (i)
my_dc->setSpinner(eRect(ePoint(100, 100), wait[0]->size()), wait, i);
}
if (i)
my_dc->setSpinner(eRect(ePoint(100, 100), wait[0]->size()), wait, i);
+ else
+ my_dc->setSpinner(eRect(100, 100, 0, 0), wait, 1);
}
gRC::getInstance()->setSpinnerDC(my_dc);
}
gRC::getInstance()->setSpinnerDC(my_dc);
@@
-281,3
+281,16
@@
void quitMainloop(int exitCode)
exit_code = exitCode;
eApp->quit(0);
}
exit_code = exitCode;
eApp->quit(0);
}
+
+#include "version.h"
+
+const char *getEnigmaVersionString()
+{
+ return
+#ifdef ENIGMA2_CHECKOUT_TAG
+ ENIGMA2_CHECKOUT_TAG
+#else
+ "HEAD"
+#endif
+ "-" __DATE__;
+}