Mercurial > hg > amuse
changeset 139:ebfe054eea1c
Bug fixes from name changes
darcs-hash:20070918114952-f76cc-feb59725a2f67edd6242947a5c2311d0a724cc43.gz
| author | David Lewis <d.lewis@gold.ac.uk> |
|---|---|
| date | Tue, 18 Sep 2007 12:49:52 +0100 |
| parents | b3537f75c1c6 |
| children | 56c2fc41a837 |
| files | base/constructors.lisp base/generics.lisp implementations/geerdes/methods.lisp implementations/midi/methods.lisp utils/utils.lisp |
| diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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))
--- 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))
--- 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))
--- 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))