From fe7d5e3d5a4b716aa65de66c15d0ab352aa75c77 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Fri, 21 May 2010 13:24:37 +0200 Subject: [PATCH] Engine: introduced deleteHelper() function The new deleteHelper() template function takes a pointer, saves it to a temporary, sets the passed pointer to NULL and then deletes the object it was referring to before. This way we can spot bugs caused by undesired references to global objects at shutdown more easily. --- include/engine.h | 12 +++++++++++- src/core/engine.cpp | 47 ++++++++++++++++----------------------------- src/core/track.cpp | 11 +++++++---- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/include/engine.h b/include/engine.h index 4a17cee6b..b8bfa704c 100644 --- a/include/engine.h +++ b/include/engine.h @@ -1,7 +1,7 @@ /* * engine.h - engine-system of LMMS * - * Copyright (c) 2006-2009 Tobias Doerffel + * Copyright (c) 2006-2010 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -207,6 +207,16 @@ public: } private: + // small helper function which sets the pointer to NULL before actually deleting + // the object it refers to + template + static inline void deleteHelper( T * * ptr ) + { + T * tmp = *ptr; + *ptr = NULL; + delete tmp; + } + static bool s_hasGUI; static bool s_suppressMessages; static float s_framesPerTick; diff --git a/src/core/engine.cpp b/src/core/engine.cpp index 0bb323b5e..0019b1372 100644 --- a/src/core/engine.cpp +++ b/src/core/engine.cpp @@ -1,7 +1,7 @@ /* * engine.cpp - implementation of LMMS' engine-system * - * Copyright (c) 2006-2009 Tobias Doerffel + * Copyright (c) 2006-2010 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -153,45 +153,32 @@ void engine::destroy() s_mixer->stopProcessing(); - delete s_projectNotes; - s_projectNotes = NULL; - delete s_songEditor; - s_songEditor = NULL; - delete s_bbEditor; - s_bbEditor = NULL; - delete s_pianoRoll; - s_pianoRoll = NULL; - delete s_automationEditor; - s_automationEditor = NULL; - - delete s_fxMixerView; - s_fxMixerView = NULL; + deleteHelper( &s_projectNotes ); + deleteHelper( &s_songEditor ); + deleteHelper( &s_bbEditor ); + deleteHelper( &s_pianoRoll ); + deleteHelper( &s_automationEditor ); + deleteHelper( &s_fxMixerView ); InstrumentTrackView::cleanupWindowPool(); s_song->clearProject(); - delete s_bbTrackContainer; - s_bbTrackContainer = NULL; - delete s_dummyTC; - s_dummyTC = NULL; - delete s_mixer; - s_mixer = NULL; - delete s_fxMixer; - s_fxMixer = NULL; + deleteHelper( &s_bbTrackContainer ); + deleteHelper( &s_dummyTC ); - delete s_ladspaManager; + deleteHelper( &s_mixer ); + deleteHelper( &s_fxMixer ); + + deleteHelper( &s_ladspaManager ); //delete configManager::inst(); - delete s_projectJournal; - s_projectJournal = NULL; + deleteHelper( &s_projectJournal ); + s_mainWindow = NULL; - delete s_song; - s_song = NULL; - - delete s_automationRecorder; - s_automationRecorder = NULL; + deleteHelper( &s_song ); + deleteHelper( &s_automationRecorder ); delete s_mergedResourceDB->provider(); s_mergedResourceDB = NULL; diff --git a/src/core/track.cpp b/src/core/track.cpp index 1aa9e6097..53d6b6505 100644 --- a/src/core/track.cpp +++ b/src/core/track.cpp @@ -2,8 +2,8 @@ * track.cpp - implementation of classes concerning tracks -> necessary for * all track-like objects (beat/bassline, sample-track...) * - * Copyright (c) 2004-2009 Tobias Doerffel - * + * Copyright (c) 2004-2010 Tobias Doerffel + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -1764,8 +1764,11 @@ void track::removeTCO( trackContentObject * _tco ) { m_trackContentObjects.erase( it ); emit trackContentObjectRemoved( _tco ); - engine::getSong()->updateLength(); - engine::getSong()->setModified(); + if( engine::getSong() ) + { + engine::getSong()->updateLength(); + engine::getSong()->setModified(); + } } }