Revert to simpler syntax for Timeline

ideoforms · ideoforms · commit f66db4549fd1 · 2020-06-24T23:23:55.000+01:00
diff --git a/README.md b/README.md
@@ -45,9 +45,9 @@ timeline = iso.Timeline(120)
 # Schedule events, with properties generated by the Pattern objects.
 #------------------------------------------------------------------------
 timeline.schedule({
-    iso.EVENT_NOTE: arpeggio,
-    iso.EVENT_DURATION: 0.25,
-    iso.EVENT_AMPLITUDE: amplitude
+    "note": arpeggio,
+    "duration": 0.25,
+    "amplitude": amplitude
 })
 ```
 
diff --git a/examples/00.ex-hello-world.py b/examples/00.ex-hello-world.py
@@ -16,8 +16,8 @@
 timeline = iso.Timeline(120)
 
 timeline.schedule({
-    iso.EVENT_NOTE: series,
-    iso.EVENT_DURATION: 1
+    "note": series,
+    "duration": 1
 })
 
 timeline.run()
diff --git a/examples/01.ex-basics.py b/examples/01.ex-basics.py
@@ -54,13 +54,13 @@
 # Schedule events, with properties generated by the Pattern objects.
 #------------------------------------------------------------------------
 timeline.schedule({
-    iso.EVENT_NOTE: arpeggio,
-    iso.EVENT_DURATION: 0.25,
-    iso.EVENT_AMPLITUDE: amplitude
+    "note": arpeggio,
+    "duration": 0.25,
+    "amplitude": amplitude
 })
 timeline.schedule({
-    iso.EVENT_NOTE: bassline,
-    iso.EVENT_DURATION: 1
+    "note": bassline,
+    "duration": 1
 })
 
 timeline.run()
diff --git a/examples/02.ex-subsequence.py b/examples/02.ex-subsequence.py
@@ -24,22 +24,22 @@
 
 timeline = iso.Timeline(120)
 timeline.schedule({
-    iso.EVENT_NOTE: sequence.copy(),
-    iso.EVENT_AMPLITUDE: amp.copy(),
-    iso.EVENT_DURATION: 0.25,
-    iso.EVENT_GATE: gate.copy()
+    "note": sequence.copy(),
+    "amplitude": amp.copy(),
+    "duration": 0.25,
+    "gate": gate.copy()
 })
 timeline.schedule({
-    iso.EVENT_NOTE: sequence.copy() + 24,
-    iso.EVENT_AMPLITUDE: amp.copy(),
-    iso.EVENT_DURATION: 0.5,
-    iso.EVENT_GATE: gate.copy()
+    "note": sequence.copy() + 24,
+    "amplitude": amp.copy(),
+    "duration": 0.5,
+    "gate": gate.copy()
 })
 timeline.schedule({
-    iso.EVENT_NOTE: sequence.copy() - 24,
-    iso.EVENT_AMPLITUDE: 10 + amp.copy() * 0.5,
-    iso.EVENT_DURATION: iso.PChoice([4, 4, 6, 8]),
-    iso.EVENT_GATE: gate.copy()
+    "note": sequence.copy() - 24,
+    "amplitude": 10 + amp.copy() * 0.5,
+    "duration": iso.PChoice([4, 4, 6, 8]),
+    "gate": gate.copy()
 })
 
 timeline.run()
diff --git a/examples/03.ex-euclidean.py b/examples/03.ex-euclidean.py
@@ -14,24 +14,24 @@
 timeline = iso.Timeline(100)
 
 timeline.schedule({
-    iso.EVENT_NOTE: 60 * iso.PEuclidean(5, 8),
-    iso.EVENT_DURATION: 0.25
+    "note": 60 * iso.PEuclidean(5, 8),
+    "duration": 0.25
 }, delay=0.0)
 timeline.schedule({
-    iso.EVENT_NOTE: 62 * iso.PEuclidean(5, 13),
-    iso.EVENT_DURATION: 0.5
+    "note": 62 * iso.PEuclidean(5, 13),
+    "duration": 0.5
 }, delay=0.25)
 timeline.schedule({
-    iso.EVENT_NOTE: 64 * iso.PEuclidean(7, 15),
-    iso.EVENT_DURATION: 0.5
+    "note": 64 * iso.PEuclidean(7, 15),
+    "duration": 0.5
 }, delay=0.5)
 timeline.schedule({
-    iso.EVENT_NOTE: 67 * iso.PEuclidean(6, 19),
-    iso.EVENT_DURATION: 0.25
+    "note": 67 * iso.PEuclidean(6, 19),
+    "duration": 0.25
 }, delay=0.75)
 timeline.schedule({
-    iso.EVENT_NOTE: 71 * iso.PEuclidean(7, 23),
-    iso.EVENT_DURATION: 0.5
+    "note": 71 * iso.PEuclidean(7, 23),
+    "duration": 0.5
 }, delay=1.0)
 
 timeline.run()
diff --git a/examples/04.ex-permutations.py b/examples/04.ex-permutations.py
@@ -37,24 +37,24 @@
 #------------------------------------------------------------------------
 timeline = iso.Timeline(60)
 timeline.schedule({
-    iso.EVENT_NOTE: ppitch + 60,
-    iso.EVENT_DURATION: pdur,
-    iso.EVENT_AMPLITUDE: pamp,
-    iso.EVENT_CHANNEL: 0
+    "note": ppitch + 60,
+    "duration": pdur,
+    "amplitude": pamp,
+    "channel": 0
 })
 timeline.schedule({
-    iso.EVENT_NOTE: ppitch + 24,
-    iso.EVENT_DURATION: pdur * 4,
-    iso.EVENT_AMPLITUDE: pamp,
-    iso.EVENT_CHANNEL: 1,
-    iso.EVENT_GATE: 2
+    "note": ppitch + 24,
+    "duration": pdur * 4,
+    "amplitude": pamp,
+    "channel": 1,
+    "gate": 2
 })
 timeline.schedule({
-    iso.EVENT_NOTE: ppitch + 72,
-    iso.EVENT_DURATION: pdur / 2,
-    iso.EVENT_CHANNEL: 1,
-    iso.EVENT_GATE: 1,
-    iso.EVENT_AMPLITUDE: pamp / 2
+    "note": ppitch + 72,
+    "duration": pdur / 2,
+    "channel": 1,
+    "gate": 1,
+    "amplitude": pamp / 2
 })
 
 #------------------------------------------------------------------------
diff --git a/examples/05.ex-piano-phase.py b/examples/05.ex-piano-phase.py
@@ -30,12 +30,12 @@
 # by two every note... try removing the .copy() and see what happens!
 #------------------------------------------------------------------------
 timeline.schedule({
-    iso.EVENT_NOTE: seq.copy() + 60,
-    iso.EVENT_DURATION: 0.5
+    "note": seq.copy() + 60,
+    "duration": 0.5
 })
 timeline.schedule({
-    iso.EVENT_NOTE: seq.copy() + 72,
-    iso.EVENT_DURATION: 0.5 * 1.01
+    "note": seq.copy() + 72,
+    "duration": 0.5 * 1.01
 })
 
 #------------------------------------------------------------------------
diff --git a/examples/06.ex-walk.py b/examples/06.ex-walk.py
@@ -20,8 +20,8 @@
 
 timeline = iso.Timeline(170)
 timeline.schedule({
-    iso.EVENT_NOTE: notes,
-    iso.EVENT_DURATION: 0.25,
-    iso.EVENT_GATE: 0.9,
-    iso.EVENT_AMPLITUDE: amp})
+    "note": notes,
+    "duration": 0.25,
+    "gate": 0.9,
+    "amplitude": amp})
 timeline.run()
diff --git a/examples/10.ex-lsystem-stochastic.py b/examples/10.ex-lsystem-stochastic.py
@@ -19,7 +19,7 @@
 timeline = iso.Timeline(180)
 
 timeline.schedule({
-    iso.EVENT_NOTE: notes,
-    iso.EVENT_DURATION: 0.25
+    "note": notes,
+    "duration": 0.25
 })
 timeline.run()
diff --git a/examples/11.ex-lsystem-rhythm.py b/examples/11.ex-lsystem-rhythm.py
@@ -39,8 +39,8 @@
 
 timeline = iso.Timeline(120)
 timeline.schedule({
-    iso.EVENT_NOTE: notes,
-    iso.EVENT_AMPLITUDE: velocity,
-    iso.EVENT_DURATION: times
+    "note": notes,
+    "amplitude": velocity,
+    "duration": times
 })
 timeline.run()
diff --git a/examples/20.ex-midi-input.py b/examples/20.ex-midi-input.py
@@ -30,7 +30,7 @@
 
 t = iso.Timeline(120)
 t.sched({
-    iso.EVENT_NOTE: iso.PSequence([ note.note for note in notes ], 1),
-    iso.EVENT_DURATION: 0.5
+    "note": iso.PSequence([ note.note for note in notes ], 1),
+    "duration": 0.5
 })
 t.run()
diff --git a/examples/21.ex-midi-clock-sync-in.py b/examples/21.ex-midi-clock-sync-in.py
@@ -23,6 +23,6 @@ def print_tempo():
 
 timeline = iso.Timeline(120, clock_source=midi_in)
 timeline.schedule({
-    iso.EVENT_ACTION: print_tempo
+    "action": print_tempo
 })
 timeline.run()
diff --git a/examples/22.ex-midi-markov-learner.py b/examples/22.ex-midi-markov-learner.py
@@ -58,9 +58,9 @@
 else:
     t = iso.Timeline(120, midi_out)
     t.sched({
-        iso.EVENT_NOTE: pitch,
-        iso.EVENT_DURATION: dur,
-        iso.EVENT_AMPLITUDE: amp,
-        iso.EVENT_CHANNEL: 0
+        "note": pitch,
+        "duration": dur,
+        "amplitude": amp,
+        "channel": 0
     })
     t.run()
diff --git a/examples/31.ex-midifile-write.py b/examples/31.ex-midifile-write.py
@@ -19,18 +19,18 @@
 
 timeline = iso.Timeline(iso.MAX_CLOCK_RATE, output_device=output)
 timeline.sched({
-    iso.EVENT_NOTE: iso.PDegree(iso.PSequence([ 0, 1, 2, 4 ], 4), key),
-    iso.EVENT_OCTAVE: 5,
-    iso.EVENT_GATE: iso.PSequence([ 0.5, 1, 2, 1 ]),
-    iso.EVENT_AMPLITUDE: iso.PSequence([ 100, 80, 60, 40], 4),
-    iso.EVENT_DURATION: 1.0
+    "note": iso.PDegree(iso.PSequence([ 0, 1, 2, 4 ], 4), key),
+    "octave": 5,
+    "gate": iso.PSequence([ 0.5, 1, 2, 1 ]),
+    "amplitude": iso.PSequence([ 100, 80, 60, 40], 4),
+    "duration": 1.0
 })
 timeline.sched({
-    iso.EVENT_NOTE: iso.PDegree(iso.PSequence([ 7, 6, 4, 2 ], 4), key),
-    iso.EVENT_OCTAVE: 6,
-    iso.EVENT_GATE: 1,
-    iso.EVENT_AMPLITUDE: iso.PSequence([ 80, 70, 60, 50], 4),
-    iso.EVENT_DURATION: 1.0
+    "note": iso.PDegree(iso.PSequence([ 7, 6, 4, 2 ], 4), key),
+    "octave": 6,
+    "gate": 1,
+    "amplitude": iso.PSequence([ 80, 70, 60, 50], 4),
+    "duration": 1.0
 }, delay=0.5)
 timeline.run()
 output.write()
diff --git a/examples/32.ex-midifile-markov.py b/examples/32.ex-midifile-markov.py
@@ -27,26 +27,26 @@
 # Learn note, duration and amplitude series separately.
 #------------------------------------------------------------------------
 note_learner = iso.MarkovLearner()
-note_learner.learn_pattern(pattern[iso.EVENT_NOTE])
+note_learner.learn_pattern(pattern["note"])
 dur_learner = iso.MarkovLearner()
-dur_learner.learn_pattern(pattern[iso.EVENT_DURATION])
+dur_learner.learn_pattern(pattern["duration"])
 
 #------------------------------------------------------------------------
 # Quantize velocities to the nearest 10 to make chains easier to
 # learn with a small sample set.
 #------------------------------------------------------------------------
 amp_learner = iso.MarkovLearner()
-amp_learner.learn_pattern(iso.PInt(iso.PRound(iso.PScalar(pattern[iso.EVENT_AMPLITUDE]), -1)))
+amp_learner.learn_pattern(iso.PInt(iso.PRound(iso.PScalar(pattern["amplitude"]), -1)))
 
 #------------------------------------------------------------------------
 # The markov property of a learner is a PMarkov, which generates
 # outputs by traversing the Markov chain stochastically.
 #------------------------------------------------------------------------
 timeline = iso.Timeline(90)
 timeline.schedule({
-    iso.EVENT_NOTE: note_learner.markov,
-    iso.EVENT_DURATION: dur_learner.markov,
-    iso.EVENT_AMPLITUDE: amp_learner.markov
+    "note": note_learner.markov,
+    "duration": dur_learner.markov,
+    "amplitude": amp_learner.markov
 })
 try:
     timeline.run()
