comparison implementations/midi/midifile-import.lisp @ 206:1f3873585a5d

Change midifile-import to call event constructors, not make-instance
directly.

 (defun make-event-from-on-off-pair (note-on cut-off divisions track patch)
   (cond
     ((or (= (midi:message-channel note-on) 9)
 	 (> patch 111))
      ;; percussive
-     (make-instance 'midi-percussive-event
-		    :channel (1+ (midi:message-channel note-on))
-		    :track track
-		    :time (/ (midi:message-time note-on) divisions)
-		    :interval (/ (- cut-off (midi:message-time note-on))
-				 divisions)
-		    :velocity (midi:message-velocity note-on)
-		    :patch patch
-		    :sound (midi:message-key note-on)))
+     (make-midi-percussive-event (midi:message-key note-on)
+				 (midi:message-velocity note-on)
+				 patch
+				 (1+ (midi:message-channel note-on))
+				 track
+				 (/ (midi:message-time note-on) divisions)
+				 (/ (- cut-off (midi:message-time note-on))
+				    divisions)))
     (t
      ;; pitched
-     (make-instance 'midi-pitched-event
-		    :channel (1+ (midi:message-channel note-on))
-		    :track track
-		    :time (/ (midi:message-time note-on) divisions)
-		    :interval (/ (- cut-off (midi:message-time note-on))
-				 divisions)
-		    :velocity (midi:message-velocity note-on)
-		    :patch patch
-		    :number (midi:message-key note-on)))))
+     (make-midi-pitched-event (midi:message-key note-on)
+			      (midi:message-velocity note-on)
+			      patch
+			      (1+ (midi:message-channel note-on))
+			      track
+			      (/ (midi:message-time note-on) divisions)
+			      (/ (- cut-off (midi:message-time note-on))
+				 divisions)))))