working on vibrato pitch wheel oscillation, and improving scheduler

Author: flipcoder

textbeat/player.py

@@ -85,6 +85,7 @@ def __init__(self):
         self.version = '0'
         self.auto = False
         self.embedded_files = {}
+        self.vibrato_tracks = set() # tracks that currently have vibrato going
 
         # require enable at top of file
         self.devices = ['midi']

textbeat/schedule.py

@@ -37,7 +37,6 @@ def logic(self, t):
         # self.dontsleep = (clock - self.last_clock)
         # self.last_clock = clock
 
-        # clock = time.clock()
         # if self.started:
         #     tdelta = (clock - self.passed)
         #     self.passed += tdelta
@@ -48,6 +47,9 @@ def logic(self, t):
         #     self.passed = 0.0
         # 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)
+        
         try:
             self.events = sorted(self.events, key=lambda e: e.t)
             for ev in self.events:

textbeat/track.py

@@ -96,6 +96,34 @@ def reset(self):
         self.lanes = []
         self.ccs = {}
         self.dev = 0
+        
+        # pitch wheel oscillation
+        self.vibrato_enabled = False # don't set this directly, call vibrato()
+        self.vibrato_amp = 0.0
+        self.vibrato_freq = 0.0 
+        # self.vibrato_offset = 0.0 # value that gets added to pitch
+
+    def vibrato(self, b, amp=0.0, freq=0.0):
+        self.vibrato_amp = amp
+        self.vibrato_freq = freq
+        self.vibrato_t = 0.0
+        if b == self.vibrato_enabled:
+            return
+        if b:
+            try:
+                self.ctx.vibrato_tracks.remove(self)
+            except KeyError:
+                pass
+        else:
+            self.ctx.vibrato_tracks.add(self)
+        self.pitch(self.pitchval)
+        self.vibrato_enabled = b
+
+    def vibrato_logic(self, t):
+        # TODO: test this
+        self.vibrato_t += t
+        v = math.sin(self.vibrato_t * self.vibrato_freq * math.tau) * self.vibrato_amp
+        self.pitch(self.pitchval + v, False) # don't save new pitchval on call
 
     # def _lazychannelfunc(self):
     #     # get active channel numbers
@@ -263,27 +291,27 @@ def midi_channel(self, midich, stackidx=-1):
             self.channels = [(0,midich)]
         elif midich not in self.channels:
             self.channels.append(midich)
-    def pitch(self, val): # [-1.0,1.0]
+    def write_short(self, ch, status, val, val2):
+        if self.ctx.midifile:
+            self.midifile_write(ch,mido.UnknownMetaMessage(status,data=[val,val2], time=self.us()))
+        else:
+            self.midi[ch].write_short(status,val,val2)
+    def pitch(self, val, save=True): # [-1.0,1.0]
+        if save:
+            self.pitchval = val
         val = min(max(0,int((1.0 + val)*0x2000)),16384)
-        self.pitchval = val
         val2 = (val>>0x7f)
         val = val&0x7f
         for ch in self.channels:
             status = (MIDI_PITCH<<4) + ch[1]
             if self.ctx.showmidi: log(FG.YELLOW + 'MIDI: PITCH (%s, %s)' % (val,val2))
-            if self.ctx.midifile:
-                self.midifile_write(ch[0],mido.UnknownMetaMessage(status,data=[val1,val2], time=self.us()))
-            else:
-                self.midi[ch[0]].write_short(status,val,val2)
+            self.write_short(ch[0], status, val, val2)
     def cc(self, cc, val): # control change
         if type(val) ==type(bool): val = 127 if val else 0 # allow cc bool switches
         for ch in self.channels:
             status = (MIDI_CC<<4) + ch[1]
             if self.ctx.showmidi: log(FG.YELLOW + 'MIDI: CC (%s, %s, %s)' % (status, cc,val))
-            if self.ctx.midifile:
-                self.midifile_write(ch[0], mido.UnknownMetaMessage(status,data=[cc,val],time=self.us()))
-            else:
-                self.midi[ch[0]].write_short(status,cc,val)
+            self.write_short(ch[0], status, cc, val)
             self.ccs[cc] = v
         if cc==1:
             self.modval = val