From cf7c0dae74b6a2b722f599cfbbd7fe659f7cf5cd Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Sun, 28 Mar 2021 20:22:48 +0200
Subject: Get rid of attr-boolean

A list attribute works fine.
---
 guile/starlet/base.scm                 | 10 ----------
 guile/starlet/fixture-library/robe.scm |  8 ++++----
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'guile')

diff --git a/guile/starlet/base.scm b/guile/starlet/base.scm
index 57ca52a..54252e2 100644
--- a/guile/starlet/base.scm
+++ b/guile/starlet/base.scm
@@ -21,7 +21,6 @@
 
             <fixture-attribute>
             attr-continuous
-            attr-boolean
             attr-list
             get-attr-type
             get-attr-range
@@ -537,15 +536,6 @@ pre-existing contents."
        #:home-value attr-home-value))))
 
 
-(define-syntax attr-boolean
-  (syntax-rules ()
-    ((_ attr-name attr-home-value)
-     (make <fixture-attribute>
-       #:name attr-name
-       #:type 'boolean
-       #:home-value attr-home-value))))
-
-
 (define-syntax attr-list
   (syntax-rules ()
     ((_ attr-name attr-allowed-values attr-home-value)
diff --git a/guile/starlet/fixture-library/robe.scm b/guile/starlet/fixture-library/robe.scm
index 6e4704a..1dae94b 100644
--- a/guile/starlet/fixture-library/robe.scm
+++ b/guile/starlet/fixture-library/robe.scm
@@ -12,8 +12,8 @@
                 (attr-continuous 'intensity '(0 100) 0)
                 (attr-continuous 'pan '(0 540) 270)
                 (attr-continuous 'tilt '(0 270) 135)
-                (attr-boolean 'strobe #f)
-                (attr-boolean 'prism #f)
+                (attr-list 'strobe '(#t #f) #f)
+                (attr-list 'prism '(#t #f) #f)
                 (attr-list 'tungsten-watts-emulation '(750 1000 1200 2000 2500 #f) #f)
                 (attr-continuous 'cyan '(0 100) 0)
                 (attr-continuous 'magenta '(0 100) 0)
@@ -53,7 +53,7 @@
                 (attr-continuous 'intensity '(0 100) 0)
                 (attr-continuous 'pan '(0 540) 270)
                 (attr-continuous 'tilt '(0 270) 135)
-                (attr-boolean 'strobe #f)
+                (attr-list 'strobe '(#t #f) #f)
                 (attr-list 'colwheel '(#f red blue orange green amber uv) #f)
                 (attr-list 'gobo '(#f iris gobo1 gobo2 gobo3 gobo4 gobo5 gobo6) #f)
                 (attr-list 'beamtype '(beam beamwash beamwashext) 'beam)
@@ -124,7 +124,7 @@
                 (attr-continuous 'pan '(0 540) 270)
                 (attr-continuous 'tilt '(0 270) 135)
                 (attr-list 'colwheel '(#f red blue orange green amber uv) #f)
-                (attr-boolean 'prism #f)
+                (attr-list 'prism '(#t #f) #f)
                 (attr-list 'strobe '(#f #t random zap) #f)
                 (attr-continuous 'strobe-speed '(0 100) 50)
                 (attr-continuous 'cyan '(0 100) 0)
-- 
cgit v1.2.3