[PD-cvs] externals/frankenstein common.c, 1.20, 1.21 common.h, 1.17, 1.18 harmonizer.c, 1.7, 1.8 rhythms_memory.sln, 1.1, NONE themes_memory.sln, 1.1, NONE themes_memory.suo, 1.1, NONE
dmorelli
morellid at users.sourceforge.net
Sat Jan 21 01:11:07 CET 2006
Update of /cvsroot/pure-data/externals/frankenstein
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26761
Modified Files:
common.c common.h harmonizer.c
Removed Files:
rhythms_memory.sln themes_memory.sln themes_memory.suo
Log Message:
all msvc project files centralized in frankenstein.sln
--- themes_memory.suo DELETED ---
Index: common.h
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/common.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** common.h 15 Jan 2006 22:54:41 -0000 1.17
--- common.h 21 Jan 2006 00:11:05 -0000 1.18
***************
*** 132,137 ****
// chords data structure
// tells you how many durations there // how can a chord be?
! #define TYPES_NUM 17 // keep me updated
typedef enum {
kMaj=0,
kMin=1,
--- 132,138 ----
// chords data structure
// tells you how many durations there // how can a chord be?
! #define TYPES_NUM 69 // keep me updated
typedef enum {
+ /*
kMaj=0,
kMin=1,
***************
*** 151,155 ****
kHalfDim9=14,
kMinMaj9=15,
! kDimMaj9=16
} chord_type_t;
--- 152,227 ----
kHalfDim9=14,
kMinMaj9=15,
! kDimMaj9=16
! */
! // this enumerators are from maxlib chord
! kUnison = 0,
! kMaj = 1,
! kMin = 2,
! kDim = 3,
! kAug = 4,
! kMaj7 = 5,
! kDom7 = 6,
! kMin7 = 7,
! kHalfDim7 = 8,
! kDim7 = 9,
! kMinMaj7 = 10,
! kMaj7s5 = 11,
! kMaj7b5 = 12,
! kDom7s5 = 13,
! kDom7b5 = 14,
! kDomb9 = 15,
! kMaj9 = 16,
! kDom9 = 17,
! kMin9 = 18,
! kHalfDim9 = 19,
! kMinMaj9 = 20,
! kDimMaj9 = 21,
! kMaj9b5 = 22,
! kDom9b5 = 23,
! kDom9b13 = 24,
! kMin9s11 = 25,
! kmM9b11 = 26,
! kMaj7b9 = 27,
! kMaj7s5b9 = 28,
! kDom7b9 = 29,
! kMin7b9 = 30,
! kMinb9s11 = 31,
! kHalfDimb9 = 32,
! kDim7b9 = 33,
! kMinMajb9 = 34,
! kDimMajb9 =35,
! kMaj7s9 = 36,
! kDom7s9 = 37,
! kMaj7s11 = 38,
! kMs9s11 = 39,
! kHDimb11 = 40,
! kMaj11 = 41,
! kDom11 = 42,
! kMin11 = 43,
! kHalfDim11 = 44,
! kDim11 = 45,
! kMinMaj11 =46,
! kDimMaj11 =47,
! kMaj11b5 = 48,
! kMaj11s5 = 49,
! kMaj11b9 = 50,
! kMaj11s9 = 51,
! kMaj11b13 = 52,
! kMaj11s13 = 53,
! kM11b5b9 = 54,
! kDom11b5 = 55,
! kDom11b9 = 56,
! kDom11s9 = 57,
! kHalfDim11b9 = 58,
! kDom7s11 = 59,
! kMin7s11 = 60,
! kDom13s11 = 61,
! kM7b913 = 62,
! kMaj7s13 = 63,
! kMaj9s13 = 64,
! kM7b9s13 = 65,
! kDom7b13 = 66,
! kChrom = 67,
! kNone = 68
} chord_type_t;
Index: harmonizer.c
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/harmonizer.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** harmonizer.c 16 Jan 2006 00:56:01 -0000 1.7
--- harmonizer.c 21 Jan 2006 00:11:05 -0000 1.8
***************
*** 45,49 ****
#define NOTES_RANGE 80 // this should be multiple of 16
#define LOWER_POSSIBLE_NOTE 24 // lower note possible, it should be a C
! #define POSSIBLE_NOTES (NOTES_RANGE/12*4) // 4 is the max number of notes in a chord
// default values
--- 45,49 ----
#define NOTES_RANGE 80 // this should be multiple of 16
#define LOWER_POSSIBLE_NOTE 24 // lower note possible, it should be a C
! #define POSSIBLE_NOTES (NOTES_RANGE/12*5) // 5 is the max number of notes in a chord
// default values
***************
*** 96,100 ****
{
int i, octave, basenote;
! int n1, n2, n3, n4;
n1=n2=n3=n4=0; // there always is the fundamental
if (DEBUG_VERBOSE)
--- 96,100 ----
{
int i, octave, basenote;
! int n1, n2, n3, n4, n5;
n1=n2=n3=n4=0; // there always is the fundamental
if (DEBUG_VERBOSE)
***************
*** 102,115 ****
switch (x->target_chord.mode)
{
! case kMaj: n2=4; n3=7; n4=0;break;
! case kMin: n2=3; n3=7; n4=0;break;
! case kDim: n2=3; n3=6; n4=0;break;
! case kAug: n2=4; n3=8; n4=0;break;
! case kMaj7: n2=4; n3=7; n4=11;break;
! case kDom7: n2=4; n3=7; n4=10;break;
! case kMin7: n2=3; n3=7; n4=10;break;
! case kHalfDim7: n2=3; n3=6; n4=10;break;
! case kDim7: n2=3; n3=6; n4=9;break;
! case kMinMaj7: n2=4; n3=7; n4=11;break;
}
if (DEBUG_VERBOSE)
--- 102,115 ----
switch (x->target_chord.mode)
{
! case kMaj: n2=4; n3=7; n4=0;n5=0;break;
! case kMin: n2=3; n3=7; n4=0;n5=0;break;
! case kDim: n2=3; n3=6; n4=0;n5=0;break;
! case kAug: n2=4; n3=8; n4=0;n5=0;break;
! case kMaj7: n2=4; n3=7; n4=11;n5=0;break;
! case kDom7: n2=4; n3=7; n4=10;n5=0;break;
! case kMin7: n2=3; n3=7; n4=10;n5=0;break;
! case kHalfDim7: n2=3; n3=6; n4=10;n5=0;break;
! case kDim7: n2=3; n3=6; n4=9;n5=0;break;
! case kMinMaj7: n2=4; n3=7; n4=11;n5=0;break;
}
if (DEBUG_VERBOSE)
***************
*** 142,145 ****
--- 142,146 ----
x->target_notes[i++]=octave*12 + LOWER_POSSIBLE_NOTE + basenote + n3;
x->target_notes[i++]=octave*12 + LOWER_POSSIBLE_NOTE + basenote + n4;
+ x->target_notes[i++]=octave*12 + LOWER_POSSIBLE_NOTE + basenote + n5;
octave++;
}
--- themes_memory.sln DELETED ---
Index: common.c
===================================================================
RCS file: /cvsroot/pure-data/externals/frankenstein/common.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** common.c 15 Jan 2006 22:54:41 -0000 1.20
--- common.c 21 Jan 2006 00:11:05 -0000 1.21
***************
*** 926,929 ****
--- 926,1047 ----
chord_type_t string2mode(const char *substr)
{
+ // beware when adding new chords
+ // put shorter names at end of this function!
+ if (strstr(substr, "unison"))
+ return kUnison;
+ if (strstr(substr, "major 7th #5"))
+ return kMaj7s5;
+ if (strstr(substr, "major 7th b5"))
+ return kMaj7b5;
+ if (strstr(substr, "dominant 7th #5"))
+ return kDom7s5;
+ if (strstr(substr, "dominant 7th b5"))
+ return kDom7b5;
+ if (strstr(substr, "half diminished 9th"))
+ return kHalfDim9;
+ if (strstr(substr, "minor major 9th"))
+ return kMinMaj9;
+ if (strstr(substr, "diminished major 9th"))
+ return kDimMaj9;
+ if (strstr(substr, "major 9th b5"))
+ return kMaj9b5;
+ if (strstr(substr, "dominant 9th b5"))
+ return kDom9b5;
+ if (strstr(substr, "dominant 9th b13"))
+ return kDom9b13;
+ if (strstr(substr, "minor 9th #11"))
+ return kMin9s11;
+ if (strstr(substr, "minor/maj 9th b11"))
+ return kmM9b11;
+ if (strstr(substr, "major 7th b9"))
+ return kMaj7b9;
+ if (strstr(substr, "major 7th #5 b9"))
+ return kMaj7s5b9;
+ if (strstr(substr, "dominant 7th b9"))
+ return kDom7b9;
+ if (strstr(substr, "minor 7th b9"))
+ return kMin7b9;
+ if (strstr(substr, "minor b9 #11"))
+ return kMinb9s11;
+ if (strstr(substr, "half diminished b9"))
+ return kHalfDimb9;
+ if (strstr(substr, "diminished b9"))
+ return kDim7b9;
+ if (strstr(substr, "minor/major b9"))
+ return kMinMajb9;
+ if (strstr(substr, "diminished M7 b9"))
+ return kDimMajb9;
+ if (strstr(substr, "major 7th #9"))
+ return kMaj7s9;
+ if (strstr(substr, "dominant #9"))
+ return kDom7s9;
+ if (strstr(substr, "major 7th #11"))
+ return kMaj7s11;
+ if (strstr(substr, "major 9th #13"))
+ return kMaj9s13;
+ if (strstr(substr, "major #9 #11"))
+ return kMs9s11;
+ if (strstr(substr, "half diminished b11"))
+ return kHDimb11;
+ if (strstr(substr, "major 11th"))
+ return kMaj11;
+ if (strstr(substr, "dominant 11th"))
+ return kDom11;
+ if (strstr(substr, "minor 11th"))
+ return kMin11;
+ if (strstr(substr, "half diminished 11th"))
+ return kHalfDim11;
+ if (strstr(substr, "diminished 11th"))
+ return kDim11;
+ if (strstr(substr, "minor/major 11th"))
+ return kMinMaj11;
+ if (strstr(substr, "diminished maj 11th"))
+ return kDimMaj11;
+ if (strstr(substr, "major 11th b5"))
+ return kMaj11b5;
+ if (strstr(substr, "major 11th #5"))
+ return kMaj11s5;
+ if (strstr(substr, "major 11th b9"))
+ return kMaj11b9;
+ if (strstr(substr, "major 11th #9"))
+ return kMaj11s9;
+ if (strstr(substr, "major 11th b13"))
+ return kMaj11b13;
+ if (strstr(substr, "major 11th #13"))
+ return kMaj11s13;
+ if (strstr(substr, "major 11th b5 b9"))
+ return kM11b5b9;
+ if (strstr(substr, "dominant 11th b5"))
+ return kDom11b5;
+ if (strstr(substr, "dominant 11th b9"))
+ return kDom11b9;
+ if (strstr(substr, "dominant 11th #9"))
+ return kDom11s9;
+ if (strstr(substr, "half dim 11th b9"))
+ return kHalfDim11b9;
+ if (strstr(substr, "dominant #11"))
+ return kDom7s11;
+ if (strstr(substr, "minor 7th #11"))
+ return kMin7s11;
+ if (strstr(substr, "dominant 13th #11"))
+ return kDom13s11;
+ if (strstr(substr, "major 7 b9 13"))
+ return kM7b913;
+ if (strstr(substr, "major 7th #13"))
+ return kMaj7s13;
+ if (strstr(substr, "major 7 b9 #13"))
+ return kM7b9s13;
+ if (strstr(substr, "dominant 7th b13"))
+ return kDom7b13;
+ if (strstr(substr, "chromatic"))
+ return kChrom;
+ if (strstr(substr, "dominant b9"))
+ return kDomb9;
+ if (strstr(substr, "major 9th"))
+ return kMaj9;
+ if (strstr(substr, "dominant 9th"))
+ return kDom9;
+ if (strstr(substr, "minor 9th"))
+ return kMin9;
if (strstr(substr, "minor/major 7th"))
return kMinMaj7;
***************
*** 946,953 ****
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;
}
--- 1064,1069 ----
if (strstr(substr, "dominant 7th"))
return kDom7;
!
! return kUnison;
}
--- rhythms_memory.sln DELETED ---
More information about the Pd-cvs
mailing list