Merge pull request #37 from svsdval/cleanup

Lot of C0rn3j work to cleanup video2midi =)
svsdval · Apr 19, 2023 · a6be7c3 · a6be7c3
2 parents 7568d49 + 41184d4
commit a6be7c3
Show file tree

Hide file tree

Showing 37 changed files with 1,634 additions and 1,637 deletions.
diff --git a/docs/frame47.jpg b/docs/frame47.jpg
diff --git a/docs/gnu_linux_install/var1/1.png b/docs/gnu_linux_install/var1/1.png
diff --git a/docs/gnu_linux_install/var1/10.png b/docs/gnu_linux_install/var1/10.png
diff --git a/docs/gnu_linux_install/var1/2.png b/docs/gnu_linux_install/var1/2.png
diff --git a/docs/gnu_linux_install/var1/3.png b/docs/gnu_linux_install/var1/3.png
diff --git a/docs/gnu_linux_install/var1/4.png b/docs/gnu_linux_install/var1/4.png
diff --git a/docs/gnu_linux_install/var1/5.png b/docs/gnu_linux_install/var1/5.png
diff --git a/docs/gnu_linux_install/var1/6.png b/docs/gnu_linux_install/var1/6.png
diff --git a/docs/gnu_linux_install/var1/7.png b/docs/gnu_linux_install/var1/7.png
diff --git a/docs/gnu_linux_install/var1/8.png b/docs/gnu_linux_install/var1/8.png
diff --git a/docs/gnu_linux_install/var1/9.png b/docs/gnu_linux_install/var1/9.png
diff --git a/docs/gnu_linux_install/var2/1.png b/docs/gnu_linux_install/var2/1.png
diff --git a/docs/gnu_linux_install/var2/2.png b/docs/gnu_linux_install/var2/2.png
diff --git a/docs/gnu_linux_install/var2/3.png b/docs/gnu_linux_install/var2/3.png
diff --git a/docs/gnu_linux_install/var2/4.png b/docs/gnu_linux_install/var2/4.png
diff --git a/docs/gnu_linux_install/var2/5.png b/docs/gnu_linux_install/var2/5.png
diff --git a/docs/gnu_linux_install/var2/6.png b/docs/gnu_linux_install/var2/6.png
diff --git a/docs/gnu_linux_install/var2/7.png b/docs/gnu_linux_install/var2/7.png
diff --git a/docs/gnu_linux_install/var2/8.png b/docs/gnu_linux_install/var2/8.png
diff --git a/docs/gnu_linux_install/var2/9.png b/docs/gnu_linux_install/var2/9.png
diff --git a/docs/macos_install/macos_step_001.png b/docs/macos_install/macos_step_001.png
diff --git a/docs/macos_install/macos_step_002.png b/docs/macos_install/macos_step_002.png
diff --git a/docs/macos_install/macos_step_003.png b/docs/macos_install/macos_step_003.png
diff --git a/docs/macos_install/macos_step_004.png b/docs/macos_install/macos_step_004.png
diff --git a/docs/macos_install/macos_step_005.png b/docs/macos_install/macos_step_005.png
diff --git a/docs/macos_install/macos_step_006.png b/docs/macos_install/macos_step_006.png
diff --git a/docs/macos_install/macos_step_007.png b/docs/macos_install/macos_step_007.png
diff --git a/docs/mainwindow.png b/docs/mainwindow.png
diff --git a/docs/manual/snap_to_grid_on1.png b/docs/manual/snap_to_grid_on1.png
diff --git a/docs/manual/use_sparks_off_result.png b/docs/manual/use_sparks_off_result.png
diff --git a/docs/manual/use_sparks_on_result.png b/docs/manual/use_sparks_on_result.png
diff --git a/docs/multichannel.png b/docs/multichannel.png
diff --git a/v2m.py b/v2m.py
diff --git a/video2midi/gl.py b/video2midi/gl.py
diff --git a/video2midi/midi.py b/video2midi/midi.py
@@ -1,5 +1,5 @@
 from midiutil.MidiFile import MIDIFile
-import os;
+import os
 
 class midinotes:
   def __init__(self, midi_file_format):
@@ -8,13 +8,13 @@ def __init__(self, midi_file_format):
     self.miditrackname = "Sample Track"
     self.tempo = 0
     self.track = 0
-    self.midi_file_format = int(midi_file_format);
-    print("initialize midifile...");
+    self.midi_file_format = int(midi_file_format)
+    print("initialize midifile...")
     self.mf = MIDIFile(1,file_format=self.midi_file_format,
           removeDuplicates=True,
           deinterleave=False,
           adjust_origin=False)
-    print("initialize midifile done.");
+    print("initialize midifile done.")
 
   def addNote(self,track, channel, note, start_time, duration, volume ):
     self.notes.append( {'track' : track, 'channel' : channel, 'note' : note, 'start_time' : start_time, 'duration' : duration, 'volume' : volume } )
@@ -54,9 +54,9 @@ def save_to_disk(self, filename):
   def save_to_disk_per_channel(self, filename):
     if len(self.notes) < 1:
       return 0, "No notes to save.."
-    fname,ext =os.path.splitext(filename);
+    fname,ext =os.path.splitext(filename)
     for channel in range(16):
-      cnt=0;
+      cnt=0
       #
       print( " processing channel %s"  % channel )
       self.mf = MIDIFile(1,file_format=self.midi_file_format)
@@ -74,5 +74,5 @@ def save_to_disk_per_channel(self, filename):
             self.mf.writeFile(outf)
         except Exception as E:
           print("Error on save to disk:%s"% E)
-      #  
+      #
     return 1, "Saved to disk: %s_channel_[1..16]%s " % (fname,ext)
diff --git a/video2midi/prefs.py b/video2midi/prefs.py
@@ -11,7 +11,7 @@ class prefs:
     minimal_duration = 0.1
     ignore_minimal_duration = False
 
-    keyp_delta = 90; # sensitivity
+    keyp_delta = 90 # sensitivity
 
     octave = 3
     tempo = 120
@@ -24,10 +24,10 @@ class prefs:
 
     use_alternate_keys = False
     rollcheck = False
-    rollcheck_priority = 0;
+    rollcheck_priority = 0
 
-    keyp_colors_channel =      [ 0,0, 1,1, 2,2, 3,3, 4,4, 5,5, 6,6, 7,7, 8,8, 9,9, 10,10, 11,11 ]; # MIDI channel per color
-    keyp_colors_channel_prog = [ 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0,  0, 0,  0, 0 ]; # MIDI program ID per channel
+    keyp_colors_channel =      [ 0,0, 1,1, 2,2, 3,3, 4,4, 5,5, 6,6, 7,7, 8,8, 9,9, 10,10, 11,11 ] # MIDI channel per color
+    keyp_colors_channel_prog = [ 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0,  0, 0,  0, 0 ] # MIDI program ID per channel
 
     xoffset_whitekeys = 60
     yoffset_whitekeys = 673
@@ -47,7 +47,7 @@ class prefs:
     [255,212,85 ], [255,138,  0],
     #L.RED           D.RED
     [253,125,114], [255, 37,  9],
-    #EMPTY 
+    #EMPTY
     [0  ,  0,  0], [  0,  0,  0],
     [0  ,  0,  0], [  0,  0,  0],
     [0  ,  0,  0], [  0,  0,  0],
@@ -56,17 +56,17 @@ class prefs:
     [0  ,  0,  0], [  0,  0,  0],
     [0  ,  0,  0], [  0,  0,  0]
     # .....
-    ];
+    ]
     keyp_colors_sparks_sensitivity = [50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50]
 
     keys_pos=[]
-    keys_angle = 90;
+    keys_angle = 90
     #
-    use_percolor_delta=False;
+    use_percolor_delta=False
     #
-    percolor_delta=[90]*20;
-    autoclose = 1;
-    sync_notes_start_pos = False;
-    sync_notes_start_pos_time_delta = 1000;
-    save_to_disk_message = "";
-    save_to_disk_per_channel = False;
+    percolor_delta=[90]*20
+    autoclose = 1
+    sync_notes_start_pos = False
+    sync_notes_start_pos_time_delta = 1000
+    save_to_disk_message = ""
+    save_to_disk_per_channel = False