X-Git-Url: https://git.ao2.it/vidi-player.git/blobdiff_plain/4ed04d98bb6205b3d96ab924991a1adc7a9465f3..bd98d9d7d32db90eaf80ecfea74fe6804ffb7740:/vidi-player.py?ds=inline

diff --git a/vidi-player.py b/vidi-player.py
index 04c8941..7cec441 100755
--- a/vidi-player.py
+++ b/vidi-player.py
@@ -62,10 +62,10 @@ def timeline_from_midi(midi_file, video_font_path):
         elif is_note_off(msg) and msg.channel == 0:
             note = vidi.MidiNote(msg.note)
             duration = elapsed_time - start_time
-            print("Note name: %s start_time: %f duration: %f" %
+            print("Note name: %3s start_time: %f duration: %f" %
                   (note.name, start_time, duration))
 
-            video_sample_path = "%s/sample_%s.mkv" % (video_font_path, note.name)
+            video_sample_path = "%s/sample_%s.webm" % (video_font_path, note.name)
 
             timeline.add_clip(video_sample_path, start_time, duration)
 
@@ -86,16 +86,20 @@ def main():
         usage()
         return 1
 
-    midi_file = mido.MidiFile(sys.argv[1])
+    if not os.path.isdir(sys.argv[2]):
+        sys.stderr.write("The second argument must be the path of the videofont directory\n")
+        usage()
+        return 1
 
-    overlapping_notes = check_overlapping_notes(midi_file)
-    if overlapping_notes:
-        sys.stderr.write("Sorry, supporting only midi file with no overlapping notes")
+    if len(sys.argv) > 3 and os.path.exists(sys.argv[3]):
+        sys.stderr.write("File '%s' exists, exiting!\n" % sys.argv[3])
         return 1
 
-    if not os.path.isdir(sys.argv[2]):
-        sys.stderr.write("The second argument must be the path of the videofont directory")
-        usage()
+    midi_file = mido.MidiFile(sys.argv[1])
+
+    overlapping_notes = check_overlapping_notes(midi_file, 0)
+    if overlapping_notes:
+        sys.stderr.write("Sorry, supporting only midi file with no overlapping notes on channel 0\n")
         return 1
 
     video_font_path = os.path.realpath(sys.argv[2])
@@ -105,7 +109,11 @@ def main():
     if len(sys.argv) > 3:
         timeline.save(sys.argv[3])
     else:
-        timeline.play()
+        try:
+            timeline.play()
+        except KeyboardInterrupt:
+            timeline.stop()
+            return 1
 
 
 if __name__ == "__main__":