Index: cfg.orc ================================================================== --- cfg.orc +++ cfg.orc @@ -1,43 +1,73 @@ 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 + if p5=105 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 + elseif p5=1.08 then + asig diskin2 "samples/bass/1.08.wav", 1 + elseif p5=1.08 then + asig diskin2 "samples/bass/1.09.wav", 1 + elseif p5=1.10 then + asig diskin2 "samples/bass/1.10.wav", 1 + elseif p5=1.11 then + asig diskin2 "samples/bass/1.11.wav", 1 + elseif p5=2.00 then + asig diskin2 "samples/bass/2.00.wav", 1 + elseif p5=2.01 then + asig diskin2 "samples/bass/2.01.wav", 1 + elseif p5=2.02 then + asig diskin2 "samples/bass/2.02.wav", 1 + elseif p5=2.03 then + asig diskin2 "samples/bass/2.03.wav", 1 + elseif p5=2.04 then + asig diskin2 "samples/bass/2.04.wav", 1 + elseif p5=2.05 then + asig diskin2 "samples/bass/2.05.wav", 1 + elseif p5=2.06 then + asig diskin2 "samples/bass/2.06.wav", 1 + elseif p5=2.07 then + asig diskin2 "samples/bass/2.07.wav", 1 + elseif p5=2.08 then + asig diskin2 "samples/bass/2.08.wav", 1 + elseif p5=2.09 then + asig diskin2 "samples/bass/2.09.wav", 1 + elseif p5=2.10 then + asig diskin2 "samples/bass/2.10.wav", 1 + elseif p5=2.11 then + asig diskin2 "samples/bass/2.11.wav", 1 + elseif p5=3.00 then + asig diskin2 "samples/bass/3.00.wav", 1 + elseif p5=3.01 then + asig diskin2 "samples/bass/3.01.wav", 1 + elseif p5=3.02 then + asig diskin2 "samples/bass/3.02.wav", 1 + elseif p5=3.03 then + asig diskin2 "samples/bass/3.03.wav", 1 + elseif p5=3.04 then + asig diskin2 "samples/bass/3.04.wav", 1 + elseif p5=3.05 then + asig diskin2 "samples/bass/3.05.wav", 1 + elseif p5=3.06 then + asig diskin2 "samples/bass/3.06.wav", 1 + elseif p5=3.07 then + asig diskin2 "samples/bass/3.07.wav", 1 + elseif p5=3.08 then + asig diskin2 "samples/bass/3.08.wav", 1 + elseif p5=3.09 then + asig diskin2 "samples/bass/3.09.wav", 1 + elseif p5=3.10 then + asig diskin2 "samples/bass/3.10.wav", 1 + elseif p5=3.11 then + asig diskin2 "samples/bass/3.11.wav", 1 + endif outs asig endin instr 1 asound pluck p4, cpspch(p5), cpspch(p6), p7, p8 p9 p10 Index: parse.py ================================================================== --- parse.py +++ parse.py @@ -6,11 +6,10 @@ class Note(): def __init__(self, value, duration=1, octave=8): self.value = value self.duration = duration self.octave = octave - self.accidental = None def __repr__(self): return "Note %s %s %s" % (self.value, self.duration, self.octave) class Chord(): def __init__(self, value, duration=1, chord_type="major", octave=5): @@ -44,11 +43,11 @@ t_ignore = " |" t_BASENOTE = r"[A-Ga-g]" # t_BASENOTE = r"I+V?|VI*|i+v?|vi*" - t_ACCIDENTAL = r"\^{1,2}|_{1,2}|=" + t_ACCIDENTAL = r"\^{1}|_{1}|=" t_REST = r"z" t_OCTAVE = r"'+|,+" t_CHORD_TYPE = r"m|7|m7|0|o|\+|mb5|sus|sus4|maj7|mmaj7|7sus4|dim|dim7|7b5|m7b5|6|b6|m6|mb6|46|maj9|9|add9|7b9|m9" t_PAREN = "\(|\)" t_SYNCOPATE = "\+|-" @@ -122,11 +121,14 @@ def p_accidental(p): '''note : ACCIDENTAL note ''' - p[2].accidental = p[1] + if p[1] == "^": + p[2].value += "#" + else: + p[2].value += "b" p[0] = p[2] def p_octave(p): '''note : note OCTAVE ''' @@ -153,11 +155,13 @@ ''' p[0] = tree.Tree(p[1].strip("(").strip(")")) def p_error(p): +# import ipdb +# ipdb.set_trace() print p raise Exception("Syntax error at '%s' of element type %s" % (p.value, p.type)) yacc.yacc() return yacc.parse(score) Index: spiffyscore.py ================================================================== --- spiffyscore.py +++ spiffyscore.py @@ -103,29 +103,30 @@ }, }, }, "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": "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)"], +# }, +# }, "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": ["E F G E (u)"], - "v": ["G A A A (e)"], - "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)"], }, }, }, }, } @@ -255,27 +256,28 @@ def generate_csound_score(score, score_line, t): csound_note_values = { "C": "00", - "C#": "01", + "C#": "01", "Db": "01", "D": "02", - "D#": "03", + "D#": "03", "Eb": "03", "E": "04", "F": "05", - "F#": "06", + "F#": "06", "Gb": "06", "G": "07", - "G#": "08", + "G#": "08", "Ab": "08", "A": "09", - "A#": "10", + "A#": "10", "Bb": "10", "B": "11", } csound_score = [] for token in score: if isinstance(token, parse.Chord): # Chords for note in token.chord: note = csound_note_values[note] + csound_score.append(score_line % {"time": t, "octave": token.octave, "note": note, "duration": token.duration}) csound_score.append(score_line % {"time": t, "octave": token.octave, "note": note, "duration": token.duration}) elif isinstance(token, parse.Note): # Individual notes note = csound_note_values[token.value] csound_score.append(score_line % {"time": t, "octave": token.octave, "note": note, "duration": token.duration}) elif isinstance(token, tree.Tree): DELETED todo.org Index: todo.org ================================================================== --- todo.org +++ /dev/null @@ -1,37 +0,0 @@ -* Features [4/10] -- [X] Top-down composition -- [ ] Coordinate the melody and rhythm -- [X] Set maximum song length of movement per instrument -- [ ] Set minimum song length of movement per instrument -- [ ] Need to support all chord types -- [X] Doesn't handle rest notes -- [ ] Handle full ABC BNF (yeah, right, that's gonna happen...) -- [X] Set instrument octave in score file -- [ ] Output score to separate file -- [ ] Support parallel voices - ensure e.g. a certain chord progression is always - accompanied by a certain melody -- [ ] Syncopation -- [ ] Sustain option for notes (give score notation a sustain symbol, and use it to set how long after the notes's duration to keep holding. With sustain, the next note's start time isn't done by when the current note ends. - -* Bugs [5/6] -- [X] TLD resets clock for each movement -- [X] TLD doesn't accept an ordering for the movements -- [X] Doesn't handle minor chords -- [X] Calculated duration is absolute, not relative to BPM -- [X] Chords don't respect octaves -- [ ] Whole notes not held for proper duration - -* Structure [1/7] -- [ ] Chords should be composed of Notes, not ordinary arrays -- [ ] There should be a Musical_Phrase object that holds phrases (and sets of - phrases), and allows them to nest -- [ ] Does each instrument need a score parameter if the grammars are non-terminating? -- [ ] Duration should be in beats, not seconds. This ensures movements don't - end in the middle of a phrase. -- [ ] Generate score with proper generation tools, not this string-replace nonsense -- [X] Store csound score lines with instruments -- [ ] Upgrade from simple string substitution for the score to something - list-based (maybe). Idea is to keep musical phrases intact in the event of a - truncation of the score. Also, if done right, no need for retroactive length - parsing- a measure is has a specific length, which is known at - generation-time, thus solving the length limit problem.