mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-24 00:35:50 +00:00
Code Issues Projects Releases Wiki Activity

slowly making projectM class not depend on static crap

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@437 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2007-09-17 01:25:09 +00:00
parent fb2076a1a4
commit ddb0b1069b
3 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/projectM-engine/projectM.cpp
View File

@ -79,7 +79,9 @@ DLLEXPORT projectM::projectM(int gx, int gy, int fps, int texsize, int width, in
DLLEXPORT projectM::~projectM() {
std::cerr << "[projectM] DESTROY PRESET TOOLS BEGIN" << std::endl;
destroyPresetTools();
std::cerr << "[projectM] DESTROY PRESET TOOLS BEGIN" << std::endl;
if (beatDetect)
delete(beatDetect);
std::cerr << "[projectM] DESTROY PRESET TOOLS END" << std::endl;
}
DLLEXPORT projectM::projectM(std::string config_file) :smoothFrame(0), beatDetect ( 0 )
@ -854,12 +856,19 @@ int projectM::initPresetTools()
projectM_resetengine();
std::cerr << "[projectM] engine has been reset." << std::endl;
return PROJECTM_SUCCESS;
}
void projectM::destroyPresetTools()
{
if (m_presetPos)
delete(m_presetPos);
/// @slow might not be necessary
m_presetPos = 0;
if ( m_presetChooser )
delete ( m_presetChooser );
@ -868,7 +877,7 @@ void projectM::destroyPresetTools()
if ( m_presetLoader )
delete ( m_presetLoader );
/// @slow might not be necessary
m_presetLoader = 0;