-h fix, small changes for midifile support (not yet done)

Author: flipcoder

textbeat/__main__.py

@@ -9,9 +9,9 @@
     textbeat song.txbt        play song
 
 Usage:
-    textbeat [--dev=<device>] [--midi=<fn>] [--ring] [--follow] [--stdin] [-adeftnpsrxhvL] [INPUT]
-    textbeat [+RANGE] [--dev=<device> | --midi=<fn> | --ring | --follow | --stdin] [-adeftnpsrxhvL] [INPUT]
-    textbeat [-rT]
+    textbeat [--dev=<device>] [--midi=<fn>] [--ring] [--follow] [--stdin] [-adeftnpsrxvL] [INPUT]
+    textbeat [+RANGE] [--dev=<device>] [--midi=<fn>] [--ring] [--follow] [--stdin] [-adeftnpsrxL] [INPUT]
+    textbeat [-rhT]
     textbeat -c [COMMANDS ...]
     textbeat -l [LINE_CONTENT ...]
 
@@ -36,7 +36,7 @@
     +<range>              play from line or maker, for range use start:end
     -e --edit             (STUB) open file in editor
     --vi                  (STUB) shell vi mode
-    -h --transpose        transpose (in half steps)
+    -H --transpose        transpose (in half steps)
     --sustain             start with sustain enabled
     --numbers             use note numbers in output
     --notenames           use note names in output
@@ -55,7 +55,7 @@
 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()))
     set_args(ARGS)
 
     from . import support
@@ -86,6 +86,7 @@ def main():
             elif arg == '--midi':
                 midifn = val
                 player.midifile = mido.MidiFile()
+                player.cansleep = False
             elif arg == '--grid': player.grid = float(val)
             elif arg == '--note': player.grid = float(val)/4.0
             elif arg == '--speed': player.speed = float(val)

textbeat/player.py

@@ -511,6 +511,15 @@ def run(self):
                                     else: assert False # no such var
                                 else: assert False # no such op
 
+                                if var=='T':
+                                    if self.midifile:
+                                        if not self.midifile.tracks:
+                                            self.midifile.tracks.append(mido.MidiTrack())
+                                        # self.midifile.tracks[0].append(mido.MetaMessage(
+                                        #     'set_tempo', tempo=mido.bpm2tempo(int(
+                                        #         val.split('x')[0]
+                                        #     ))
+                                        # ))
                         self.row += 1
                         continue
 

textbeat/track.py

@@ -40,6 +40,9 @@ def __init__(self, ctx, idx, midich):
         self.initial_channel = midich
         self.non_drum_channel = midich
         self.reset()
+    def us(self):
+        # microseconds
+        return int(self.ctx.t)*1000000
     def reset(self):
         Lane.reset(self)
         self.mode = 0 # 0 is NONE which inherits global mode
@@ -179,13 +182,14 @@ def note_on(self, n, v=-1, sustain=False):
             if self.ctx.showmidi: log(FG.YELLOW + 'MIDI: NOTE ON (%s, %s, %s)' % (n,v,ch))
             if (not self.ctx.muted or (self.ctx.muted and self.soloed))\
                 and self.enabled and self.ctx.startrow==-1:
-                self.midi[ch[0]].note_on(n,v,ch[1])
                 if self.ctx.midifile:
                     while ch[0] >= len(self.ctx.midifile.tracks):
                         self.ctx.midifile.tracks.append(mido.MidiTrack())
                     self.ctx.midifile.tracks[ch[0]].append(mido.Message(
-                        'note_on',velocity=v,time=int(self.ctx.t),channel=ch[1]
+                        'note_on',note=n,velocity=v,time=self.us(),channel=ch[1]
                     ))
+                else:
+                    self.midi[ch[0]].note_on(n,v,ch[1])
     def note_off(self, n, v=-1):
         if v == -1:
             v = self.vel
@@ -195,10 +199,21 @@ def note_off(self, n, v=-1):
             # log("off " + str(n))
             for ch in self.channels:
                 if self.ctx.showmidi: log(FG.YELLOW + 'MIDI: NOTE OFF (%s, %s, %s)' % (n,v,ch))
-                self.midi[ch[0]].note_on(self.notes[n],0,ch[1])
-                self.midi[ch[0]].note_off(self.notes[n],v,ch[1])
+                if not self.ctx.midifile:
+                    self.midi[ch[0]].note_on(self.notes[n],0,ch[1])
+                    self.midi[ch[0]].note_off(self.notes[n],v,ch[1])
                 self.notes[n] = 0
                 self.sustain_notes[n] = 0
+                if self.ctx.midifile:
+                    while ch[0] >= len(self.ctx.midifile.tracks):
+                        self.ctx.midifile.tracks.append(mido.MidiTrack())
+                    self.ctx.midifile.tracks[ch[0]].append(mido.Message(
+                        'note_on',note=n,velocity=0,time=self.us(),channel=ch[1]
+                    ))
+                    self.ctx.midifile.tracks[ch[0]].append(mido.Message(
+                        'note_off',note=n,velocity=v,time=self.us(),channel=ch[1]
+                    ))
+
             self.cc(MIDI_SUSTAIN_PEDAL, True)
     def release_all(self, mute_sus=False, v=-1):
         if v == -1: