Mercurial > hg > amuse
diff implementations/mtp/methods.lisp @ 136:fd85f52d9f9d
Class revolution
* PITCH-DESIGNATOR -> PITCH (PITCH removed)
* MOMENT-DESIGNATOR -> MOMENT , MOMENT -> STANDARD-MOMENT
* PERIOD-DESIGNATOR -> PERIOD , PERIOD -> STANDARD-PERIOD
* ANCHORED-PERIOD-DESIGNATOR -> ANCHORED-PERIOD , ANCHORED-PERIOD -> STANDARD-ANCHORED-PERIOD
* FLOATING-PERIOD removed
* TIME-SIGNATURE-DESIGNATOR -> TIME-SIGNATURE & TIME-SIGNATURE-PERIOD
* TIME-SIGNATURE -> STANDARD-TIME-SIGNATURE & STANDARD-TIME-SIGNATURE-PERIOD
* KEY-SIGNATURE-DESIGNATOR -> KEY-SIGNATURE (& ...-PERIOD)
* KEY-SIGNATURE -> STANDARD-KEY-SIGNATURE (& ...-PERIOD)
* TEMPO now abstract (& TEMPO-PERIOD)
* STANDARD-TEMPO AND STANDARD-TEMPO-PERIOD
* COMPOSITION, CONSTITUENT & TIME-ORDERED-CONSTITUENT all have STANDARD- forms
make-x methods and specialisers changes appropriately
darcs-hash:20070831142943-f76cc-7be0d08963de06d87b36e4922076287d565c7ee2.gz
author | David Lewis <d.lewis@gold.ac.uk> |
---|---|
date | Fri, 31 Aug 2007 15:29:43 +0100 |
parents | ea542c06c364 |
children | a45da9b93b37 |
line wrap: on
line diff
--- a/implementations/mtp/methods.lisp Tue Aug 28 11:17:27 2007 +0100 +++ b/implementations/mtp/methods.lisp Fri Aug 31 15:29:43 2007 +0100 @@ -125,7 +125,7 @@ ;;; Constituents from compositions: time-signatures (defmethod crotchet ((dataset mtp-dataset)) - (amuse:make-floating-period + (amuse:make-standard-period (/ (dataset-timebase dataset) 4))) #.(clsql:locally-enable-sql-reader-syntax) @@ -136,7 +136,7 @@ (dataset-id composition)] :flatp t :field-names nil)))) - (amuse:make-floating-period (/ timebase 4)))) + (amuse:make-standard-period (/ timebase 4)))) (defmethod crotchet ((event mtp-event)) (let ((timebase (car (clsql:select [timebase] :from [mtp-dataset] @@ -144,7 +144,7 @@ (dataset-id event)] :flatp t :field-names nil)))) - (amuse:make-floating-period (/ timebase 4)))) + (amuse:make-standard-period (/ timebase 4)))) #.(clsql:restore-sql-reader-syntax-state) (defmethod get-applicable-time-signatures ((e mtp-event) c) @@ -153,10 +153,10 @@ (barlength (%mtp-barlength e)) (timebase (* 4 (duration (crotchet e))))) (list - (amuse:make-basic-time-signature pulses - (/ timebase (/ barlength pulses)) - (timepoint e) - (duration e))))) + (amuse:make-standard-time-signature-period pulses + (/ timebase (/ barlength pulses)) + (timepoint e) + (duration e))))) (defmethod time-signatures ((c mtp-composition)) (let ((results nil) @@ -187,9 +187,9 @@ (let* ((sharps (%mtp-keysig e)) (mode (%mtp-mode e)) (midi-mode (and mode (if (= mode 0) 0 1)))) - (list (amuse:make-midi-key-signature sharps midi-mode - (timepoint e) - (duration e))))) + (list (amuse:make-midi-key-signature-period sharps midi-mode + (timepoint e) + (duration e))))) (defmethod key-signatures ((c mtp-composition)) (let ((results nil) @@ -217,9 +217,9 @@ (defmethod get-applicable-tempi ((e mtp-event) c) (declare (ignore c)) - (list (amuse:make-tempo (%mtp-tempo e) - (timepoint e) - (duration e)))) + (list (amuse:make-standard-tempo-period (%mtp-tempo e) + (timepoint e) + (duration e)))) (defmethod tempi ((c mtp-composition)) (let ((results nil)