comparison implementations/geerdes/constructors.lisp @ 298:204d6d1f4f6a

add composition slot to event (geerdes)

Ignore-this: 7ece48560d6cc689711c5864e49a0360

darcs-hash:20090828164054-16a00-57b981532296c149640ab1e48439cdb88c41f2cf.gz

 						   (%fast-patch row)
 						   (%fast-channel row)
 						   (%fast-track row)
 						   (%fast-onset row timebase)
 						   (%fast-duration row timebase)
-						   (%fast-id row))
+						   (%fast-id row)
+						   composition)
 		       (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)))))
+						      (%fast-id row)
+						      composition))))
 	(when (%fast-monodyp row)
 	  (let ((monody-note (copy-event note)))
 	     (setf (duration monody-note) (%fast-monody-duration row timebase))
 	     (push monody-note monody-notes)))
 	(when (> (timepoint (cut-off note)) last-time)

 (defun pitched-row-p (event-row)
   (and (not (= (%fast-channel event-row) 10))
        (< (%fast-patch event-row) 112)))
 
 (defun make-geerdes-pitched-event (pitch-number velocity patch channel
-				   track onset duration event-id)
+				   track onset duration event-id
+				   composition)
   (make-instance 'geerdes-pitched-event
 		 :number pitch-number
 		 :velocity velocity
 		 :patch patch
 		 :channel channel
 		 :track track
 		 :time onset
 		 :interval duration
 		 :identifier (make-geerdes-event-identifier
-			      event-id)))
+			      event-id)
+		 :composition composition))
 
 (defun make-geerdes-percussive-event (pitch-number velocity patch
 				      channel track onset duration
-				      event-id)
+				      event-id composition)
   (make-instance 'geerdes-percussive-event
 		 :sound pitch-number
 		 :velocity velocity
 		 :patch patch
 		 :channel channel
 		 :track track
 		 :time onset
 		 :interval duration
 		 :identifier (make-geerdes-event-identifier
-			      event-id)))
+			      event-id)
+		 :composition composition))
 
 (defmethod copy-event ((event geerdes-pitched-event))
   (with-slots ((channel amuse-midi::channel)
 	       (track amuse-midi::track)
 	       (number amuse::number)
 	       (time amuse::time)
 	       (interval amuse::interval)
 	       (velocity amuse-midi::velocity)
 	       (patch amuse-midi::patch)
-	       identifier)
+	       identifier
+	       composition)
       event
     (make-instance 'geerdes-pitched-event
 		   :channel channel
 		   :track track
 		   :number number
 		   :time time
 		   :interval interval
 		   :velocity velocity
 		   :patch patch
-		   :identifier identifier)))
+		   :identifier identifier
+		   :composition composition)))
 
 (defmethod copy-event ((event geerdes-percussive-event))
   (with-slots ((channel amuse-midi::channel)
 	       (track amuse-midi::track)
 	       (time amuse::time)
 	       (interval amuse::interval)
 	       (velocity amuse-midi::velocity)
 	       (patch amuse-midi::patch)
 	       (sound amuse-midi::sound)
-	       identifier)
+	       identifier
+	       composition)
       event
     (make-instance 'geerdes-percussive-event
 		   :channel channel
 		   :track track
 		   :time time
 		   :interval interval
 		   :velocity velocity
 		   :patch patch
 		   :sound sound
-		   :identifier identifier)))
+		   :identifier identifier
+		   :composition composition)))
 
 ;; We want any function that generates a sequence from a geerdes
 ;; composition to preserve all slot values:
 #+nil
 (defmethod sequence:make-sequence-like :around ((o geerdes-composition)