git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
return of void function should not return a value
[enigma2.git]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index 4f538e46fd70bd844cf92aa31c7ca3bbadab1b1b..a3770b863448ba95ab581767a113e9123c8ca720 100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-128,15
+128,11
@@
public:
m_locale_time_handler = new eDVBLocalTimeHandler();
m_epgcache = new eEPGCache();
m_mgr->setChannelList(m_dvbdb);
m_locale_time_handler = new eDVBLocalTimeHandler();
m_epgcache = new eEPGCache();
m_mgr->setChannelList(m_dvbdb);
-
-// m_scan = new eComponentScan();
-// m_scan->start();
-
}
~eMain()
{
}
~eMain()
{
- m_dvbdb->save();
+ m_dvbdb->save
Servicelist
();
m_scan = 0;
}
};
m_scan = 0;
}
};
@@
-177,7
+173,7
@@
int main(int argc, char **argv)
ePtr<gLCDDC> my_lcd_dc;
gLCDDC::getInstance(my_lcd_dc);
ePtr<gLCDDC> my_lcd_dc;
gLCDDC::getInstance(my_lcd_dc);
- fontRenderClass::getInstance()->AddFont(FONTDIR "/
arial
.ttf", "Regular", 100);
+ fontRenderClass::getInstance()->AddFont(FONTDIR "/
md_khmurabi_10
.ttf", "Regular", 100);
eWidgetDesktop dsk(eSize(720, 576));
eWidgetDesktop dsk_lcd(eSize(132, 64));
eWidgetDesktop dsk(eSize(720, 576));
eWidgetDesktop dsk_lcd(eSize(132, 64));
@@
-240,8
+236,6
@@
int main(int argc, char **argv)
python.execute("mytest", "__main__");
python.execute("mytest", "__main__");
-// eApp->exec();
-
return exit_code;
}
return exit_code;
}
@@
-250,9
+244,14
@@
eWidgetDesktop *getDesktop()
return wdsk;
}
return wdsk;
}
+eApplication *getApplication()
+{
+ return eApp;
+}
+
void runMainloop()
{
void runMainloop()
{
- exit_code = eApp->
exec
();
+ exit_code = eApp->
runLoop
();
}
void quitMainloop(int exitCode)
}
void quitMainloop(int exitCode)