Index: cfg.orc ================================================================== --- cfg.orc +++ cfg.orc @@ -1,11 +1,11 @@ sr=44100 ksmps=20 nchnls=1 instr 3 - if p5=105 then + if p5=1.05 then asig diskin2 "samples/bass/1.05.wav", 1 elseif p5=1.06 then asig diskin2 "samples/bass/1.06.wav", 1 elseif p5=1.07 then asig diskin2 "samples/bass/1.07.wav", 1 @@ -81,5 +81,68 @@ endin instr 4 aFMinst foscili p4, cpspch(p5), p6, p7, p8, p9 endin + +instr 5 + if p5=3.07 then + asig diskin2 "samples/violin/3.07.wav", 1 + elseif p5=3.08 then + asig diskin2 "samples/violin/3.08.wav", 1 + elseif p5=3.08 then + asig diskin2 "samples/violin/3.09.wav", 1 + elseif p5=3.10 then + asig diskin2 "samples/violin/3.10.wav", 1 + elseif p5=3.11 then + asig diskin2 "samples/violin/3.11.wav", 1 + elseif p5=4.00 then + asig diskin2 "samples/violin/4.00.wav", 1 + elseif p5=4.01 then + asig diskin2 "samples/violin/4.01.wav", 1 + elseif p5=4.02 then + asig diskin2 "samples/violin/4.02.wav", 1 + elseif p5=4.03 then + asig diskin2 "samples/violin/4.03.wav", 1 + elseif p5=4.04 then + asig diskin2 "samples/violin/4.04.wav", 1 + elseif p5=4.05 then + asig diskin2 "samples/violin/4.05.wav", 1 + elseif p5=4.06 then + asig diskin2 "samples/violin/4.06.wav", 1 + elseif p5=4.07 then + asig diskin2 "samples/violin/4.07.wav", 1 + elseif p5=4.08 then + asig diskin2 "samples/violin/4.08.wav", 1 + elseif p5=4.09 then + asig diskin2 "samples/violin/4.09.wav", 1 + elseif p5=4.10 then + asig diskin2 "samples/violin/4.10.wav", 1 + elseif p5=4.11 then + asig diskin2 "samples/violin/4.11.wav", 1 + elseif p5=5.00 then + asig diskin2 "samples/violin/5.00.wav", 1 + elseif p5=5.01 then + asig diskin2 "samples/violin/5.01.wav", 1 + elseif p5=5.02 then + asig diskin2 "samples/violin/5.02.wav", 1 + elseif p5=5.03 then + asig diskin2 "samples/violin/5.03.wav", 1 + elseif p5=5.04 then + asig diskin2 "samples/violin/5.04.wav", 1 + elseif p5=5.05 then + asig diskin2 "samples/violin/5.05.wav", 1 + elseif p5=5.06 then + asig diskin2 "samples/violin/5.06.wav", 1 + elseif p5=5.07 then + asig diskin2 "samples/violin/5.07.wav", 1 + elseif p5=5.08 then + asig diskin2 "samples/violin/5.08.wav", 1 + elseif p5=5.09 then + asig diskin2 "samples/violin/5.09.wav", 1 + elseif p5=5.10 then + asig diskin2 "samples/violin/5.10.wav", 1 + elseif p5=5.11 then + asig diskin2 "samples/violin/5.11.wav", 1 + endif + outs asig +endin ADDED samples/violin/3.07.wav Index: samples/violin/3.07.wav ================================================================== --- samples/violin/3.07.wav +++ samples/violin/3.07.wav cannot compute difference between binary files ADDED samples/violin/3.08.wav Index: samples/violin/3.08.wav ================================================================== --- samples/violin/3.08.wav +++ samples/violin/3.08.wav cannot compute difference between binary files ADDED samples/violin/3.09.wav Index: samples/violin/3.09.wav ================================================================== --- samples/violin/3.09.wav +++ samples/violin/3.09.wav cannot compute difference between binary files ADDED samples/violin/3.10.wav Index: samples/violin/3.10.wav ================================================================== --- samples/violin/3.10.wav +++ samples/violin/3.10.wav cannot compute difference between binary files ADDED samples/violin/3.11.wav Index: samples/violin/3.11.wav ================================================================== --- samples/violin/3.11.wav +++ samples/violin/3.11.wav cannot compute difference between binary files ADDED samples/violin/4.00.wav Index: samples/violin/4.00.wav ================================================================== --- samples/violin/4.00.wav +++ samples/violin/4.00.wav cannot compute difference between binary files ADDED samples/violin/4.01.wav Index: samples/violin/4.01.wav ================================================================== --- samples/violin/4.01.wav +++ samples/violin/4.01.wav cannot compute difference between binary files ADDED samples/violin/4.02.wav Index: samples/violin/4.02.wav ================================================================== --- samples/violin/4.02.wav +++ samples/violin/4.02.wav cannot compute difference between binary files ADDED samples/violin/4.03.wav Index: samples/violin/4.03.wav ================================================================== --- samples/violin/4.03.wav +++ samples/violin/4.03.wav cannot compute difference between binary files ADDED samples/violin/4.04.wav Index: samples/violin/4.04.wav ================================================================== --- samples/violin/4.04.wav +++ samples/violin/4.04.wav cannot compute difference between binary files ADDED samples/violin/4.05.wav Index: samples/violin/4.05.wav ================================================================== --- samples/violin/4.05.wav +++ samples/violin/4.05.wav cannot compute difference between binary files ADDED samples/violin/4.06.wav Index: samples/violin/4.06.wav ================================================================== --- samples/violin/4.06.wav +++ samples/violin/4.06.wav cannot compute difference between binary files ADDED samples/violin/4.07.wav Index: samples/violin/4.07.wav ================================================================== --- samples/violin/4.07.wav +++ samples/violin/4.07.wav cannot compute difference between binary files ADDED samples/violin/4.08.wav Index: samples/violin/4.08.wav ================================================================== --- samples/violin/4.08.wav +++ samples/violin/4.08.wav cannot compute difference between binary files ADDED samples/violin/4.09.wav Index: samples/violin/4.09.wav ================================================================== --- samples/violin/4.09.wav +++ samples/violin/4.09.wav cannot compute difference between binary files ADDED samples/violin/4.10.wav Index: samples/violin/4.10.wav ================================================================== --- samples/violin/4.10.wav +++ samples/violin/4.10.wav cannot compute difference between binary files ADDED samples/violin/4.11.wav Index: samples/violin/4.11.wav ================================================================== --- samples/violin/4.11.wav +++ samples/violin/4.11.wav cannot compute difference between binary files ADDED samples/violin/5.00.wav Index: samples/violin/5.00.wav ================================================================== --- samples/violin/5.00.wav +++ samples/violin/5.00.wav cannot compute difference between binary files ADDED samples/violin/5.01.wav Index: samples/violin/5.01.wav ================================================================== --- samples/violin/5.01.wav +++ samples/violin/5.01.wav cannot compute difference between binary files ADDED samples/violin/5.02.wav Index: samples/violin/5.02.wav ================================================================== --- samples/violin/5.02.wav +++ samples/violin/5.02.wav cannot compute difference between binary files ADDED samples/violin/5.03.wav Index: samples/violin/5.03.wav ================================================================== --- samples/violin/5.03.wav +++ samples/violin/5.03.wav cannot compute difference between binary files ADDED samples/violin/5.04.wav Index: samples/violin/5.04.wav ================================================================== --- samples/violin/5.04.wav +++ samples/violin/5.04.wav cannot compute difference between binary files ADDED samples/violin/5.05.wav Index: samples/violin/5.05.wav ================================================================== --- samples/violin/5.05.wav +++ samples/violin/5.05.wav cannot compute difference between binary files ADDED samples/violin/5.06.wav Index: samples/violin/5.06.wav ================================================================== --- samples/violin/5.06.wav +++ samples/violin/5.06.wav cannot compute difference between binary files ADDED samples/violin/5.07.wav Index: samples/violin/5.07.wav ================================================================== --- samples/violin/5.07.wav +++ samples/violin/5.07.wav cannot compute difference between binary files ADDED samples/violin/5.08.wav Index: samples/violin/5.08.wav ================================================================== --- samples/violin/5.08.wav +++ samples/violin/5.08.wav cannot compute difference between binary files ADDED samples/violin/5.09.wav Index: samples/violin/5.09.wav ================================================================== --- samples/violin/5.09.wav +++ samples/violin/5.09.wav cannot compute difference between binary files ADDED samples/violin/5.10.wav Index: samples/violin/5.10.wav ================================================================== --- samples/violin/5.10.wav +++ samples/violin/5.10.wav cannot compute difference between binary files ADDED samples/violin/5.11.wav Index: samples/violin/5.11.wav ================================================================== --- samples/violin/5.11.wav +++ samples/violin/5.11.wav cannot compute difference between binary files Index: spiffyscore.py ================================================================== --- spiffyscore.py +++ spiffyscore.py @@ -103,30 +103,31 @@ }, }, }, "sync_test": { "body": { -# "lead_instr": { # Instrument 'melody' -# "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6", -# "octave": 8, -# "duration": 30, -# "grammars": { # Notes for this instrument to use in this piece -# "u": ["A/4, B/4, C/4 D/4 (u)", "D/4' D/4' D/4' D/4' (v)"], -# "v": ["C/4 C/4 C/4 C/4 (w)"], -# "w": ["E/4 F/4 E/4 F/4 (u)"], -# }, -# }, + "lead_instr": { # Instrument 'melody' + "score_line": "i5 %(time)f %(duration)f 7000 %(octave)d.%(note)s", + "octave": 4, + "duration": 30, + "grammars": { # Notes for this instrument to use in this piece +# "u": ["A ^A B C ^C D ^D E F ^F G ^G"], + "u": ["A/2, B/2, C/2 D/2 (u)", "D/2' D/2' D/2' D/2' (v)"], + "v": ["C/2 C/2 C/2 C/2 (w)"], + "w": ["E/2 F/2 E/2 F/2 (u)"], + }, + }, "follow_instr": { # Instrument 'melody' "score_line": "i3 %(time)f %(duration)f 7000 %(octave)d.%(note)s", # "sync": "lead_instr", "octave": 2, "duration": 30, "grammars": { # Notes for this instrument to use in this piece - "u": ["A ^A B C ^C D ^D E F ^F G ^G"], -# "u": ["E F G E (v)"], -# "v": ["G A A A (e)", "G A A A (v)"], -# "e": ["B A G A (v)"], +# "u": ["A ^A B C ^C D ^D E F ^F G ^G"], + "u": ["E F G E (v)"], + "v": ["G A A A (e)", "G A A A (v)"], + "e": ["B A G A (v)"], }, }, }, }, }