Changes In Branch develop Through [eb81d5f9fd] Excluding Merge-Ins
This is equivalent to a diff from 689adc054e to eb81d5f9fd
2011-11-01
| ||
18:54 | Imported the todo list from MUS306 check-in: 072fa6ad30 user: brian tags: develop | |
18:52 | Added a sampled double bass, modified the program to respond to an instrument's specified octave check-in: eb81d5f9fd user: brian tags: develop | |
2011-10-20
| ||
20:01 | Program no longer cuts out a note from the score each time it adds a new phrase to the score check-in: 2ae36c6e68 user: brian tags: develop | |
2011-06-12
| ||
20:32 | Made some changes to the parser. Don't remember what. Leaf check-in: 87435601e4 user: brian tags: master | |
20:31 | Create new branch named "develop" check-in: 9f4c4666c5 user: brian tags: develop | |
2011-02-10
| ||
23:50 | Program generates a render order for the instruments based on their sync order check-in: 689adc054e user: brian@linux-85dd.site tags: master | |
22:34 | Added lexical support for parens instead of quotes for chords, cleaned up the yacc parser, added lex tokens for syncopation check-in: 702d933446 user: brian@linux-85dd.site tags: master | |
Modified cfg.orc from [9f49be1cae] to [e60884eb39].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - | sr=44100 ksmps=20 nchnls=1 gifn ftgen 105, 0, 524288, -1, "samples/bass/1.05.wav", 0, 0, 1 ; Middle C gifn ftgen 106, 0, 524288, -1, "samples/bass/1.06.wav", 0, 0, 1 ; Middle C gifn ftgen 107, 0, 524288, -1, "samples/bass/1.07.wav", 0, 0, 1 ; Middle C gifn ftgen 108, 0, 524288, -1, "samples/bass/1.08.wav", 0, 0, 1 ; Middle C gifn ftgen 109, 0, 524288, -1, "samples/bass/1.09.wav", 0, 0, 1 ; Middle C gifn ftgen 110, 0, 524288, -1, "samples/bass/1.10.wav", 0, 0, 1 ; Middle C gifn ftgen 111, 0, 524288, -1, "samples/bass/1.11.wav", 0, 0, 1 ; Middle C gifn ftgen 200, 0, 524288, -1, "samples/bass/2.01.wav", 0, 0, 1 ; Middle C gifn ftgen 201, 0, 524288, -1, "samples/bass/2.02.wav", 0, 0, 1 ; Middle C gifn ftgen 202, 0, 524288, -1, "samples/bass/2.03.wav", 0, 0, 1 ; Middle C gifn ftgen 203, 0, 524288, -1, "samples/bass/2.04.wav", 0, 0, 1 ; Middle C gifn ftgen 204, 0, 524288, -1, "samples/bass/2.05.wav", 0, 0, 1 ; Middle C gifn ftgen 206, 0, 524288, -1, "samples/bass/2.06.wav", 0, 0, 1 ; Middle C gifn ftgen 207, 0, 524288, -1, "samples/bass/2.07.wav", 0, 0, 1 ; Middle C gifn ftgen 208, 0, 524288, -1, "samples/bass/2.08.wav", 0, 0, 1 ; Middle C gifn ftgen 209, 0, 524288, -1, "samples/bass/2.09.wav", 0, 0, 1 ; Middle C gifn ftgen 210, 0, 524288, -1, "samples/bass/2.10.wav", 0, 0, 1 ; Middle C gifn ftgen 211, 0, 524288, -1, "samples/bass/2.11.wav", 0, 0, 1 ; Middle C gifn ftgen 300, 0, 524288, -1, "samples/bass/3.00.wav", 0, 0, 1 ; Middle C gifn ftgen 301, 0, 524288, -1, "samples/bass/3.01.wav", 0, 0, 1 ; Middle C gifn ftgen 302, 0, 524288, -1, "samples/bass/3.02.wav", 0, 0, 1 ; Middle C gifn ftgen 303, 0, 524288, -1, "samples/bass/3.03.wav", 0, 0, 1 ; Middle C gifn ftgen 304, 0, 524288, -1, "samples/bass/3.04.wav", 0, 0, 1 ; Middle C gifn ftgen 305, 0, 524288, -1, "samples/bass/3.05.wav", 0, 0, 1 ; Middle C gifn ftgen 306, 0, 524288, -1, "samples/bass/3.06.wav", 0, 0, 1 ; Middle C gifn ftgen 307, 0, 524288, -1, "samples/bass/3.07.wav", 0, 0, 1 ; Middle C gifn ftgen 308, 0, 524288, -1, "samples/bass/3.08.wav", 0, 0, 1 ; Middle C gifn ftgen 309, 0, 524288, -1, "samples/bass/3.09.wav", 0, 0, 1 ; Middle C gifn ftgen 310, 0, 524288, -1, "samples/bass/3.10.wav", 0, 0, 1 ; Middle C gifn ftgen 311, 0, 524288, -1, "samples/bass/3.11.wav", 0, 0, 1 ; Middle C instr 3 inum = p5*100 asig loscil 1, 1, inum, 1 outs asig endin instr 1 asound pluck p4, cpspch(p5), cpspch(p6), p7, p8 p9 p10 out asound endin instr 2 kenv linen p4, .1, p3, .2; envelope asound oscili kenv, cpspch(p5), p6; oscillator out asound endin |
Deleted cfg.py version [e9b556b4f3].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Modified parse.py from [3ec57c3fbe] to [2afbfc4534].
1 2 3 4 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | + + - + - + - + + - - + + + | #!/usr/bin/env python import tree from ply import lex, yacc class Note(): |
︙ | |||
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | + + | # Parse (yacc) def p_note_list(p): '''score : score note | score chord | score rest | score node ''' p[0] = p[1] + [p[2]] def p_score(p): '''score : note | chord | rest | node ''' p[0] = [p[1]] def p_chord_length(p): ''' chord : chord NOTE_LENGTH ''' |
︙ | |||
137 138 139 140 141 142 143 144 145 146 147 148 149 150 | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | + + + + + + + | def p_rest(p): ''' rest : REST | REST NOTE_LENGTH ''' p[0] = Rest() if len(p) > 2: p[0].duration = p[2] def p_node(p): '''node : NODE ''' p[0] = tree.Tree(p[1].strip("(").strip(")")) def p_error(p): print p raise Exception("Syntax error at '%s' of element type %s" % (p.value, p.type)) yacc.yacc() return yacc.parse(score) |
Added samples/bass/1.05.wav version [e6f01c2d0c].
cannot compute difference between binary files
Added samples/bass/1.06.wav version [589b4c9c16].
cannot compute difference between binary files
Added samples/bass/1.07.wav version [b5bd0e0b28].
cannot compute difference between binary files
Added samples/bass/1.08.wav version [4e22c8e289].
cannot compute difference between binary files
Added samples/bass/1.09.wav version [8eafba8350].
cannot compute difference between binary files
Added samples/bass/1.10.wav version [6c9d557273].
cannot compute difference between binary files
Added samples/bass/1.11.wav version [d210644e57].
cannot compute difference between binary files
Added samples/bass/2.00.wav version [df0ad67bd3].
cannot compute difference between binary files
Added samples/bass/2.01.wav version [5e4bdb6301].
cannot compute difference between binary files
Added samples/bass/2.02.wav version [2787d975d6].
cannot compute difference between binary files
Added samples/bass/2.03.wav version [6ce7982e46].
cannot compute difference between binary files
Added samples/bass/2.04.wav version [3c3feb5b24].
cannot compute difference between binary files
Added samples/bass/2.05.wav version [569b7181fc].
cannot compute difference between binary files
Added samples/bass/2.06.wav version [297d4f860f].
cannot compute difference between binary files
Added samples/bass/2.07.wav version [1ac14e3cd2].
cannot compute difference between binary files
Added samples/bass/2.08.wav version [b92037909c].
cannot compute difference between binary files
Added samples/bass/2.09.wav version [760599b161].
cannot compute difference between binary files
Added samples/bass/2.10.wav version [3b900ab89f].
cannot compute difference between binary files
Added samples/bass/2.11.wav version [bcaf91186d].
cannot compute difference between binary files
Added samples/bass/3.00.wav version [5d028b32a1].
cannot compute difference between binary files
Added samples/bass/3.01.wav version [9d6dded4d3].
cannot compute difference between binary files
Added samples/bass/3.02.wav version [78dab72fb7].
cannot compute difference between binary files
Added samples/bass/3.03.wav version [9476ff14fb].
cannot compute difference between binary files
Added samples/bass/3.04.wav version [0822a77edf].
cannot compute difference between binary files
Added samples/bass/3.05.wav version [dc233966b5].
cannot compute difference between binary files
Added samples/bass/3.06.wav version [c254ae3482].
cannot compute difference between binary files
Added samples/bass/3.07-old1.wav version [7e77a9e339].
cannot compute difference between binary files
Added samples/bass/3.07.wav version [23ec2fdb73].
cannot compute difference between binary files
Added samples/bass/3.08.wav version [c799d64faf].
cannot compute difference between binary files
Added samples/bass/3.09.wav version [cedce4e5ea].
cannot compute difference between binary files
Added samples/bass/3.10.wav version [bbc1ef4a09].
cannot compute difference between binary files
Added samples/bass/3.11.wav version [f679f5a61b].
cannot compute difference between binary files
Added samples/bass/Bass.arco.mf.sulE.C2B2.aiff version [b705aee00e].
cannot compute difference between binary files
Added samples/bass/Bass.arco.mf.sulE.C3D3.aiff version [17eacace3a].
cannot compute difference between binary files
Added samples/bass/Bass.arco.mf.sulG.C3B3.aiff version [8b429011eb].
cannot compute difference between binary files
Added samples/bass/Bass.arco.mf.sulG.G2B2.aiff version [8c3a1d88c6].
cannot compute difference between binary files
Added samples/bass/test.orc version [2795c8cc70].
|
Added samples/bass/test.sco version [f5f91e8863].
|
Added samples/bass/test.wav version [550291acb7].
cannot compute difference between binary files
Added score.yaml version [29fd4ba47c].
|
Added spiffyscore.py version [791db3d131].