Mercurial > hg > amuse

diff implementations/geerdes/constructors.lisp @ 136:fd85f52d9f9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d041118612d4
children edf2322ea33f
line wrap: on
line diff
--- a/implementations/geerdes/constructors.lisp	Tue Aug 28 11:17:27 2007 +0100
+++ b/implementations/geerdes/constructors.lisp	Fri Aug 31 15:29:43 2007 +0100
@@ -7,22 +7,22 @@
 	(timebase (%midi-timebase composition)))
     (dolist (row (%midi-events composition))
       (let* ((note (if (pitched-row-p row)
-		      (make-geerdes-pitched-event (%fast-pitch row)
-						  (%fast-velocity row)
-						  (%fast-patch row)
-						  (%fast-channel row)
-						  (%fast-track row)
-						  (%fast-onset row timebase)
-						  (%fast-duration row timebase)
-						  (%fast-id row))
-		      (make-geerdes-percussive-event (%fast-pitch row)
-						     (%fast-velocity row)
-						     (%fast-patch row)
-						     (%fast-channel row)
-						     (%fast-track row)
-						     (%fast-onset row timebase)
-						     (%fast-duration row timebase)
-						     (%fast-id row)))))
+		       (make-geerdes-pitched-event (%fast-pitch row)
+						   (%fast-velocity row)
+						   (%fast-patch row)
+						   (%fast-channel row)
+						   (%fast-track row)
+						   (%fast-onset row timebase)
+						   (%fast-duration row timebase)
+						   (%fast-id row))
+		       (make-geerdes-percussive-event (%fast-pitch row)
+						      (%fast-velocity row)
+						      (%fast-patch row)
+						      (%fast-channel row)
+						      (%fast-track row)
+						      (%fast-onset row timebase)
+						      (%fast-duration row timebase)
+						      (%fast-id row)))))
 	(when (%fast-monodyp row)
 	  (let ((monody-note (copy-event note)))
 	     (setf (duration monody-note) (%fast-monody-duration row timebase))
@@ -54,14 +54,14 @@
     (dolist (row (%midi-constituents composition))
       (cond
 	((%fast-tempo row)
-	 (push (make-tempo
+	 (push (make-standard-tempo-period
 		(microsecond-per-crotchet-to-bpm
 		 (%fast-tempo row))
 		(%fast-onset row timebase)
 		(%fast-duration row timebase))
 	       tempi))
 	((%fast-numerator row)
-	 (push (make-basic-time-signature
+	 (push (make-standard-time-signature-period
 		(%fast-numerator row)
 		(%fast-denominator row)
 		(%fast-onset row timebase)