From ac62964305db6d34291e075d87b8a6b533fd4c24 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Fri, 23 Oct 2020 22:38:55 +0200
Subject: fade-up -> up-time, fade-down -> down-time

This makes everything consistent: {up,down}-{time,delay}
---
 examples/demo.scm          | 18 +++++++++---------
 guile/starlet/playback.scm | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/examples/demo.scm b/examples/demo.scm
index e3e4bb3..c660614 100644
--- a/examples/demo.scm
+++ b/examples/demo.scm
@@ -82,28 +82,28 @@
    (cue 1
         (cue-state (apply-state example-state-1)
                    (at mh1 'pan 25))
-        #:fade-up 3
-        #:fade-down 5)
+        #:up-time 3
+        #:down-time 5)
 
    (cue 2
         (cue-state (apply-state example-state-2))
-        #:fade-up 3
-        #:fade-down 1
+        #:up-time 3
+        #:down-time 1
         #:down-delay 3)
 
    (cue 2.5
         (cue-state (at dim1 'intensity 100))
         #:track-intensities #t
-        #:fade-up 1
-        #:fade-down 1)
+        #:up-time 1
+        #:down-time 1)
 
    (cue 3
         (cue-state (blackout (current-state)))
-        #:fade-up 0
-        #:fade-down 2
+        #:up-time 0
+        #:down-time 2
 
         (cue-part (list dim11 dim13)
-                  #:fade-down 2
+                  #:down-time 2
                   #:down-delay 2))))
 
 
diff --git a/guile/starlet/playback.scm b/guile/starlet/playback.scm
index 5d3332e..2b7415c 100644
--- a/guile/starlet/playback.scm
+++ b/guile/starlet/playback.scm
@@ -339,15 +339,15 @@
 
 (define* (cue-part attr-list
                    #:key
-                   (fade-up 5)
-                   (fade-down 5)
+                   (up-time 5)
+                   (down-time 5)
                    (up-delay 0)
                    (down-delay 0))
 
   (make-cue-part attr-list
                  (make-fade-times
-                  fade-up
-                  fade-down
+                  up-time
+                  down-time
                   up-delay
                   down-delay)))
 
@@ -357,8 +357,8 @@
     (receive (cue-parts rest-minus-cue-parts)
         (partition cue-part? rest)
       (let-keywords rest-minus-cue-parts #f
-                    ((fade-up 5)
-                     (fade-down 5)
+                    ((up-time 5)
+                     (down-time 5)
                      (up-delay 0)
                      (down-delay 0)
                      (track-intensities #f))
@@ -367,8 +367,8 @@
                               state-function
                               #f
                               (make-fade-times
-                               fade-up
-                               fade-down
+                               up-time
+                               down-time
                                up-delay
                                down-delay)
                               track-intensities
@@ -404,6 +404,6 @@
     ((_ body ...)
      (vector (cue 0
                   (lambda () #f)   ;; The real base state is in ensure-cue-zero-realized
-                  #:fade-up 0
-                  #:fade-down 0)
+                  #:up-time 0
+                  #:down-time 0)
              body ...))))
-- 
cgit v1.2.3