From cdaa5c6abfa5d22353a036a20671ed77d8194864 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 30 Dec 2020 22:00:43 +0100 Subject: Make set-in-state! private, export set-attr! Two very similar procedures set-attr is more useful since it can handle both attribute names and objects. --- guile/starlet/playback.scm | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'guile/starlet/playback.scm') diff --git a/guile/starlet/playback.scm b/guile/starlet/playback.scm index ddeb517..3d662e4 100644 --- a/guile/starlet/playback.scm +++ b/guile/starlet/playback.scm @@ -278,42 +278,42 @@ ;; Non-intensity attribute ((not (intensity? attr)) - (set-in-state! pb fix attr (wrap-fade (fade-previous fade-record) - (fade-target fade-record) - attr-time - attr-delay - (fade-start-time fade-record)))) + (set-attr! pb fix attr (wrap-fade (fade-previous fade-record) + (fade-target fade-record) + attr-time + attr-delay + (fade-start-time fade-record)))) ;; Number to number, fading up ((and (number? target) (number? prev-val) (> target prev-val)) - (set-in-state! pb fix attr (wrap-fade prev-val - target - up-time - up-delay - (fade-start-time fade-record)))) + (set-attr! pb fix attr (wrap-fade prev-val + target + up-time + up-delay + (fade-start-time fade-record)))) ;; Number to number, fading down ((and (number? target) (number? prev-val) (< target prev-val)) - (set-in-state! pb fix attr (wrap-fade prev-val - target - down-time - down-delay - (fade-start-time fade-record)))) + (set-attr! pb fix attr (wrap-fade prev-val + target + down-time + down-delay + (fade-start-time fade-record)))) ;; Number to number, staying the same ((and (number? target) (number? prev-val)) - (set-in-state! pb fix attr (wrap-fade prev-val - target - 0.0 - 0.0 - (fade-start-time fade-record)))) + (set-attr! pb fix attr (wrap-fade prev-val + target + 0.0 + 0.0 + (fade-start-time fade-record)))) ;; Everything else, e.g. number to effect (else - (set-in-state! pb fix attr (wrap-xf (fade-previous fade-record) - (fade-target fade-record) - (get-fade-record-fade-times fade-record) - (fade-start-time fade-record)))))))) + (set-attr! pb fix attr (wrap-xf (fade-previous fade-record) + (fade-target fade-record) + (get-fade-record-fade-times fade-record) + (fade-start-time fade-record)))))))) (define (fade-finished? tnow fade-record) -- cgit v1.2.3