more wip on midi support, trivial fixes, comments

Author: flipcoder

textbeat/__main__.py

@@ -43,7 +43,7 @@
     --flats               prefer flats in output (default)
     --sharps              prefer sharps in output
     --lint                (STUB) analyze file
-    --follow              (old) print newlines every line, no output
+    --follow              tracks file output for editors by printing newlines every line
     --quiet               no output
     -a --analyze          (STUB) midi input chord analyzer
 """
@@ -55,7 +55,8 @@
 def main():
 # if __name__!='__main__':
 #     sys.exit(0)
-    ARGS = docopt(__doc__.replace('textbeat',os.path.basename(sys.argv[0]).lower()))
+    # ARGS = docopt(__doc__.replace('textbeat',os.path.basename(sys.argv[0]).lower()))
+    ARGS = docopt(__doc__)
     set_args(ARGS)
 
     from . import support

textbeat/player.py

@@ -201,6 +201,8 @@ def has_flags(self, f):
             return
         return self.flags & f
 
+    # for editor integration: "follows" the output of the file by printing
+    #   newlines to stdout for every parsed line
     def follow(self):
         if self.startrow==-1 and self.canfollow:
             cursor = self.row + 1
@@ -226,6 +228,13 @@ def run(self):
         self.header = True
         embedded_file = False
 
+        # set initial midifile tempo
+        if not self.midifile.tracks:
+            self.midifile.tracks.append(mido.MidiTrack())
+        self.midifile.tracks[0].append(mido.MetaMessage(
+            'set_tempo', tempo=mido.bpm2tempo(self.tempo)
+        ))
+        
         while not self.quitflag:
             self.follow()
 
@@ -695,15 +704,15 @@ def run(self):
 
                     cell = cell.strip()
                     if cell:
-                        self.header = False
+                        self.header = False # contents here, no longer in file header
 
                     if cell.count('\"') == 1: # " is recall, but multiple " means lyrics/speak?
                         cell = cell.replace("\"", self.track_history[cell_idx])
                     else:
                         self.track_history[cell_idx] = cell
 
                     fullcell_sub = cell[:]
-                    
+
                     # empty
                     # if not cell:
                     #     cell_idx += 1
@@ -821,7 +830,9 @@ def run(self):
                             # try to get roman numberal or number
                             c,ct = peel_roman_s(tok)
                             ambiguous = 0
-                            for amb in ('ion','dor','dim','dom','alt','dou','egy','aeo','dia','gui','bas','aug'): #  TODO: make these auto
+                            # Help parser ambiguities (TODO: make these automatic)
+                            # (These are names that begin with letters or roman numerals)
+                            for amb in ('ion','dor','dim','dom','alt','dou','egy','aeo','dia','gui','bas','aug'):
                                 ambiguous += tok.lower().startswith(amb)
                             if ct and not ambiguous:
                                 lower = (c.lower()==c)

textbeat/schedule.py

@@ -61,8 +61,8 @@ def logic(self, t):
 
             slp = t*(1.0-self.passed) # remaining time
             if slp > 0.0:
+                self.ctx.t += self.ctx.speed*slp
                 if self.ctx.cansleep and self.ctx.startrow == -1:
-                    self.ctx.t += self.ctx.speed*slp
                     time.sleep(self.ctx.speed*slp)
             self.passed = 0.0
 

textbeat/track.py

@@ -1,4 +1,5 @@
 from .defs import *
+import math
 
 class Recording(object):
     def __init__(self, name, slot):
@@ -42,7 +43,8 @@ def __init__(self, ctx, idx, midich):
         self.reset()
     def us(self):
         # microseconds
-        return int(self.ctx.t)*1000000
+        # return int(self.ctx.t)*1000000
+        return math.floor(mido.second2tick(self.ctx.t, self.ctx.grid, self.ctx.tempo))
     def reset(self):
         Lane.reset(self)
         self.mode = 0 # 0 is NONE which inherits global mode
@@ -144,6 +146,7 @@ def midifile_write(self, ch, msg):
         # ch: midi channel index, not midi channel # (index 0 of self.channels tuple item)
         while ch >= len(self.ctx.midifile.tracks):
             self.ctx.midifile.tracks.append(mido.MidiTrack())
+        # print(msg)
         self.ctx.midifile.tracks[ch].append(msg)
     def enable(self, v=True):
         was = v