mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino.cpp: delete things under ifdef EXIT_CLEANUP

Browse Source
This commit is contained in:
[CST] Focus
2012-05-03 17:31:59 +04:00
parent 94b58852bf
commit c39c9a44a8
1 changed files with 69 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/neutrino.cpp
View File

@@ -129,7 +129,7 @@ bool autoshift = false;
uint32_t scrambled_timer; uint32_t scrambled_timer;
t_channel_id standby_channel_id; t_channel_id standby_channel_id;
static CProgressBar *g_volscale; //static CProgressBar *g_volscale;
//NEW //NEW
static pthread_t timer_thread; static pthread_t timer_thread;
void * timerd_main_thread(void *data); void * timerd_main_thread(void *data);
@@ -1890,7 +1890,7 @@ TIMER_START();
int dx, dy; int dx, dy;
frameBuffer->getIconSize(NEUTRINO_ICON_VOLUME, &dx, &dy); frameBuffer->getIconSize(NEUTRINO_ICON_VOLUME, &dx, &dy);
g_volscale = new CProgressBar(true, dy * 125 / 10, dy, 50, 100, 80, true); //g_volscale = new CProgressBar(true, dy * 125 / 10, dy, 50, 100, 80, true);
g_CamHandler = new CCAMMenuHandler(); g_CamHandler = new CCAMMenuHandler();
g_CamHandler->init(); g_CamHandler->init();
@@ -3067,28 +3067,82 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
} }
#endif #endif
} else { } else {
if (g_RCInput != NULL) delete g_RCInput;
delete g_RCInput;
//fan speed //fan speed
if (g_info.has_fan) { if (g_info.has_fan) {
int fspeed = 0; int fspeed = 0;
CFanControlNotifier * funNotifier= new CFanControlNotifier(); CFanControlNotifier funNotifier;
funNotifier->changeNotify(NONEXISTANT_LOCALE, (void *) &fspeed); funNotifier.changeNotify(NONEXISTANT_LOCALE, (void *) &fspeed);
delete funNotifier;
} }
//CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT)); //CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT));
stop_video(); stop_video();
#ifdef EXIT_CLEANUP
INFO("cleanup...");
printf("cleanup 10\n");fflush(stdout);
delete g_Sectionsd; g_Sectionsd = NULL;
delete g_Timerd; g_Timerd = NULL;
delete g_Zapit; g_Zapit = NULL;
delete g_RemoteControl; g_RemoteControl = NULL;
#if 0 /* FIXME this next hack to test, until we find real crash on exit reason */ printf("cleanup 11\n");fflush(stdout);
system("/etc/init.d/rcK"); delete g_fontRenderer; g_fontRenderer = NULL;
system("/bin/sync"); printf("cleanup 12\n");fflush(stdout);
system("/bin/umount -a"); delete g_PicViewer; g_PicViewer = NULL;
printf("cleanup 13\n");fflush(stdout);
delete g_PluginList; g_PluginList = NULL;
printf("cleanup 16\n");fflush(stdout);
delete g_CamHandler; g_CamHandler = NULL;
printf("cleanup 17\n");fflush(stdout);
delete g_volume; g_volume = NULL;
printf("cleanup 18\n");fflush(stdout);
delete g_EpgData; g_EpgData = NULL;
printf("cleanup 19\n");fflush(stdout);
delete g_InfoViewer; g_InfoViewer = NULL;
printf("cleanup 11\n");fflush(stdout);
delete g_EventList; g_EventList = NULL;
printf("cleanup 12\n");fflush(stdout);
delete g_Locale; g_Locale = NULL;
delete g_videoSettings; g_videoSettings = NULL;
delete g_Radiotext; g_Radiotext = NULL;
reboot(LINUX_REBOOT_CMD_RESTART); printf("cleanup 13\n");fflush(stdout);
#else delete colorSetupNotifier; colorSetupNotifier = NULL;
//_exit(retcode); delete audioSetupNotifier; audioSetupNotifier = NULL;
exit(retcode); delete MoviePluginChanger; MoviePluginChanger = NULL;
printf("cleanup 14\n");fflush(stdout);
delete TVbouquetList; TVbouquetList = NULL;
delete RADIObouquetList; RADIObouquetList = NULL;
delete TVfavList; TVfavList = NULL;
delete RADIOfavList; RADIOfavList = NULL;
delete TVchannelList; TVchannelList = NULL;
delete RADIOchannelList; RADIOchannelList = NULL;
delete TVallList; TVallList = NULL;
delete RADIOallList; RADIOallList = NULL;
delete TVsatList; TVsatList = NULL;
delete RADIOsatList; RADIOsatList = NULL;
printf("cleanup 1\n");fflush(stdout);
for (int i = 0; i < FONT_TYPE_COUNT; i++) {
delete g_Font[i];
g_Font[i] = NULL;
}
printf("cleanup 2\n");fflush(stdout);
delete g_SignalFont; g_SignalFont = NULL;
printf("cleanup 3\n");fflush(stdout);
configfile.clear();
printf("cleanup 4\n");fflush(stdout);
delete CZapit::getInstance();
printf("cleanup 5\n");fflush(stdout);
delete CEitManager::getInstance();
printf("cleanup 6\n");fflush(stdout);
delete CVFD::getInstance();
malloc_stats();
#endif #endif
//_exit(retcode);
exit(retcode); exit(retcode);
} }
} }