merge py-overlapping-methods

jamesa08 · Aug 29, 2024 · ded5715 · ded5715
2 parents e1d2c70 + 83e22c2
commit ded5715
Show file tree

Hide file tree

Showing 4 changed files with 295 additions and 86 deletions.
diff --git a/MIDIAnimator/__init__.py b/MIDIAnimator/__init__.py
@@ -14,10 +14,10 @@
 from __future__ import annotations
 
 bl_info = {
-    "name": "MIDIAnimator beta4.0",
+    "name": "MIDIAnimator beta4.1",
     "description": "A cohesive, open-source solution to animating Blender objects using a MIDI file.",
     "author": "James Alt (et al.)",
-    "version": (1, 0, 0),
+    "version": (0, 4, 1),
     "blender": (3, 0, 0),
     "location": "Scripting Space",
     "doc_url": "https://midianimatordocs.readthedocs.io/en/latest/",

diff --git a/MIDIAnimator/data_structures/midi.py b/MIDIAnimator/data_structures/midi.py
@@ -291,7 +291,6 @@ def _parseMIDI(self, file: str) -> List[MIDITrack]:
                     tempo = msg.tempo
                     tempoMap.append((time, msg.tempo))
 
-            print(tempoMap)
         for track in midiFile.tracks:
             time = 0
             tempo = 500000
@@ -308,7 +307,6 @@ def _parseMIDI(self, file: str) -> List[MIDITrack]:
 
             for msg in mido.merge_tracks([track]):
                 time += mido.tick2second(msg.time, midiFile.ticks_per_beat, tempo)
-                print(time)
                 curType = msg.type
 
                 # channel messages