starting record(^) & alternate repeats

Author: flipcoder

test/alternate_repeats.txbt

@@ -0,0 +1,12 @@
+%t80
+; make sure there's something in the callstack
+|e:
+1'
+:e|
+2'
+|start:
+1
+||
+2
+:start|
+3

test/modes.txbt

@@ -1,3 +1,4 @@
+;ionian
 %s1
 1
 2
@@ -6,6 +7,7 @@
 5
 6
 7
+;dorian
 %s2
 1
 2
@@ -14,6 +16,7 @@
 5
 6
 7
+;relative shift
 %k2
 1
 2

test/record.txbt

@@ -0,0 +1,7 @@
+1^^
+2
+3^^!
+^
+
+
+^!

test/tabs.txbt

@@ -1,6 +1,6 @@
 ; tab syntax
 ;   not yet impl
-|||
+||||
 %c20,-2
 
 |0     | 

textbeat/defs.py

@@ -38,7 +38,7 @@
 RANGE = 109
 OCTAVE_BASE = 5
 DRUM_WORDS = ['drum','drums','drumset','drumkit','percussion']
-CCHAR = ' <>=~.\'`,_&|!?*\"$(){}[]%@;'
+CCHAR = ' <>=~.\'`,_&|!?*\"$(){}[]%@;^'
 CCHAR_START = 'TV' # control chars
 PRINT = True
 

textbeat/player.py

@@ -717,9 +717,9 @@ async def run(self):
                     cells = fullline.split(' ')
                     pos = 0
                     for cell in cells:
-                        if cell:
-                            if pos:
-                                self.separators.append(pos)
+                        # if cell:
+                            # if pos:
+                            #     self.separators.append(pos)
                             # log(cell)
                         pos += len(cell) + 1
                     # log( "self.separators " + str(self.separators))
@@ -1510,13 +1510,15 @@ async def run(self):
                         #     vel = int((float(num) / float('9'*len(num)))*127)
                         #     ch.cc(7,vel)
                         # RECORD SEQ
-                        elif cell.startswith('^^'):
+                        # elif cell.startswith('^^'):
+                        elif c2=='^^':
                             cell = cell[2:]
                             r,ct = peel_uint(cell,0)
                             ch.record(r)
                             cell = cell[ct:]
                         # REPLAY SEQ
-                        elif cell.startswith('^'):
+                        elif c=='^':
+                        # elif cell.startswith('^'):
                             cell = cell[1:]
                             r,ct = peel_uint(cell,0)
                             if self.showtext:

textbeat/schedule.py

@@ -53,8 +53,8 @@ async def logic(self, t):
         # log(self.clock)
 
         pending_events_count = sum(1 for e in self.events if e.t > 0.0 and e.t < 2.0)
-        print(pending_events_count)
-        
+        # print(pending_events_count)
+
         try:
             self.events = sorted(self.events, key=lambda e: e.t)
             for ev in self.events:

textbeat/track.py

@@ -2,8 +2,8 @@
 import math
 
 class Recording(object):
-    def __init__(self, name, slot):
-        self.name = slot
+    def __init__(self, name):
+        self.name = name
         self.content = []
 
 class Tuplet(object):
@@ -90,8 +90,9 @@ def reset(self):
         # self.muted = False
         self.volval = 1.0
         self.slots = {} # slot -> Recording
+        self.recording_slots = set() # slots currently recording
         self.slot = None # careful, this can be 0
-        self_slot_idx = 0
+        self.slot_idx = 0
         self.lane = None
         self.lanes = []
         self.ccs = {}
@@ -103,6 +104,15 @@ def reset(self):
         self.vibrato_freq = 0.0 
         # self.vibrato_offset = 0.0 # value that gets added to pitch
 
+    def record(self, label):
+        self.slots[label] = Recording(label)
+        self.recording_slots.add(label)
+    def record_stop(self, label):
+        self.recording_slots.remove(label)
+    def recording(self):
+        return self.recording_slots
+    def replay(self, label):
+        pass
     def vibrato(self, b, amp=0.0, freq=0.0):
         self.vibrato_amp = amp
         self.vibrato_freq = freq