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

[David Psenicka]

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

Modified Files:
	beams.lisp 
Log Message:
bug fixes
Date: Wed Sep 21 19:00:53 2005
Author: dpsenicka

Index: fomus/beams.lisp
diff -u fomus/beams.lisp:1.7 fomus/beams.lisp:1.8
--- fomus/beams.lisp:1.7	Wed Sep 21 18:54:31 2005
+++ fomus/beams.lisp	Wed Sep 21 19:00:53 2005
@@ -147,13 +147,13 @@
 				      for (e0 e1) of-type ((or noteex restex) (or noteex restex null)) on ee while e1
 				      for nb = (event-nbeams e1 ts)
 				      when (and (notep e0) (notep e1) (> (event-beamrt e0) 0) ; (event-nbeams e0 ts)
-						(< (event-beamlt e1) nb) #|(and (< (event-beamlt e1) nb) (< (event-beamrt e1) nb))|#) ; DEBUG
+						(and (< (event-beamlt e1) nb) (< (event-beamrt e1) nb)))
 				      do (push (cons (event-nbeams e1 ts) e1) ll)))
 			    (loop for ee of-type cons in spb
 				  do (loop for (e0 e1) of-type ((or noteex restex) (or noteex restex null)) on ee while e1
 					   for nb = (event-nbeams e1 ts)
 					   when (and (notep e0) (notep e1) (> (event-beamlt e0) 0) ; (event-nbeams e0 ts)
-						     (< (event-beamrt e1) nb) #|(and (< (event-beamlt e1) nb) (< (event-beamrt e1) nb))|#) ; DEBUG
+						     (and (< (event-beamlt e1) nb) (< (event-beamrt e1) nb)))
 					   do (push (cons (event-nbeams e1 ts) e1) lr)))
 			    (loop for (nb . e) of-type ((integer 0) . noteex) in ll do (setf (event-beamlt e) nb))
 			    (loop for (nb . e) of-type ((integer 0) . noteex) in lr do (setf (event-beamrt e) nb)))))