Update of /project/fomus/cvsroot/fomus In directory common-lisp.net:/tmp/cvs-serv7642
Modified Files: voices.lisp Log Message: Bug fix Date: Tue Aug 16 01:53:22 2005 Author: dpsenicka
Index: fomus/voices.lisp diff -u fomus/voices.lisp:1.6 fomus/voices.lisp:1.7 --- fomus/voices.lisp:1.6 Mon Aug 15 21:46:11 2005 +++ fomus/voices.lisp Tue Aug 16 01:53:20 2005 @@ -52,7 +52,7 @@ (declare (type rational note1 note2)) (expt *voice-octave-dist-sc* (/ (diff note1 note2) 12.0))) (defun voices-notedist-aux2 (off1 eoff1 off2 eoff2 beatdist sc) ; by offset - (declare (type (rational 0) off1 eoff1 off2 eoff2) (type #-openmcl (float 0) #+openmcl float beatdist) (type #-openmcl (float 0 1) #+openmcl float sc)) + (declare (type (rational 0) off1 eoff1 off2 eoff2) (type (real 0) beatdist) (type #-openmcl (float 0 1) #+openmcl float sc)) (let ((d (max (- (float off2) (float eoff1)) (- (float off1) (float eoff2)) 0.0))) (if (>= d (* *max-voice-beat-dist-mul* beatdist)) 0.0 (expt sc d))))