Package

generator/playback.py

@@ -13,7 +13,7 @@ import generator.model
 import generator.pitch
 
 SAMPLE_RATE = 48000
-PROFILE = 'soft-struck'
+PROFILE = 'soft_struck'
 MAX_EVENTS = 1000000
 
 class PlaybackUnavailable(ValueError):
@@ -21,11 +21,11 @@ class PlaybackUnavailable(ValueError):
 
 def sounding_pitch(tone: dict, state: dict) -> fractions.Fraction:
   if 'unpitched' in tone:
-    raise PlaybackUnavailable('unpitched notation has no generated-tone interpretation')
+    raise PlaybackUnavailable('unpitched notation has no generated_tone interpretation')
   value = generator.pitch.sounding_pitch(tone, state)
   frequency = 440 * 2 ** (float(value - 69) / 12)
   if not 20 <= frequency <= 18000:
-    raise PlaybackUnavailable(f'sounding pitch {value} is outside the generated-tone range (20-18000 Hz)')
+    raise PlaybackUnavailable(f'sounding pitch {value} is outside the generated_tone range (20-18000 Hz)')
   return value
 
 def compile_timeline(document: dict) -> dict:
@@ -133,7 +133,7 @@ def compile_timeline(document: dict) -> dict:
           if tremolo['type'] == 'start' and attack % 2:
             other = partner[0]['pitches'][note['pitches'].index(pitch)]
             amount = sounding_pitch(other, partner[2])
-          events.append({'id': f'{pitch["id"]}-{attack}', 'pitch': generator.model.rational(amount), 'onset': generator.model.rational(performed + cursor), 'duration': generator.model.rational(min(step, length - cursor))})
+          events.append({'id': f'{pitch["id"]}_{attack}', 'pitch': generator.model.rational(amount), 'onset': generator.model.rational(performed + cursor), 'duration': generator.model.rational(min(step, length - cursor))})
           cursor += step
           attack += 1
           if len(events) > MAX_EVENTS: