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

merge of work/home changes

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@289 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2007-08-02 02:56:18 +00:00
parent da16f06cbc
commit 0b757f5885
99 changed files with 71 additions and 22916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/projectM-engine/Parser.cpp
View File

@ -502,7 +502,7 @@ int Parser::parse_line(FILE * fs, Preset * preset) {
CustomWave * custom_wave;
/* Retrieve custom shape associated with this id */
if ((custom_wave = preset->find_custom_wave(last_custom_wave_id, TRUE)) == NULL)
if ((custom_wave = Preset::find_custom_object(last_custom_wave_id, true, *preset->customWaves)) == NULL)
return PROJECTM_FAILURE;
return parse_wave_per_frame_eqn(fs, custom_wave, preset);
@ -517,7 +517,7 @@ int Parser::parse_line(FILE * fs, Preset * preset) {
CustomShape * custom_shape;
/* Retrieve custom shape associated with this id */
if ((custom_shape = preset->find_custom_shape(last_custom_shape_id, TRUE)) == NULL)
if ((custom_shape = Preset::find_custom_object(last_custom_shape_id, true, *preset->customShapes)) == NULL)
return PROJECTM_FAILURE;
return parse_shape_per_frame_eqn(fs, custom_shape, preset);
@ -527,7 +527,7 @@ int Parser::parse_line(FILE * fs, Preset * preset) {
CustomShape * custom_shape;
/* Retrieve custom shape associated with this id */
if ((custom_shape = preset->find_custom_shape(last_custom_shape_id, TRUE)) == NULL)
if ((custom_shape = preset->find_custom_object(last_custom_shape_id, true, *preset->customShapes)) == NULL)
return PROJECTM_FAILURE;
return parse_shape_per_frame_init_eqn(fs, custom_shape, preset);
@ -1397,7 +1397,7 @@ int Parser::parse_wavecode(char * token, FILE * fs, Preset * preset) {
/* Retrieve custom wave information from preset. The 3rd argument
if true creates a custom wave if one does not exist */
if ((custom_wave = preset->find_custom_wave(id, TRUE)) == NULL) {
if ((custom_wave = Preset::find_custom_object(id, true, *preset->customWaves)) == NULL) {
//if (PARSE_DEBUG) printf("parse_wavecode: failed to load (or create) custom wave (id = %d)!\n", id);
return PROJECTM_FAILURE;
}
@ -1475,7 +1475,7 @@ int Parser::parse_shapecode(char * token, FILE * fs, Preset * preset) {
/* Retrieve custom shape information from preset. The 3rd argument
if true creates a custom shape if one does not exist */
if ((custom_shape = preset->find_custom_shape(id, TRUE)) == NULL) {
if ((custom_shape = Preset::find_custom_object(id, true, *preset->customShapes)) == NULL) {
//if (PARSE_DEBUG) printf("parse_shapecode: failed to load (or create) custom shape (id = %d)!\n", id);
return PROJECTM_FAILURE;
}
@ -1730,7 +1730,7 @@ int Parser::parse_wave_helper(FILE * fs, Preset * preset, int id, char * eqn_ty
InitCond * init_cond;
/* Retrieve custom wave associated with this id */
if ((custom_wave = preset->find_custom_wave(id, TRUE)) == NULL) {
if ((custom_wave = Preset::find_custom_object(id, true, *preset->customWaves)) == NULL) {
if (PARSE_DEBUG) printf("parse_wave_helper: custom wave id %d not found!\n", id);
return PROJECTM_FAILURE;
}
@ -1890,7 +1890,7 @@ int Parser::parse_shape(char * token, FILE * fs, Preset * preset) {
}
/* Retrieve custom shape associated with this id */
if ((custom_shape = preset->find_custom_shape(id, TRUE)) == NULL)
if ((custom_shape = Preset::find_custom_object(id,true,*preset->customShapes)) == NULL)
return PROJECTM_FAILURE;