# HG changeset patch
# User David Lewis <d.lewis@gold.ac.uk>
# Date 1190116192 -3600
# Node ID ebfe054eea1c73d01eb33bfa08cf4e507eb80ee5
# Parent  b3537f75c1c61e897dd281bb728b0c51a1abbf31
Bug fixes from name changes

darcs-hash:20070918114952-f76cc-feb59725a2f67edd6242947a5c2311d0a724cc43.gz

diff -r b3537f75c1c6 -r ebfe054eea1c base/constructors.lisp
--- a/base/constructors.lisp	Mon Sep 03 16:08:24 2007 +0100
+++ b/base/constructors.lisp	Tue Sep 18 12:49:52 2007 +0100
@@ -5,7 +5,7 @@
 (defun make-standard-moment (time)
   "Returns a new standard-moment, taking a number as input for
 the time point."
-  (make-instance 'moment :time time))
+  (make-instance 'standard-moment :time time))
 
 ;; N.B. period should never be constructed directly - it's either
 ;; floating or anchored or some other subclass.
diff -r b3537f75c1c6 -r ebfe054eea1c base/generics.lisp
--- a/base/generics.lisp	Mon Sep 03 16:08:24 2007 +0100
+++ b/base/generics.lisp	Tue Sep 18 12:49:52 2007 +0100
@@ -196,7 +196,7 @@
   anchored-period to a moment"))
 
 (defgeneric onset (anchored-period)
-  (:method (apd) (moment apd))
+  (:method (ap) (moment ap))
   (:documentation "Return a moment for the start of an anchored period"))
 (defgeneric (setf onset) (value anchored-period))
 
diff -r b3537f75c1c6 -r ebfe054eea1c implementations/geerdes/methods.lisp
--- a/implementations/geerdes/methods.lisp	Mon Sep 03 16:08:24 2007 +0100
+++ b/implementations/geerdes/methods.lisp	Tue Sep 18 12:49:52 2007 +0100
@@ -148,7 +148,7 @@
   (= (midi-channel event) 4))
 
 (defmethod crotchet ((object geerdes-object))
-  (make-instance 'floating-period :interval 1))
+  (make-standard-period 1))
 
 (defmethod get-applicable-time-signatures ((anchored-period anchored-period)
 					   (composition midi-composition))
diff -r b3537f75c1c6 -r ebfe054eea1c implementations/midi/methods.lisp
--- a/implementations/midi/methods.lisp	Mon Sep 03 16:08:24 2007 +0100
+++ b/implementations/midi/methods.lisp	Tue Sep 18 12:49:52 2007 +0100
@@ -143,4 +143,4 @@
       2))
 
 (defmethod crotchet ((object midi-object))
-  (make-instance 'floating-period :interval 1))
+  (make-standard-period 1))
diff -r b3537f75c1c6 -r ebfe054eea1c utils/utils.lisp
--- a/utils/utils.lisp	Mon Sep 03 16:08:24 2007 +0100
+++ b/utils/utils.lisp	Tue Sep 18 12:49: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))