mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-09 08:55:02 +00:00
Code Issues Projects Releases Wiki Activity

guard against reinitializing the builtin milkdrop functions. Hides a deeper issue where something is double loading the preset factories, most likely

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1340 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2010-07-28 23:09:43 +00:00
parent f917357a3f
commit d6a7dcd333
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.cpp
View File

@ -29,7 +29,7 @@ int BuiltinFuncs::load_builtin_func(const std::string & name, float (*func_ptr)(
/* Create new function */
func = new Func(name, func_ptr, num_args);
if (func == NULL)
if (func == 0)
return PROJECTM_OUTOFMEM_ERROR;
retval = insert_func( func );
@ -115,12 +115,18 @@ int BuiltinFuncs::load_all_builtin_func() {
return PROJECTM_SUCCESS;
}
volatile bool BuiltinFuncs::initialized = false;
/* Initialize the builtin function database.
Should only be necessary once */
int BuiltinFuncs::init_builtin_func_db() {
int retval;
if (initialized) {
return 0;
} else
initialized = true;
retval = load_all_builtin_func();
return retval;
}
@ -134,7 +140,7 @@ int BuiltinFuncs::destroy_builtin_func_db() {
traverse<TraverseFunctors::Delete<Func> >(builtin_func_tree);
builtin_func_tree.clear();
initialized = false;
return PROJECTM_SUCCESS;
}
@ -142,9 +148,20 @@ return PROJECTM_SUCCESS;
int BuiltinFuncs::insert_func( Func *func ) {
assert(func);
std::pair<std::map<std::string, Func*>::iterator, bool> inserteePair =
builtin_func_tree.insert(std::make_pair(std::string(func->getName()), func));
if (func == 0) {
std::cerr << "Received a null function object, ignoring...." << std::endl;
return PROJECTM_ERROR;
}
std::cout << "inserting function " << func->getName() << std::endl;
const std::pair<std::string, Func*> pair = std::make_pair(std::string(func->getName()), func);
assert(pair.second);
const std::pair<std::map<std::string, Func*>::iterator, bool> inserteePair =
builtin_func_tree.insert(pair);
if (!inserteePair.second) {
std::cerr << "Failed to insert builtin function \"" << func->getName() << "\" into collection! Bailing..." << std::endl;
abort();