Merge branch 'develop' into vjp/refactor-player-pt2

Author: Vance Palacio

.gitignore

@@ -8,3 +8,6 @@ clean.sh
 *.old
 *.pyc
 lint.txt
+debug/*.midi
+debug/*.txbt
+examples/*.midi

CONTRIBUTORS

@@ -0,0 +1,5 @@
+Grady O'Connell <[email protected], GitHub: flipcoder>
+Vance Palacio <GitHub: vanceism7>
+David Briscoe <GitHub: idbrii>
+cuppajoeman <GitHub: cuppajoeman>
+Christian Clauss <GitHub: cclauss>

debug/debug.py

@@ -0,0 +1,10 @@
+#!/usr/bin/python3
+import sys
+from mido import MidiFile
+
+mid = MidiFile(sys.argv[1])
+for i, track in enumerate(mid.tracks):
+    print("Track", str(i))
+    for msg in track:
+        print(msg)
+

textbeat/player.py

@@ -261,15 +261,14 @@ def pause(self):
             return False
         return True
 
-    def write_midi_tempo(self):
+    def write_midi_tempo(self, tempo=None):
         # set initial midifile tempo
         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(self.tempo)
+                'set_tempo', tempo=mido.bpm2tempo(tempo or self.tempo)
             ))
-
 
     async def run(self):
         for ch in self.tracks:
@@ -1981,13 +1980,6 @@ def adjustOperands(val: str, op:str) -> tuple[str,str]:
                 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.write_midi_tempo(int(val.split('x')[0]))
         self.row += 1
         return LoopResult.CONTINUE