[foo-cvs] foo/elkfoo/scm/control/envelope envelope.foo,1.2,1.3

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/scm/control/envelope
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8357/envelope

Modified Files:
	envelope.foo 
Log Message:
raw checkin of new control

Index: envelope.foo
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/scm/control/envelope/envelope.foo,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** envelope.foo	11 Aug 2004 12:26:18 -0000	1.2
--- envelope.foo	27 Feb 2005 20:06:32 -0000	1.3
***************
*** 560,567 ****
    (let ((xmax (+ (send self 'get-Xmin) (send self 'get-Xlength)))
    	(xi) (yi) (env (send self 'get-Envelope)) (Qtum) (rsl)
! 	(aux) (xl (send self 'get-Xlast)) (yl (send self 'get-Ylast)))
  
      (if (and (not (null? Args))
  	    (number? (car Args))) (send self 'set-Quantum (car Args)))
      (send self 'set-Xlast (send self 'default-Xlast))
      (set! Qtum (send self 'get-Quantum))
--- 560,570 ----
    (let ((xmax (+ (send self 'get-Xmin) (send self 'get-Xlength)))
    	(xi) (yi) (env (send self 'get-Envelope)) (Qtum) (rsl)
! 	(aux) (xl (send self 'get-Xlast)) (yl (send self 'get-Ylast))
!         (lpair) (lval))
  
      (if (and (not (null? Args))
  	    (number? (car Args))) (send self 'set-Quantum (car Args)))
+     (set! lpair (last-pair env))
+ ;    (set! lval (caar lpair))
      (send self 'set-Xlast (send self 'default-Xlast))
      (set! Qtum (send self 'get-Quantum))
***************
*** 570,578 ****
          (begin
            (set! xi (send self 'get-Xlast))
!  	  (while (<= (+ xi Qtum) xmax)
  		(set! yi  (send self 'Envnext))
  		(set! xi  (send self 'get-Xlast))
  		(set! rsl (cons (list xi yi) rsl)))
! 	  (reverse rsl))
          (send self 'invent-a-bpf)))
       (send self 'set-Xlast xl)
--- 573,581 ----
          (begin
            (set! xi (send self 'get-Xlast))
!           (while (< (+ xi Qtum) (- xmax (/ Qtum 2.)))
  		(set! yi  (send self 'Envnext))
  		(set! xi  (send self 'get-Xlast))
  		(set! rsl (cons (list xi yi) rsl)))
! 	  (reverse (append lpair rsl)))
          (send self 'invent-a-bpf)))
       (send self 'set-Xlast xl)