define-fixture: Eliminate need to provide names for get-attr etc

This needed some rearranging, but I think the resulting code is a little
bit more efficient.

1 files changed, 3 insertions, 4 deletions

diff --git a/guile/starlet/fixture-library/stairville/octagon-theater-cw-ww.scm b/guile/starlet/fixture-library/stairville/octagon-theater-cw-ww.scm
index f2ed8a5..b42de26 100644
--- a/guile/starlet/fixture-library/stairville/octagon-theater-cw-ww.scm
+++ b/guile/starlet/fixture-library/stairville/octagon-theater-cw-ww.scm
@@ -19,6 +19,7 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 (define-module (starlet fixture-library stairville octagon-theater-cw-ww)
+  #:use-module (starlet scanout)
   #:use-module (starlet fixture)
   #:use-module (starlet utils)
   #:export (<stairville-octagon-theater-cw-ww>))
@@ -27,11 +28,9 @@
 
   <stairville-octagon-theater-cw-ww>
 
-  (list
+  (fixture-attributes
     (attr-continuous 'intensity '(0 100) 0)
-    (attr-continuous 'colour-temperature '(2800 6400) 4600))
-
-  (get-attr set-chan8 set-chan16)
+    (attr-continuous 'colour-temperature '(2800 6400) 3200))
 
   (let ((coltemp (get-attr 'colour-temperature)))
     (set-chan8 1 (scale-and-clamp-to-range coltemp '(2800 6400) '(0 255)))