mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-20 06:15:18 +00:00
Code Issues Projects Releases Wiki Activity

- init cond stuff refactored properly

Browse Source 
- hit a wall in splaytree compilation, involving symbolic types


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@220 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2007-06-24 04:49:28 +00:00
parent d03e24e347
commit 8dcfbceafd
9 changed files with 94 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/projectM-engine/BuiltinParams.cpp
View File

@ -82,7 +82,8 @@ int BuiltinParams::load_builtin_param_float(char * name, void * engine_val, void
Generally, do this on projectm exit */
int BuiltinParams::destroy_builtin_param_db() {
builtin_param_tree->splay_traverse((void (*)(void*))delete);
builtin_param_tree->traverse
<SplayTreeFunctors::Delete<Param> >();
delete builtin_param_tree;
builtin_param_tree = NULL;
return PROJECTM_SUCCESS;
@ -184,7 +185,7 @@ int BuiltinParams::insert_builtin_param( Param *param ) {
int BuiltinParams::init_builtin_param_db(const PresetInputs & presetInputs, PresetOutputs & presetOutputs) {
/* Create the builtin parameter splay tree (go Sleator...) */
if ((this->builtin_param_tree = SplayTree::create_splaytree((int (*)(void*,void*))compare_string,(void* (*)(void*)) copy_string, (void (*)(void*))free_string)) == NULL) {
if ((this->builtin_param_tree = SplayTree<Param>::create_splaytree((int (*)(void*,void*))SplayKeyFunctions::compare_string,(void* (*)(void*)) SplayKeyFunctions::copy_string, (void (*)(void*))SplayKeyFunctions::free_string)) == NULL) {
if (BUILTIN_PARAMS_DEBUG) printf("init_builtin_param_db: failed to initialize database (FATAL)\n");
return PROJECTM_OUTOFMEM_ERROR;
}