Mercurial > hg > amuse
changeset 233:eb4d239f5437
add some time-related generic functions to base
Ignore-this: 8ad91dcfa5c8a0301c29dda7d2f27802
darcs-hash:20100212101520-16a00-6821cd98b78bf27be148e3e7e4b46c8f0b80928b.gz
committer: Jamie Forth <j.forth@gold.ac.uk>
| author | j.forth <j.forth@gold.ac.uk> |
|---|---|
| date | Thu, 24 Feb 2011 11:23:18 +0000 |
| parents | 061ae49a0b41 |
| children | e3353261523e |
| files | base/generics.lisp base/methods.lisp base/package.lisp |
| diffstat | 3 files changed, 25 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/base/generics.lisp Thu Feb 24 11:23:18 2011 +0000 +++ b/base/generics.lisp Thu Feb 24 11:23:18 2011 +0000 @@ -451,15 +451,22 @@ bar which contains moment")) (defgeneric beat-period (moment time-signature implementation-object) - (:documentation "Takes a moment, time signature object and crotchet and returns - an <anchored-period> for the containing beat containing moment. This - is more useful when there's a complex time signature (not currently - possible) in which tactus is different in different parts of the - bar (e.g. 3+3+2/8)")) + (:documentation "Takes a moment, time signature object and crotchet + and returns an <anchored-period> for the containing beat containing + moment. This is more useful when there's a complex time + signature (not currently possible) in which tactus is different in + different parts of the bar (e.g. 3+3+2/8)")) (defgeneric current-beat (moment composition) (:documentation "Returns an <anchored-period> representing the tactus unit which contains moment")) +(defgeneric ioi-from-bar (moment) + (:documentation "Returns the IOI of moment (i.e. an event) from the + bar line.")) + +(defgeneric onset-in-bar (moment) + (:documentation "The position of moment in the bar, measured in + beats.")) ;;;;;;;;;;;;;; ;;
--- a/base/methods.lisp Thu Feb 24 11:23:18 2011 +0000 +++ b/base/methods.lisp Thu Feb 24 11:23:18 2011 +0000 @@ -544,6 +544,17 @@ (make-standard-anchored-period (timepoint start) (duration bar-duration)))))) +(defmethod ioi-from-bar ((event event)) + (- (timepoint (onset event)) + (timepoint (current-bar event (composition event))))) + +(defmethod ioi-from-bar ((constituent constituent)) + (- (timepoint (onset constituent)) + (timepoint (current-bar constituent constituent)))) + +(defmethod onset-in-bar ((o moment)) + (1+ (ioi-from-bar o))) + (defmethod beat-period ((moment standard-moment) (time-signature standard-time-signature) (composition composition))