unitracker-player 0.3.0__tar.gz → 0.4.0__tar.gz

{unitracker_player-0.3.0 → unitracker_player-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitracker-player
-Version: 0.3.0
+Version: 0.4.0
 Summary: Plays canonical unitracker documents to SID register state per tick
 Author: Josh Bailey
 License:                                  Apache License

{unitracker_player-0.3.0 → unitracker_player-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unitracker-player"
-version = "0.3.0"
+version = "0.4.0"
 description = "Plays canonical unitracker documents to SID register state per tick"
 readme = "README.md"
 requires-python = ">=3.12"

{unitracker_player-0.3.0 → unitracker_player-0.4.0}/src/unitracker_player/player.py

@@ -16,6 +16,7 @@ from unitracker_player.modulation import SHAPES
 VERSION = "1.20"
 MAX_VOICES = 3
 REGISTERS = 25
+ENVELOPE = ("ad", "sr")
 CONTROL, PULSE, FILTER = range(3)
 FREQ_MASK, PW_MASK, CUT_MASK = 0xFFFF, 0xFFF, 0x7FF
 
@@ -398,6 +399,10 @@ class Player:
             return [(t, (v, event, transpose, ins, None, None))]
         *ahead, (last, _) = ins.restart
         if isinstance(event.note, int):
+            if ahead:
+                wait, hold, ops = ahead[-1][0]
+                envelope = tuple(op for op in event.ops if op[0] in ENVELOPE)
+                ahead[-1] = ((wait, hold, ops + envelope), ahead[-1][1])
             for row, before in ahead:
                 if t - before >= 0:
                     self._lookahead[t - before].append((v, row))

{unitracker_player-0.3.0 → unitracker_player-0.4.0}/src/unitracker_player.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitracker-player
-Version: 0.3.0
+Version: 0.4.0
 Summary: Plays canonical unitracker documents to SID register state per tick
 Author: Josh Bailey
 License:                                  Apache License

{unitracker_player-0.3.0 → unitracker_player-0.4.0}/tests/test_player.py

@@ -202,6 +202,32 @@ def test_a_note_less_event_splits_at_its_restart_lookahead(phrase, address, expe
     assert reg(play(doc(phrase, LEAD % HR3)), address) == expected
 
 
+FIRST_TICK = "[{hold: 2, gate: 0, ad: 15, sr: 0}, {ctrl: 9, gate: 1, ad: 9, sr: 240}, {}, end]"
+
+
+@pytest.mark.parametrize(
+    "phrase, restart, address, expected",
+    [
+        ("[C4.i1, D4, -*2]", FIRST_TICK, 5, [9] * 3 + [15] * 2 + [9] * 19),
+        ("[C4.i1, D4!ad:10, -*2]", FIRST_TICK, 5, [9] * 3 + [15] * 2 + [10] * 19),
+        ("[C4.i1, D4!sr:155, -*2]", FIRST_TICK, 6, [240] * 3 + [0] * 2 + [155] * 19),
+        ("[C4.i1, D4!sr:155, -*2]", FIRST_TICK, 5, [9] * 3 + [15] * 2 + [9] * 19),
+        ("[C4.i1, D4!ad:10!legato, -*2]", FIRST_TICK, 5, [9] * 6 + [10] * 18),
+        ("[C4.i1!ad:10, -*3]", FIRST_TICK, 5, [10] * 24),
+        ("[C4.i1, D4!ad:10, -*2]", HR, 5, [9] * 5 + [10] * 19),
+        ("[C4.i1, D4!ad:10, -*2]", "[{ctrl: 9}, end]", 5, [9] * 6 + [10] * 18),
+    ],
+)
+def test_a_notes_envelope_commands_apply_with_its_restarts_first_tick_row(
+    phrase, restart, address, expected
+):
+    """A note's !ad and !sr apply after its restart's last lookahead row, on that row's tick,
+    winning over the row's own ad and sr, and again on the note's tick after its instrument;
+    its other commands, a dropped row, a restart of one row and !legato leave them on its
+    tick."""
+    assert reg(play(doc(phrase, LEAD % restart)), address) == expected
+
+
 def test_a_note_triggers_on_its_step_after_its_restart_lookahead():
     """The frequency and the instrument's envelope take the note on its step."""
     frames = play(doc("[C4.i1, D4, -*2]", LEAD % HR))