Index: cfg.py ================================================================== --- cfg.py +++ cfg.py @@ -10,20 +10,21 @@ def main(): key = "A" composition = { "a": { # Movement block 'a' for reuse throughout the piece -# "melody": { # Instrument 'melody' -# "csound_parameters": { -# "instrument": 1, -# }, -# "grammars": { # Notes for this instrument to use in this piece -# "u": ["I V V V I I IV u u", "I IV u u", "I VII IV u u" , "e"], -# "e": [""], -# }, -# "score": "u u u", -# }, + "melody": { # Instrument 'melody' + "csound_parameters": { + "instrument": 1, + }, + "grammars": { # Notes for this instrument to use in this piece + "u": ["I V V V I I IV u u", "I IV u u", "I VII IV u u" , "e"], +# "u": ["I I I I u u", "e"], + "e": [""], + }, + "score": "u u u u u", + }, "rhythm": { "csound_parameters": { "instrument": 1, }, "grammars": { @@ -32,50 +33,56 @@ "e": [""] }, "score": "u u u", }, }, -# "b": { -# "melody": { # Instrument 'melody' -# "csound_parameters": { -# "instrument": 1, -# }, -# "grammars": { # Notes for this instrument to use in this piece -# "u": ["I V I I/2 IV/2 u u", "I4 IV u u", "I IV IV VI V u u" , "e"], -# "e": [""], -# }, -# "score": "u u u", -# }, -# "rhythm": { -# "csound_parameters": { -# "instrument": 1, -# }, -# "grammars": { -# "u": ['"I" "IV"/2 "V"2 "IV" "I" u u', '"I" "VII" "IV" u u', '"I" "V" "IV" u u', "e"], -# "e": [""] -# }, -# "score": "u u u", -# }, -# }, - } - - for comp_name, comp in composition.iteritems(): - for instr_name, instr in comp.iteritems(): - generated_score = generate_score(instr["score"], instr["grammars"]) # Fill in the scores by generating them based on the grammars -# composition[comp_name][instr_name][grammar]["score"] = parse.parse(generate_score) # Return Node/Chord objects + "b": { + "melody": { # Instrument 'melody' + "csound_parameters": { + "instrument": 1, + }, + "grammars": { # Notes for this instrument to use in this piece + "u": ["I V I I/2 IV/2 u u", "I2 IV u u", "I IV IV VI V u u" , "e"], +# "u": ["I IV I V u u u", "e"], + "e": [""], + }, + "score": "u u u", + }, + "rhythm": { + "csound_parameters": { + "instrument": 1, + }, + "grammars": { + "u": ['"I" "IV"/2 "V"2 "IV" "I" u u', '"I" "VII" "IV" u u', '"I" "V" "IV" u u', "e"], + "e": [""] + }, + "score": "u u u", + }, + }, + } + + max_t = 0 # max time encountered so far. Used for movement timing + progression = "a b" + for comp_name in progression.split(): + instr_start_time = max_t + for instr_name, instr in composition[comp_name].iteritems(): + generated_score = generate_score(instr["score"], instr["grammars"]) # Fill in the scores by generating them based on the grammars score = parse.parse(generated_score) # Return Node/Chord objects # Generate timestamps for the notes - t = 0 + t = instr_start_time for note in range(len(score)): score[note].time = t t += score[note].duration + max_t = t if t > max_t else max_t +# print "end note,", max_t composition[comp_name][instr_name]["score"] = score +# print "end instr,", max_t - # Must be done after all note times keyed in, else you c,an't coordinate melodies with the rhythm chords - for comp_name, comp in composition.iteritems(): - for instr_name, instr in comp.iteritems(): + # Must be done after all note times keyed in, else you can't coordinate melodies with the rhythm chords + for comp_name in progression.split(): + for instr_name, instr in composition[comp_name].iteritems(): composition[comp_name][instr_name]["score"] = transliterate_score(composition[comp_name][instr_name]["score"], key) # print "\nMovement %s instrument %s" % (comp_name, instr_name) # print composition[comp_name][instr_name]["score"] print "f1 0 256 10 1 0 3 ; sine wave function table" final_score = generate_csound_score(composition[comp_name][instr_name]["score"]) @@ -100,11 +107,11 @@ for key,value in grammars.iteritems(): if score.find(key) != -1: found_substitution = True while score.find(key) != -1: score = score.replace(key, random.choice(grammars[key]), 1) - if len(score.split()) > 200: + if len(score.split()) > 20: score = score.replace("u", "") score = score.replace("e", "") return score if found_substitution is False: break @@ -152,21 +159,18 @@ "G#": "08", "A": "09", "A#": "10", "B": "11", } - t = 0 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("i2 %(time)f 1 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6" % {"time": t, "octave": random.choice([7,8]), "note": note}) - t += 1 + csound_score.append("i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6" % {"time": token.time, "octave": random.choice([7,8]), "note": note, "duration": token.duration}) else: # Individual notes note = csound_note_values[token.value] - csound_score.append("i2 %(time)f 1 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6" % {"time": t, "octave": random.choice([8,9]), "note": note}) - t += .25 + csound_score.append("i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6" % {"time": token.time, "octave": random.choice([8,9]), "note": note, "duration": token.duration}) return csound_score if __name__ == "__main__": main() Index: parse.py ================================================================== --- parse.py +++ parse.py @@ -9,11 +9,11 @@ self.accidental = None def __repr__(self): return "Note %s %s %s" % (self.value, self.duration, self.octave) class Chord(): - def __init__(self, value, duration=.25, chord_type="major"): + def __init__(self, value, duration=.5, chord_type="major"): self.value = value self.duration = duration self.chord_type = chord_type def __repr__(self): return "Chord %s %s %s" % (self.value, self.duration, self.chord_type) Index: test.sco ================================================================== --- test.sco +++ test.sco @@ -1,55 +1,127 @@ f1 0 256 10 1 0 3 ; sine wave function table -i2 0.000000 1 7000 7.11 7.11 0 6 -i2 0.000000 1 7000 7.04 7.04 0 6 -i2 0.000000 1 7000 8.08 8.08 0 6 -i2 1.000000 1 7000 8.11 8.11 0 6 -i2 1.000000 1 7000 8.04 8.04 0 6 -i2 1.000000 1 7000 8.08 8.08 0 6 -i2 2.000000 1 7000 8.01 8.01 0 6 -i2 2.000000 1 7000 8.06 8.06 0 6 -i2 2.000000 1 7000 8.09 8.09 0 6 -i2 3.000000 1 7000 7.01 7.01 0 6 -i2 3.000000 1 7000 7.06 7.06 0 6 -i2 3.000000 1 7000 8.09 8.09 0 6 -i2 4.000000 1 7000 7.06 7.06 0 6 -i2 4.000000 1 7000 7.09 7.09 0 6 -i2 4.000000 1 7000 7.01 7.01 0 6 -i2 5.000000 1 7000 8.06 8.06 0 6 -i2 5.000000 1 7000 7.09 7.09 0 6 -i2 5.000000 1 7000 7.01 7.01 0 6 -i2 6.000000 1 7000 7.11 7.11 0 6 -i2 6.000000 1 7000 7.04 7.04 0 6 -i2 6.000000 1 7000 8.08 8.08 0 6 -i2 7.000000 1 7000 8.11 8.11 0 6 -i2 7.000000 1 7000 7.04 7.04 0 6 -i2 7.000000 1 7000 7.08 7.08 0 6 -i2 8.000000 1 7000 8.01 8.01 0 6 -i2 8.000000 1 7000 8.06 8.06 0 6 -i2 8.000000 1 7000 7.09 7.09 0 6 -i2 9.000000 1 7000 8.01 8.01 0 6 -i2 9.000000 1 7000 7.06 7.06 0 6 -i2 9.000000 1 7000 8.09 8.09 0 6 -i2 10.000000 1 7000 8.06 8.06 0 6 -i2 10.000000 1 7000 7.09 7.09 0 6 -i2 10.000000 1 7000 8.01 8.01 0 6 -i2 11.000000 1 7000 8.06 8.06 0 6 -i2 11.000000 1 7000 8.09 8.09 0 6 -i2 11.000000 1 7000 8.01 8.01 0 6 -i2 12.000000 1 7000 7.11 7.11 0 6 -i2 12.000000 1 7000 7.04 7.04 0 6 -i2 12.000000 1 7000 8.08 8.08 0 6 -i2 13.000000 1 7000 7.11 7.11 0 6 -i2 13.000000 1 7000 8.04 8.04 0 6 -i2 13.000000 1 7000 7.08 7.08 0 6 -i2 14.000000 1 7000 7.01 7.01 0 6 -i2 14.000000 1 7000 7.06 7.06 0 6 -i2 14.000000 1 7000 7.09 7.09 0 6 -i2 15.000000 1 7000 8.01 8.01 0 6 -i2 15.000000 1 7000 8.06 8.06 0 6 -i2 15.000000 1 7000 7.09 7.09 0 6 -i2 16.000000 1 7000 8.06 8.06 0 6 -i2 16.000000 1 7000 8.09 8.09 0 6 -i2 16.000000 1 7000 7.01 7.01 0 6 -i2 17.000000 1 7000 7.06 7.06 0 6 -i2 17.000000 1 7000 7.09 7.09 0 6 -i2 17.000000 1 7000 7.01 7.01 0 6 +i2 0.000000 0.250000 7000 8.09 8.09 0 6 +i2 0.250000 0.250000 7000 9.02 9.02 0 6 +i2 0.500000 0.250000 7000 9.09 9.09 0 6 +i2 0.750000 0.250000 7000 9.04 9.04 0 6 +i2 1.000000 0.250000 7000 8.04 8.04 0 6 +i2 1.250000 0.250000 7000 8.04 8.04 0 6 +i2 1.500000 0.250000 7000 8.09 8.09 0 6 +i2 1.750000 0.250000 7000 9.09 9.09 0 6 +i2 2.000000 0.250000 7000 8.02 8.02 0 6 +i2 2.250000 0.250000 7000 8.09 8.09 0 6 +i2 2.500000 0.250000 7000 9.04 9.04 0 6 +i2 2.750000 0.250000 7000 8.04 8.04 0 6 +i2 3.000000 0.250000 7000 9.04 9.04 0 6 +i2 3.250000 0.250000 7000 9.09 9.09 0 6 +i2 3.500000 0.250000 7000 9.09 9.09 0 6 +i2 3.750000 0.250000 7000 8.02 8.02 0 6 +f1 0 256 10 1 0 3 ; sine wave function table +i2 0.000000 0.500000 7000 7.11 7.11 0 6 +i2 0.000000 0.500000 7000 7.04 7.04 0 6 +i2 0.000000 0.500000 7000 7.08 7.08 0 6 +i2 0.500000 0.500000 7000 7.11 7.11 0 6 +i2 0.500000 0.500000 7000 8.04 8.04 0 6 +i2 0.500000 0.500000 7000 8.08 8.08 0 6 +i2 1.000000 0.500000 7000 8.01 8.01 0 6 +i2 1.000000 0.500000 7000 7.06 7.06 0 6 +i2 1.000000 0.500000 7000 7.09 7.09 0 6 +i2 1.500000 0.500000 7000 8.01 8.01 0 6 +i2 1.500000 0.500000 7000 7.06 7.06 0 6 +i2 1.500000 0.500000 7000 8.09 8.09 0 6 +i2 2.000000 0.500000 7000 7.06 7.06 0 6 +i2 2.000000 0.500000 7000 8.09 8.09 0 6 +i2 2.000000 0.500000 7000 8.01 8.01 0 6 +i2 2.500000 0.500000 7000 8.06 8.06 0 6 +i2 2.500000 0.500000 7000 8.09 8.09 0 6 +i2 2.500000 0.500000 7000 7.01 7.01 0 6 +i2 3.000000 0.500000 7000 8.11 8.11 0 6 +i2 3.000000 0.500000 7000 8.04 8.04 0 6 +i2 3.000000 0.500000 7000 8.08 8.08 0 6 +i2 3.500000 0.500000 7000 8.11 8.11 0 6 +i2 3.500000 0.500000 7000 7.04 7.04 0 6 +i2 3.500000 0.500000 7000 8.08 8.08 0 6 +i2 4.000000 0.500000 7000 8.01 8.01 0 6 +i2 4.000000 0.500000 7000 7.06 7.06 0 6 +i2 4.000000 0.500000 7000 8.09 8.09 0 6 +i2 4.500000 0.500000 7000 7.01 7.01 0 6 +i2 4.500000 0.500000 7000 7.06 7.06 0 6 +i2 4.500000 0.500000 7000 7.09 7.09 0 6 +i2 5.000000 0.500000 7000 7.06 7.06 0 6 +i2 5.000000 0.500000 7000 7.09 7.09 0 6 +i2 5.000000 0.500000 7000 8.01 8.01 0 6 +i2 5.500000 0.500000 7000 8.06 8.06 0 6 +i2 5.500000 0.500000 7000 8.09 8.09 0 6 +i2 5.500000 0.500000 7000 8.01 8.01 0 6 +f1 0 256 10 1 0 3 ; sine wave function table +i2 6.000000 2.000000 7000 9.09 9.09 0 6 +i2 8.000000 0.250000 7000 9.02 9.02 0 6 +i2 8.250000 0.250000 7000 8.09 8.09 0 6 +i2 8.500000 0.250000 7000 9.04 9.04 0 6 +i2 8.750000 0.250000 7000 8.09 8.09 0 6 +i2 9.000000 0.500000 7000 8.09 8.09 0 6 +i2 9.500000 0.500000 7000 9.02 9.02 0 6 +i2 10.000000 0.250000 7000 9.09 9.09 0 6 +i2 10.250000 0.250000 7000 9.02 9.02 0 6 +i2 10.500000 0.250000 7000 9.02 9.02 0 6 +i2 10.750000 0.250000 7000 8.06 8.06 0 6 +i2 11.000000 0.250000 7000 9.04 9.04 0 6 +i2 11.250000 0.250000 7000 8.09 8.09 0 6 +i2 11.500000 0.250000 7000 9.02 9.02 0 6 +i2 11.750000 0.250000 7000 9.02 9.02 0 6 +i2 12.000000 0.250000 7000 9.06 9.06 0 6 +i2 12.250000 0.250000 7000 8.04 8.04 0 6 +f1 0 256 10 1 0 3 ; sine wave function table +i2 6.000000 0.500000 7000 8.11 8.11 0 6 +i2 6.000000 0.500000 7000 8.04 8.04 0 6 +i2 6.000000 0.500000 7000 8.08 8.08 0 6 +i2 6.500000 0.500000 7000 7.04 7.04 0 6 +i2 6.500000 0.500000 7000 8.09 8.09 0 6 +i2 6.500000 0.500000 7000 8.11 8.11 0 6 +i2 7.000000 2.000000 7000 8.06 8.06 0 6 +i2 7.000000 2.000000 7000 8.09 8.09 0 6 +i2 7.000000 2.000000 7000 8.01 8.01 0 6 +i2 9.000000 0.500000 7000 7.04 7.04 0 6 +i2 9.000000 0.500000 7000 8.09 8.09 0 6 +i2 9.000000 0.500000 7000 7.11 7.11 0 6 +i2 9.500000 0.500000 7000 8.11 8.11 0 6 +i2 9.500000 0.500000 7000 7.04 7.04 0 6 +i2 9.500000 0.500000 7000 7.08 7.08 0 6 +i2 10.000000 0.500000 7000 7.11 7.11 0 6 +i2 10.000000 0.500000 7000 7.04 7.04 0 6 +i2 10.000000 0.500000 7000 8.08 8.08 0 6 +i2 10.500000 0.500000 7000 8.04 8.04 0 6 +i2 10.500000 0.500000 7000 8.09 8.09 0 6 +i2 10.500000 0.500000 7000 7.11 7.11 0 6 +i2 11.000000 2.000000 7000 7.06 7.06 0 6 +i2 11.000000 2.000000 7000 7.09 7.09 0 6 +i2 11.000000 2.000000 7000 8.01 8.01 0 6 +i2 13.000000 0.500000 7000 7.04 7.04 0 6 +i2 13.000000 0.500000 7000 8.09 8.09 0 6 +i2 13.000000 0.500000 7000 8.11 8.11 0 6 +i2 13.500000 0.500000 7000 7.11 7.11 0 6 +i2 13.500000 0.500000 7000 8.04 8.04 0 6 +i2 13.500000 0.500000 7000 8.08 8.08 0 6 +i2 14.000000 0.500000 7000 8.11 8.11 0 6 +i2 14.000000 0.500000 7000 7.04 7.04 0 6 +i2 14.000000 0.500000 7000 7.08 7.08 0 6 +i2 14.500000 0.500000 7000 8.06 8.06 0 6 +i2 14.500000 0.500000 7000 7.09 7.09 0 6 +i2 14.500000 0.500000 7000 7.01 7.01 0 6 +i2 15.000000 0.500000 7000 7.04 7.04 0 6 +i2 15.000000 0.500000 7000 8.09 8.09 0 6 +i2 15.000000 0.500000 7000 8.11 8.11 0 6 +i2 15.500000 0.500000 7000 7.11 7.11 0 6 +i2 15.500000 0.500000 7000 7.04 7.04 0 6 +i2 15.500000 0.500000 7000 7.08 7.08 0 6 +i2 16.000000 0.500000 7000 8.04 8.04 0 6 +i2 16.000000 0.500000 7000 7.09 7.09 0 6 +i2 16.000000 0.500000 7000 8.11 8.11 0 6 +i2 16.500000 2.000000 7000 8.06 8.06 0 6 +i2 16.500000 2.000000 7000 7.09 7.09 0 6 +i2 16.500000 2.000000 7000 8.01 8.01 0 6 +i2 18.500000 0.500000 7000 7.04 7.04 0 6 +i2 18.500000 0.500000 7000 7.09 7.09 0 6 +i2 18.500000 0.500000 7000 8.11 8.11 0 6 +i2 19.000000 0.500000 7000 8.11 8.11 0 6 +i2 19.000000 0.500000 7000 8.04 8.04 0 6 +i2 19.000000 0.500000 7000 7.08 7.08 0 6 Index: todo.org ================================================================== --- todo.org +++ todo.org @@ -1,17 +1,19 @@ -* Features [1/4] +* Features [1/5] - [X] Top-down composition - [ ] Transition the melody between chords appropriately - [ ] Set maximum song length - [ ] Need to support all chord types +- [ ] Doesn't handle rest notes -* Bugs [1/5] -- [ ] TLD resets clock for each movement -- [ ] TLD doesn't accept an ordering for the movements -- [X] Doesn't handle minor chords -- [ ] Duration syntax is absolute, not relative to BPM +* Bugs [3/5] +- [X] TLD resets clock for each movement +- [X] TLD doesn't accept an ordering for the movements +- [X] Doesn't handle minor chords +- [ ] Calculated duration is absolute, not relative to BPM - [ ] Chords don't respect octaves -* Structure [0/2] +* Structure [0/3] - [ ] Chords should be composed of Notes, not ordinary arrays - [ ] Generate score with proper generation tools +- [ ] Store csound score lines with instruments