[fomus-cvs] CVS update: fomus/classes.lisp

[David Psenicka]

Update of /project/fomus/cvsroot/fomus
In directory common-lisp.net:/tmp/cvs-serv2753

Modified Files:
	classes.lisp 
Log Message:
bugfix
Date: Fri Nov 11 23:49:36 2005
Author: dpsenicka

Index: fomus/classes.lisp
diff -u fomus/classes.lisp:1.13 fomus/classes.lisp:1.14
--- fomus/classes.lisp:1.13	Fri Nov 11 23:38:17 2005
+++ fomus/classes.lisp	Fri Nov 11 23:49:35 2005
@@ -311,7 +311,7 @@
 (defgeneric copy-event (ev &key &allow-other-keys))
 (defmethod copy-event ((ev note) &key (off (event-off ev)) (id (obj-id ev)) (partid (event-partid ev)) (dur (event-dur ev)) (marks (event-marks ev)) (voice (event-voice ev))
 		       (note (event-note ev)))
-  (declare (type (or (real 0)) off) (type (or symbol real null) partid) (type (or (real (0)) symbol cons) dur) (type list marks) (type (or (integer 1 4) cons) voice)
+  (declare (type (or (real 0)) off) (type (or symbol real null) partid) (type (or real symbol cons) dur) (type list marks) (type (or (integer 1 4) cons) voice)
 	   (type (or real symbol cons) note))
   (make-noteex
    :id id :partid partid :off off
@@ -319,7 +319,7 @@
    :note note))
 (defmethod copy-event ((ev rest) &key (off (event-off ev)) (id (obj-id ev)) (partid (event-partid ev)) (dur (event-dur ev)) (marks (event-marks ev))
 		       (voice (event-voice ev)))
-  (declare (type (or (real 0)) off) (type (or symbol real null) partid) (type (or (real (0)) symbol cons) dur) (type list marks) (type (or (integer 1 4) cons) voice))
+  (declare (type (or (real 0)) off) (type (or symbol real null) partid) (type (or real symbol cons) dur) (type list marks) (type (or (integer 1 4) cons) voice))
   (make-restex
    :id id :partid partid :off off
    :dur dur :marks marks :voice voice))
@@ -332,7 +332,7 @@
 (defmethod copy-event ((ev noteex) &key (off (event-off ev)) (id (obj-id ev)) (partid (event-partid ev)) (dur (event-dur ev)) (marks (event-marks ev)) (voice (event-voice ev))
 		       (note (event-note ev)) (tup (event-tup ev)) (tielt (event-tielt ev)) (tiert (event-tiert ev))
 		       (beamlt (event-beamlt ev)) (beamrt (event-beamrt ev)))
-  (declare (type (or (real 0)) off) (type (or symbol real null) partid) (type (or (real (0)) symbol cons) dur) (type list marks) (type (or (integer 1 4) cons) voice)
+  (declare (type (or (real 0)) off) (type (or symbol real null) partid) (type (or real symbol cons) dur) (type list marks) (type (or (integer 1 4) cons) voice)
 	   (type (or real symbol cons) note) (type (or boolean list) tielt tiert) (type (or (integer 0) symbol list) beamlt) (type (or (integer 0) symbol) beamrt))
   (make-noteex
    :id id :partid partid :off off
@@ -342,7 +342,7 @@
    :tielt tielt :tiert tiert :beamlt beamlt :beamrt beamrt))
 (defmethod copy-event ((ev restex) &key (off (event-off ev)) (id (obj-id ev)) (partid (event-partid ev)) (dur (event-dur ev)) (marks (event-marks ev))
 		       (voice (event-voice ev)) (tup (event-tup ev)) (inv (event-inv ev)))
-  (declare (type (or (real 0)) off) (type (or symbol real null) partid) (type (or (real (0)) symbol cons) dur) (type list marks) (type (or (integer 1 4) cons) voice)
+  (declare (type (or (real 0)) off) (type (or symbol real null) partid) (type (or real symbol cons) dur) (type list marks) (type (or (integer 1 4) cons) voice)
 	   (type (or boolean list) inv))
   (make-restex
    :id id :partid partid :off off