X-Git-Url: https://git.ao2.it/vidi-player.git/blobdiff_plain/4ed04d98bb6205b3d96ab924991a1adc7a9465f3..4cd0a64f760b6138a62141c087da38a1b787ac5b:/vidi-player.py

diff --git a/vidi-player.py b/vidi-player.py
index 04c8941..8fcabc4 100755
--- a/vidi-player.py
+++ b/vidi-player.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# vidi-player - generate GStreamer Editing Services timelines from midi
+# vidi-player - play video samples interactively from a midi file
 #
 # Copyright (C) 2016  Antonio Ospite <ao2@ao2.it>
 #
@@ -17,63 +17,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
 import os
 import sys
-import mido
 import vidi
 
 
-def is_note(msg):
-    return msg.type == 'note_on' or msg.type == 'note_off'
-
-
-def is_note_on(msg):
-    return msg.type == 'note_on' and msg.velocity > 0
-
-
-def is_note_off(msg):
-    return ((msg.type == 'note_on' and msg.velocity == 0) or
-            (msg.type == 'note_off'))
-
-
-def check_overlapping_notes(midi_file):
-    previous_note_on = False
-    for msg in midi_file:
-        if is_note_on(msg) and msg.channel == 0:
-            if previous_note_on:
-                return True
-
-            previous_note_on = True
-        elif is_note_off(msg) and msg.channel == 0:
-            previous_note_on = False
-
-    return False
-
-
-def timeline_from_midi(midi_file, video_font_path):
-    timeline = vidi.Timeline()
-
-    elapsed_time = 0
-    start_time = 0
-    for msg in midi_file:
-        elapsed_time += msg.time
-        if is_note_on(msg) and msg.channel == 0:
-            start_time = elapsed_time
-        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" %
-                  (note.name, start_time, duration))
-
-            video_sample_path = "%s/sample_%s.mkv" % (video_font_path, note.name)
-
-            timeline.add_clip(video_sample_path, start_time, duration)
-
-    return timeline
-
-
 def usage():
-    print("usage: %s <midi_file> <videofont_directory> [<destination_file>]"
+    print("usage: %s <midi_file> <videofont_directory>"
           % os.path.basename(sys.argv[0]))
 
 
@@ -86,27 +37,15 @@ def main():
         usage()
         return 1
 
-    midi_file = mido.MidiFile(sys.argv[1])
-
-    overlapping_notes = check_overlapping_notes(midi_file)
-    if overlapping_notes:
-        sys.stderr.write("Sorry, supporting only midi file with no overlapping notes")
-        return 1
-
     if not os.path.isdir(sys.argv[2]):
-        sys.stderr.write("The second argument must be the path of the videofont directory")
+        sys.stderr.write("The second argument must be the path of the videofont directory\n")
         usage()
         return 1
 
     video_font_path = os.path.realpath(sys.argv[2])
-
-    timeline = timeline_from_midi(midi_file, video_font_path)
-
-    if len(sys.argv) > 3:
-        timeline.save(sys.argv[3])
-    else:
-        timeline.play()
+    sampler = vidi.FileSampler(video_font_path, sys.argv[1])
+    sampler.play()
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     sys.exit(main())