From 5313400598c79e3f840a2446b3f52f12a674b138 Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 15 Aug 2013 10:44:38 -0700 Subject: [PATCH 1/2] doc/notes.txt,mod0.js:Updates following 8/12-14 sessions. --- doc/notes.txt | 19 ++++++++++ src/kc/data/mod0.js | 87 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 88 insertions(+), 18 deletions(-) diff --git a/doc/notes.txt b/doc/notes.txt index 51f983a..b874084 100644 --- a/doc/notes.txt +++ b/doc/notes.txt @@ -18,6 +18,25 @@ TODO: + Add preset delete. + All uses of va_copy() should have a complimentary va_end() +*** 8/13 +* Cross-fade was cutting out during demo. +* Missing takes between seq 7 and seq 8. +* The MIDI is mis-aligned against the audio. +* Are cost / tempo working? ... test changing mode. +* Add an automatic volume adjustment to prevent parameter changes from causing large volume changes. +* What can we actually do between after a MIDI note is received? Is it already too late to + send parameters w/o affecting the attack of the note. + +* Live Test material + + Part 1: Meas:76 - (one measure) to get measurments for later sections + Part 1: Meas:94 (sect 38) through Meas:136 (include 136 stop at 137). + + Part 2: ("/Users/kevin/temp/piano score part 2 draft 1 master m 232 - 241 1st 2 bts.sib") + The downbeat of part two aligns with the 3rd beat (in 4/4) of 122 in the first part. + Ends on measure 131 at end of beat 3. + + *** July 10 ** (done) Make separate mappings and scale/range controls for left and right. ** Add EQ output stage. diff --git a/src/kc/data/mod0.js b/src/kc/data/mod0.js index 74df9fb..f23e8c7 100644 --- a/src/kc/data/mod0.js +++ b/src/kc/data/mod0.js @@ -36,19 +36,23 @@ type: { vmin | emin | dmin | tmin | cmin | vmax | emax | dmax | tmax | cmax } da // 1 - { loc:-1, mod:m1, var:thr0, type:set, val:50 }, - { loc:-1, mod:m1, var:thr1, type:set, val:55 }, + { loc:-1, mod:m1, var:thr0, type:set, val:55 }, + { loc:-1, mod:m1, var:thr1, type:set, val:70 }, + { loc:-1, mod:m1, var:upr0, type:set, val:0 }, + { loc:-1, mod:m1, var:upr1, type:set, val:0 }, + { loc:-1, mod:m1, var:lwr0, type:set, val:2.0 }, + { loc:-1, mod:m1, var:lwr1, type:set, val:2.0 }, - { loc:-1, mod:m1, var:mint0, type:set, val:30 }, - { loc:-1, mod:m1, var:maxt0, type:set, val:80 }, - { loc:-1, mod:m1, var:minu0, type:set, val:-0.5 }, + { loc:-1, mod:m1, var:mint0, type:set, val:50 }, + { loc:-1, mod:m1, var:maxt0, type:set, val:65 }, + { loc:-1, mod:m1, var:minu0, type:set, val:0.0 }, { loc:-1, mod:m1, var:maxu0, type:set, val:0.5 }, { loc:-1, mod:m1, var:minl0, type:set, val:0 }, { loc:-1, mod:m1, var:maxl0, type:set, val:3 }, - { loc:-1, mod:m1, var:mint1, type:set, val:30 }, - { loc:-1, mod:m1, var:maxt1, type:set, val:80 }, - { loc:-1, mod:m1, var:minu1, type:set, val:-0.5 }, + { loc:-1, mod:m1, var:mint1, type:set, val:65 }, + { loc:-1, mod:m1, var:maxt1, type:set, val:75 }, + { loc:-1, mod:m1, var:minu1, type:set, val:0.0 }, { loc:-1, mod:m1, var:maxu1, type:set, val:0.5 }, { loc:-1, mod:m1, var:minl1, type:set, val:0 }, { loc:-1, mod:m1, var:maxl1, type:set, val:3 }, @@ -56,23 +60,44 @@ type: { vmin | emin | dmin | tmin | cmin | vmax | emax | dmax | tmax | cmax } da // 741: 4 1024 4 60 0 2 // 1 1024 4 65 0 2 - - //{ loc:741, mod:m1, var:thr0, type:set, val:60 }, - //{ loc:741, mod:m1, var:thr1, type:set, val:65 }, - +/* { loc:741, mod:m1, var:mint0, type:set, val:55 }, + { loc:741, mod:m1, var:maxt0, type:set, val:80 }, + { loc:741, mod:m1, var:mint1, type:set, val:70 }, + { loc:741, mod:m1, var:maxt1, type:set, val:80 }, + + { loc:741, mod:m1, var:thr0, type:set, val:70 }, + { loc:741, mod:m1, var:thr1, type:set, val:75 }, +*/ + + { loc:741, mod:m1, var:mint0, type:set, val:50 }, { loc:741, mod:m1, var:maxt0, type:set, val:65 }, - { loc:741, mod:m1, var:mint1, type:set, val:60 }, - { loc:741, mod:m1, var:maxt1, type:set, val:70 }, + { loc:741, mod:m1, var:mint1, type:set, val:70 }, + { loc:741, mod:m1, var:maxt1, type:set, val:85 }, + + { loc:754, mod:m1, var:mint0, type:set, val:55 }, + { loc:754, mod:m1, var:maxt0, type:set, val:70 }, + { loc:754, mod:m1, var:mint1, type:set, val:65 }, + { loc:754, mod:m1, var:maxt1, type:set, val:70 }, + + { loc:770, mod:m1, var:mint0, type:set, val:60 }, + { loc:770, mod:m1, var:maxt0, type:set, val:75 }, + { loc:770, mod:m1, var:mint1, type:set, val:60 }, + { loc:770, mod:m1, var:maxt1, type:set, val:75 }, + + + + //{ loc:767, mod:m1 var:mod1, type:set, val:4 }, + //{ loc:770, mod:m1 var:mod1, type:set, val:1 }, // 755: 4 2048 4 60 0 2 // 1 1024 4 65 0 2 - { loc:754, mod:m1, var:mint0, type:set, val:65 }, - { loc:754, mod:m1, var:maxt0, type:set, val:85 }, - { loc:754, mod:m1, var:mint1, type:set, val:70 }, - { loc:754, mod:m1, var:maxt1, type:set, val:80 }, + //{ loc:754, mod:m1, var:mint0, type:set, val:65 }, + //{ loc:754, mod:m1, var:maxt0, type:set, val:85 }, + //{ loc:754, mod:m1, var:mint1, type:set, val:70 }, + //{ loc:754, mod:m1, var:maxt1, type:set, val:80 }, //{ loc:754, mod:m1, var:mod0, type:set, rate:100 val:4 }, @@ -83,9 +108,35 @@ type: { vmin | emin | dmin | tmin | cmin | vmax | emax | dmax | tmax | cmax } da //{ loc:149, mod:m1, var:thr0, type:set, val:60 }, //{ loc:149, mod:m1, var:thr1, type:set, val:60 }, + { loc:989, mod:m1, var:mint0, type:set, val:50 }, + { loc:989, mod:m1, var:maxt0, type:set, val:65 }, + { loc:989, mod:m1, var:mint1, type:set, val:70 }, + { loc:989, mod:m1, var:maxt1, type:set, val:85 }, + { loc:1010, mod:m1, var:mint0, type:set, val:55 }, + { loc:1010, mod:m1, var:maxt0, type:set, val:70 }, + { loc:1010, mod:m1, var:mint1, type:set, val:65 }, + { loc:1010, mod:m1, var:maxt1, type:set, val:70 }, + { loc:1017, mod:m1, var:mint0, type:set, val:60 }, + { loc:1017, mod:m1, var:maxt0, type:set, val:75 }, + { loc:1017, mod:m1, var:mint1, type:set, val:60 }, + { loc:1017, mod:m1, var:maxt1, type:set, val:75 }, + { loc:1036, mod:m1, var:mint0, type:set, val:65 }, + { loc:1036, mod:m1, var:maxt0, type:set, val:80 }, + { loc:1036, mod:m1, var:mint1, type:set, val:55 }, + { loc:1036, mod:m1, var:maxt1, type:set, val:70 }, + + { loc:1049, mod:m1, var:mint0, type:set, val:70 }, + { loc:1049, mod:m1, var:maxt0, type:set, val:75 }, + { loc:1049, mod:m1, var:mint1, type:set, val:50 }, + { loc:1049, mod:m1, var:maxt1, type:set, val:65 }, + + //{ loc:1240, mod:m1, var:mint0, type:set, val:50 }, + //{ loc:1240, mod:m1, var:maxt0, type:set, val:65 }, + //{ loc:1240, mod:m1, var:mint1, type:set, val:70 }, + //{ loc:1240, mod:m1, var:maxt1, type:set, val:85 }, ] } From b30bbaf6f37c4d9274bad2ad609e6b44c1bec5a0 Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 15 Aug 2013 10:45:00 -0700 Subject: [PATCH 2/2] mod2e.csv:Fixed octavia note pitches. --- src/kc/data/mod2e.csv | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/kc/data/mod2e.csv b/src/kc/data/mod2e.csv index 81a93c4..45b50e6 100755 --- a/src/kc/data/mod2e.csv +++ b/src/kc/data/mod2e.csv @@ -407,7 +407,7 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 659,2,616,non,0.88128,94.1208,0x90,0,0,90,57,F#6,,,,,,,,p,, 661,2,618,non,0.072522,94.1208,0x90,0,0,30,38,F#1,,,,e,,,0.1666,ppp,, 663,2,620,non,0.073899,94.193322,0x90,0,0,55,49,G3,,,,e,,,0.1666,ppp,, -665,2,622,non,0.073899,94.267221,0x90,0,0,86,53,D6,,,,e,,,0.1666,ppp,, +665,2,622,non,0.073899,94.267221,0x90,0,0,86,53,D7,,,,e,,,0.1666,ppp,, 667,2,624,non,0.44064,94.34112,0x90,0,0,46,41,A#2,,,,"e 16",,,,"ppp 18",, 668,2,625,non,0.44064,94.56144,0x90,0,0,64,50,E4,,,,,,,,,, 670,2,627,non,0.22032,94.78176,0x90,0,0,76,59,E5,,,,,,,,,, @@ -733,7 +733,7 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 1232,2,1177,non,1.173663,156.397461,0x90,0,0,47,110,B2,,,,,,,,f,, 1234,2,1179,ctl,0,156.69168,0xb0,0,0,64,127,,,,,,,,,,, 1236,2,1181,non,0.586602,156.984522,0x90,0,0,36,102,C2,,,,,,,,,, -1238,2,1183,non,0.294219,157.278741,0x90,0,0,91,127,G6,,,,,,,,,, +1238,2,1183,non,0.294219,157.278741,0x90,0,0,91,127,G7,,,,,,,,,, 1239,2,1184,ctl,0,157.571124,0xb0,0,0,64,0,,,,,,,,,,, ,,,bar,,,,,,,,45,,45,,,,,,,, 1240,2,1185,non,1.98288,157.57296,0x90,0,0,55,91,G3,,,,,,,,f,, @@ -933,7 +933,7 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra ,,,bar,,,,,,,,,,63,,,,,,,, 1580,2,1525,non,2.496042,221.02512,0x90,0,0,31,48,G1,,,,,,,,,, 1581,2,1526,non,2.375325,221.145837,0x90,0,0,82,36,A#5,,,,,,,,,, -1582,2,1527,non,2.318868,221.202294,0x90,0,0,91,36,G6,,,,,,,,,, +1582,2,1527,non,2.318868,221.202294,0x90,0,0,91,36,G7,,,,,,,,,, 1583,2,1528,ctl,0,221.46576,0xb0,0,0,64,127,,,,,,,,,,, 1584,2,1529,non,2.055402,221.46576,0x90,0,0,40,36,E2,,,,,,,,,, 1588,2,1533,non,1.174122,222.34704,0x90,0,0,86,121,D6,,,,,,,,,, @@ -1094,7 +1094,7 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 1858,2,1803,non,0.088128,270.905109,0x90,0,0,92,50,G#6,,,,,,,,,, 1860,2,1805,non,0.087669,270.993237,0x90,0,0,41,62,F2,,,,,,,,,, 1862,2,1807,non,0.127143,271.130937,0x90,0,0,80,127,G#5,,,,,,,,,, -1863,2,1808,non,0.063801,271.194279,0x90,0,0,90,127,F#6,,,,,,,,,, +1863,2,1808,non,0.063801,271.194279,0x90,0,0,90,127,F#7,,,,,,,,,, 1864,2,1809,non,2.64384,271.25808,0x90,0,0,96,127,C7,,,,,,,,,, 1867,2,1812,non,0.11016,271.36824,0x90,0,0,65,48,F4,,,,,,,,,, 1869,2,1814,non,0.22032,271.4784,0x90,0,0,56,48,G#3,,,,,,,,,, @@ -1111,8 +1111,8 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 1889,2,1834,non,0.418149,277.86768,0x90,0,0,40,60,E2,,,,,,,,,, 1890,2,1835,non,2.09304,277.86768,0x90,0,0,28,44,E1,,,,,,,,,, 1896,2,1841,non,0.023868,279.958884,0x90,0,0,62,116,D4,,,,e,g,,,,35,"D before the F#6" -1893,2,1838,non,0.332316,280.007079,0x90,0,0,90,98,F#6,,,,e,g,,,,, -1895,2,1840,non,0.284121,280.047012,0x90,0,0,76,98,E5,,,,e,g,,,,, +1893,2,1838,non,0.332316,280.007079,0x90,0,0,90,98,F#7,,,,e,g,,,,, +1895,2,1840,non,0.284121,280.047012,0x90,0,0,76,98,E6,,,,e,g,,,,, 1897,2,1842,non,0.235926,280.077274,0x90,0,0,70,116,A#4,,,,e,g,,,,, 1899,2,1844,non,0.184059,280.107141,0x90,0,0,27,127,D#1,,,,e,g,,,,, 1900,2,1845,non,12.484341,280.217301,0x90,0,0,42,37,F#2,,,,"e 41",,,,,, @@ -1448,7 +1448,7 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 2444,2,2376,non,0.08211,360.91965,0x90,0,0,47,38,B2,,,,,,,,ppp,, 2449,2,2381,non,2.448,361.00176,0x90,0,0,46,38,A#2,,,,,,,,"ppp 44a",, 2453,2,2385,non,0.153,361.39956,0x90,0,0,101,61,F7,,,,,,,,,, -2455,2,2387,non,0.0918,361.39956,0x90,0,0,82,93,A#5,,,,,,,,,, +2455,2,2387,non,0.0918,361.39956,0x90,0,0,82,93,A#6,,,,,,,,,, 2456,2,2388,non,0.05151,361.43985,0x90,0,0,32,93,G#1,,,,,,,,,, ,,,bar,,,,,,,,,,107,,,,,,,, 2457,2,2389,non,0.2448,361.49136,0x90,0,0,77,93,F5,,,,,,,,,, @@ -1933,7 +1933,7 @@ id,trk,evt,opcode,dticks,micros,status,meta,ch,d0,d1,arg0,arg1,bar,skip,even,gra 3222,2,3140,non,0.1224,467.48976,0x90,0,0,56,76,G#3,,,,,,,,mf,, 3224,2,3142,non,0.1224,467.48976,0x90,0,0,32,47,G#1,,,,,,,,pp,, 3228,2,3146,non,0.1224,467.61216,0x90,0,0,105,109,A7,,,,,,,,mf,, -3230,2,3148,non,0.0153,467.71926,0x90,0,0,93,42,A6,,,,,,,,,,"should be A7" +3230,2,3148,non,0.0153,467.71926,0x90,0,0,93,42,A7,,,,,,,,,,"should be A7" 3232,2,3150,non,0.9792,467.73456,0x90,0,0,64,42,E4,,,,,,,,p,, 3234,2,3152,non,0.2448,467.73456,0x90,0,0,48,42,C3,,,,,,,,pp,, 3235,2,3153,non,0.2448,467.73456,0x90,0,0,54,42,F#3,,,,,,,,"pp 58b",,