[PD-cvs] externals/frankenstein common.c, 1.12, 1.13 rhythms_memory.c, 1.1, 1.2 rhythms_memory.vcproj, 1.1, 1.2

[dmorelli]

Update of /cvsroot/pure-data/externals/frankenstein
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3935

Modified Files:
	common.c rhythms_memory.c rhythms_memory.vcproj 
Log Message:
still buggy.. the rhythms..

Index: rhythms_memory.c
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/rhythms_memory.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rhythms_memory.c	7 Dec 2005 00:20:01 -0000	1.1
--- rhythms_memory.c	7 Dec 2005 18:38:20 -0000	1.2
***************
*** 120,124 ****
  	}
  	x->events = 0;
- 	x->seq_initialized = 0;
  
  	// now I evaluate this rhythm with the memory
--- 120,123 ----

Index: common.c
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/common.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** common.c	7 Dec 2005 00:20:01 -0000	1.12
--- common.c	7 Dec 2005 18:38:20 -0000	1.13
***************
*** 54,58 ****
  		}
  	}
! 	return curr+1;	
  }
  
--- 54,58 ----
  		}
  	}
! 	return curr;	
  }
  
***************
*** 149,152 ****
--- 149,155 ----
  	t_rhythm_event *next;
  
+ 	if (currentEvent==0)
+ 		return;
+ 
  	// go to the first element of the list
  	while(currentEvent->previous)
***************
*** 155,164 ****
  	// now free each element
  	next=currentEvent->next;
! 	do
  	{
  		prev = currentEvent;
! 		next = currentEvent->next;
! 		free(currentEvent);
! 	} while(next);
  
  }
--- 158,167 ----
  	// now free each element
  	next=currentEvent->next;
! 	while(currentEvent)
  	{
  		prev = currentEvent;
! 		currentEvent = currentEvent->next;
! 		free(prev);
! 	} 
  
  }
***************
*** 220,223 ****
--- 223,228 ----
  	unsigned short int last, sub_id;
  	int i, arcFound;
+ 	if (new_rhythm==0)
+ 		return INVALID_RHYTHM;
  	// creates a new element of the list of similar rhythms
  	newElement = (t_rhythm_memory_element *) malloc(sizeof(t_rhythm_memory_element));
***************
*** 342,346 ****
  {
  	unsigned short int *new_array;
! 	t_rhythm_event *curr_event;
  	int i, maxi, startint;
  	maxi = possible_durations();
--- 347,351 ----
  {
  	unsigned short int *new_array;
! 	//t_rhythm_event *curr_event;
  	int i, maxi, startint;
  	maxi = possible_durations();
***************
*** 353,362 ****
  	}
  	// set the actual data
! 	curr_event = currentEvent;
! 	while(curr_event)
  	{
! 		startint = duration2int(curr_event->start);
  		new_array[startint]=1;
! 		curr_event = curr_event->next;
  	}
  	*this_array = new_array;
--- 358,367 ----
  	}
  	// set the actual data
! 	//curr_event = currentEvent;
! 	while(currentEvent)
  	{
! 		startint = duration2int(currentEvent->start);
  		new_array[startint]=1;
! 		currentEvent = currentEvent->next;
  	}
  	*this_array = new_array;
***************
*** 636,639 ****
--- 641,645 ----
  			*sub_closeness = sub_closeness_found;
  			*new_rhythm = 2;
+ 			post("DEBUG: new subrhythm");
  		}
  	} else
***************
*** 663,666 ****
--- 669,673 ----
  		*root_closeness = 1;
  		*new_rhythm = 1;
+ 		post("DEBUG: new rhythm");
  	}
  

Index: rhythms_memory.vcproj
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/rhythms_memory.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rhythms_memory.vcproj	7 Dec 2005 00:20:01 -0000	1.1
--- rhythms_memory.vcproj	7 Dec 2005 18:38:20 -0000	1.2
***************
*** 20,24 ****
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories=""H:\PureData\pd-0.38-3.msw\pd\src""
  				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
  				MinimalRebuild="TRUE"
--- 20,24 ----
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="../"
  				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
  				MinimalRebuild="TRUE"
***************
*** 37,41 ****
  				OutputFile="$(OutDir)/rhythms_memory.dll"
  				LinkIncremental="2"
! 				AdditionalLibraryDirectories=""H:\PureData\pd-0.38-3.msw\pd\bin""
  				GenerateDebugInformation="TRUE"
  				ProgramDatabaseFile="$(OutDir)/frankenstein.pdb"
--- 37,41 ----
  				OutputFile="$(OutDir)/rhythms_memory.dll"
  				LinkIncremental="2"
! 				AdditionalLibraryDirectories="../"
  				GenerateDebugInformation="TRUE"
  				ProgramDatabaseFile="$(OutDir)/frankenstein.pdb"