# HG changeset patch
# User Marcus Pearce <m.pearce@gold.ac.uk>
# Date 1190633632 -3600
# Node ID 70c716a6eb72a7a6e9fa354ce3f7d03e0536ec0d
# Parent  b753a56c373b2031e3ea38064c5c348dd8eb5312
implementations/midi/: add and export make-midifile-identifier

darcs-hash:20070924113352-c0ce4-784da935f20dcfda828184780e37f5d961ca8390.gz

diff -r b753a56c373b -r 70c716a6eb72 implementations/midi/constructors.lisp
--- a/implementations/midi/constructors.lisp	Tue Sep 11 11:39:04 2007 +0100
+++ b/implementations/midi/constructors.lisp	Mon Sep 24 12:33:52 2007 +0100
@@ -1,5 +1,8 @@
 (cl:in-package #:amuse-midi)
 
+(defun make-midifile-identifier (pathname)
+  (make-instance 'midifile-identifier :path pathname))
+
 (defun make-midi-pitched-event (pitch-number velocity patch
 				channel track onset duration)
   (make-instance 'midi-pitched-event
diff -r b753a56c373b -r 70c716a6eb72 implementations/midi/package.lisp
--- a/implementations/midi/package.lisp	Tue Sep 11 11:39:04 2007 +0100
+++ b/implementations/midi/package.lisp	Mon Sep 24 12:33:52 2007 +0100
@@ -6,6 +6,7 @@
            #:midi-percussive-event
            #:make-midi-pitched-event
            #:make-midi-percussive-event
+           #:make-midifile-identifier
 	   #:midi-channel
 	   #:midi-track
 	   #:midi-velocity
diff -r b753a56c373b -r 70c716a6eb72 utils/utils.lisp
--- a/utils/utils.lisp	Tue Sep 11 11:39:04 2007 +0100
+++ b/utils/utils.lisp	Mon Sep 24 12:33:52 2007 +0100
@@ -34,7 +34,7 @@
       (incf s (if (disjoint tempo object1)
 		  0
 		  (* (/ (duration (period-intersection tempo object1))
-			(duration (crotchet constituent)))
+			(duration (crotchet object2)))
 		     (amuse:microseconds-per-crotchet tempo)))))))
 (defmethod beats-to-seconds ((object1 standard-moment)
 			     (object2 constituent))