comparison implementations/midi/midifile-import.lisp @ 212:619194befdd4

add identifier and timebase slots to midifile composition class

Ignore-this: 4e72a0860344399452bea196c3739bbf

darcs-hash:20090524150506-16a00-bce845ccf20a9289a4015fb58287f25ebfa178ad.gz

committer: Jamie Forth <[e-mail]>

   "Creates an identifier for MIDI files, based on a pathname"
   (make-instance 'midifile-identifier :path pathname))
 
 (defmethod get-composition ((identifier midifile-identifier))
   (%initialise-midifile-composition (midi:read-midi-file
-				     (midifile-identifier-pathname identifier))))
+				     (midifile-identifier-pathname identifier))
+				    identifier))
 
-(defun %initialise-midifile-composition (midifile)
+(defun %initialise-midifile-composition (midifile identifier)
   ;; Takes a midifile object (from the "MIDI" package)
   ;; and returns an amuse midi object
   ;; FIXME: gets it wrong if patch changes in mid-note
   ;; FIXME: assumes controllers are global in scope and location
   (let ((tracks (midi:midifile-tracks midifile))

 				      :time-signatures (if time-sigs
 							   (sort time-sigs #'time<)
 							   (list (make-standard-time-signature-period
 								  4 4 0 (/ last-time division))))
 				      :tempi (sort tempi #'time<)
-				      :key-signatures (sort key-sigs #'time<))))
+				      :key-signatures (sort key-sigs #'time<)
+				      :identifier identifier
+				      :midi-timebase division)))
       (sequence:adjust-sequence composition
 				(length notes)
 				:initial-contents (sort notes #'time<)))))
 
 (defun make-event-from-on-off-pair (note-on cut-off divisions track patch)