[PD-cvs] externals/frankenstein chords_memory.vcproj, 1.1, 1.2 harmonizer.c, 1.4, 1.5 harmonizer.vcproj, 1.1, 1.2 rhythms_memory.vcproj, 1.2, 1.3 themes_memory.vcproj, 1.1, 1.2

[dmorelli]

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

Modified Files:
	chords_memory.vcproj harmonizer.c harmonizer.vcproj 
	rhythms_memory.vcproj themes_memory.vcproj 
Log Message:
harmonizer improved, voicing_analyzer implemented, chords_memory: chords stuff moved to common.c

Index: harmonizer.vcproj
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/harmonizer.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** harmonizer.vcproj	15 Jan 2006 01:38:32 -0000	1.1
--- harmonizer.vcproj	15 Jan 2006 22:12:41 -0000	1.2
***************
*** 121,124 ****
--- 121,127 ----
  			</File>
  			<File
+ 				RelativePath="..\m_pd.h">
+ 			</File>
+ 			<File
  				RelativePath="sglib.h">
  			</File>

Index: harmonizer.c
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/harmonizer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** harmonizer.c	15 Jan 2006 01:38:32 -0000	1.4
--- harmonizer.c	15 Jan 2006 22:12:41 -0000	1.5
***************
*** 32,40 ****
  #include <ctype.h>
  #include "m_pd.h"
  
  // to sort arrays
  #include "sglib.h"
  
! #define MAX_POPULATION 100
  
  #define DEF_PROB_MUTATION 0.03f
--- 32,41 ----
  #include <ctype.h>
  #include "m_pd.h"
+ #include "common.h"
  
  // to sort arrays
  #include "sglib.h"
  
! #define MAX_POPULATION 500
  
  #define DEF_PROB_MUTATION 0.03f
***************
*** 59,89 ****
  static t_class *harmonizer_class;
  
- typedef enum {
- 			kMaj=0, 
- 			kMin=1, 
- 			kDim=2, 
- 			kAug=3, 
- 			kDom7=4, 
- 			kMaj7=5,
- 			kMin7=6,
- 			kMinMaj7=7,
- 			kDim7=8,
- 			kHalfDim7=9
- 			} chordmode_t;
- 
- typedef enum {C=0,
- 			Db=1,
- 			D=2,
- 			Eb=3,
- 			E=4,
- 			F=5,
- 			Gb=6,
- 			G=7,
- 			Ab=8,
- 			A=9,
- 			Bb=10,
- 			B=11			
- 			} note_t;
- 
  
  
--- 60,63 ----
***************
*** 91,96 ****
  typedef struct _chord
  {
! 	chordmode_t mode;
! 	note_t note;
  } chord_t;
  
--- 65,70 ----
  typedef struct _chord
  {
! 	chord_type_t mode;
! 	abs_note_t note;
  } chord_t;
  
***************
*** 180,240 ****
  }
  
- // tries to find out absolute tones names in this string
- note_t string2note(const char *substr)
- {
- 	if (strstr(substr, "C"))
- 		return C;
- 	if (strstr(substr, "Db"))
- 		return Db;
- 	if (strstr(substr, "D"))
- 		return D;
- 	if (strstr(substr, "Eb"))
- 		return Eb;
- 	if (strstr(substr, "E"))
- 		return E;
- 	if (strstr(substr, "F"))
- 		return F;
- 	if (strstr(substr, "Gb"))
- 		return Gb;
- 	if (strstr(substr, "G"))
- 		return G;
- 	if (strstr(substr, "Ab"))
- 		return Ab;
- 	if (strstr(substr, "A"))
- 		return A;
- 	if (strstr(substr, "Bb"))
- 		return Bb;
- 	if (strstr(substr, "B"))
- 		return B;
- 	return C;
- }
  
- chordmode_t string2mode(const char *substr)
- {
- 	if (strstr(substr, "minor/major 7th"))
- 		return kMinMaj7;
- 	if (strstr(substr, "major 7th"))
- 		return kMaj7;
- 	if (strstr(substr, "major"))
- 		return kMaj;
- 	if (strstr(substr, "minor 7th"))
- 		return kMin7;
- 	if (strstr(substr, "minor"))
- 		return kMin;
- 	if (strstr(substr, "half diminished 7th"))
- 		return kHalfDim7;
- 	if (strstr(substr, "diminished 7th"))
- 		return kDim7;
- 	if (strstr(substr, "diminished"))
- 		return kDim;
- 	if (strstr(substr, "augmented"))
- 		return kAug;
- 	if (strstr(substr, "dominant 7th"))
- 		return kDom7;
- 	// TODO: other chords
- 	// beware when adding new chords
- 	// put shorter names at end of this function!
- 	return C;
- }
  
  // -----------------  normal external code ...
--- 154,158 ----

Index: rhythms_memory.vcproj
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/rhythms_memory.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rhythms_memory.vcproj	7 Dec 2005 18:38:20 -0000	1.2
--- rhythms_memory.vcproj	15 Jan 2006 22:12:41 -0000	1.3
***************
*** 120,123 ****
--- 120,126 ----
  				RelativePath="common.h">
  			</File>
+ 			<File
+ 				RelativePath="..\m_pd.h">
+ 			</File>
  		</Filter>
  		<Filter

Index: themes_memory.vcproj
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/themes_memory.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** themes_memory.vcproj	4 Jan 2006 23:33:33 -0000	1.1
--- themes_memory.vcproj	15 Jan 2006 22:12:41 -0000	1.2
***************
*** 120,123 ****
--- 120,126 ----
  				RelativePath="common.h">
  			</File>
+ 			<File
+ 				RelativePath="..\m_pd.h">
+ 			</File>
  		</Filter>
  		<Filter

Index: chords_memory.vcproj
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/chords_memory.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** chords_memory.vcproj	15 Jan 2006 01:38:32 -0000	1.1
--- chords_memory.vcproj	15 Jan 2006 22:12:41 -0000	1.2
***************
*** 120,123 ****
--- 120,126 ----
  				RelativePath="common.h">
  			</File>
+ 			<File
+ 				RelativePath="..\m_pd.h">
+ 			</File>
  		</Filter>
  		<Filter