Mercurial > hg > amuse

diff utils/utils.lisp @ 144:70c716a6eb72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implementations/midi/: add and export make-midifile-identifier darcs-hash:20070924113352-c0ce4-784da935f20dcfda828184780e37f5d961ca8390.gz
author Marcus Pearce <m.pearce@gold.ac.uk>
date Mon, 24 Sep 2007 12:33:52 +0100
parents f4e7892c017f
children
line wrap: on
line diff
--- 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))