diff options
Diffstat (limited to 'guile/starlet/fixture-library/generic')
| -rw-r--r-- | guile/starlet/fixture-library/generic/dimmer.scm | 5 | ||||
| -rw-r--r-- | guile/starlet/fixture-library/generic/rgb.scm | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/guile/starlet/fixture-library/generic/dimmer.scm b/guile/starlet/fixture-library/generic/dimmer.scm index e823dc7..6b25c15 100644 --- a/guile/starlet/fixture-library/generic/dimmer.scm +++ b/guile/starlet/fixture-library/generic/dimmer.scm @@ -22,6 +22,7 @@ #:use-module (starlet scanout) #:use-module (starlet fixture) #:use-module (starlet utils) + #:use-module (starlet attributes) #:export (<generic-dimmer>)) (define-fixture @@ -29,7 +30,7 @@ <generic-dimmer> (fixture-attributes - (attr-continuous 'intensity '(0 100) 0)) + (attr-continuous intensity '(0 100) 0)) - (set-chan8 1 (percent->dmxval8 (get-attr 'intensity)))) + (set-chan8 1 (percent->dmxval8 (get-attr intensity)))) diff --git a/guile/starlet/fixture-library/generic/rgb.scm b/guile/starlet/fixture-library/generic/rgb.scm index 4c2eb11..1b292af 100644 --- a/guile/starlet/fixture-library/generic/rgb.scm +++ b/guile/starlet/fixture-library/generic/rgb.scm @@ -21,6 +21,7 @@ (define-module (starlet fixture-library generic rgb) #:use-module (starlet scanout) #:use-module (starlet fixture) + #:use-module (starlet attributes) #:use-module (starlet utils) #:use-module (starlet colours) #:export (<generic-rgb>)) @@ -31,11 +32,11 @@ <generic-rgb> (fixture-attributes - (attr-continuous 'intensity '(0 100) 0) - (attr-colour 'colour white)) + (attr-continuous intensity '(0 100) 0) + (attr-colour colour white)) - (let ((intensity (get-attr 'intensity)) - (rgb (colour-as-rgb (get-attr 'colour)))) + (let ((intensity (get-attr intensity)) + (rgb (colour-as-rgb (get-attr colour)))) (set-chan8 1 (percent->dmxval8 (* intensity 0.01 (car rgb)))) (set-chan8 2 (percent->dmxval8 (* intensity 0.01 (cadr rgb)))) (set-chan8 3 (percent->dmxval8 (* intensity 0.01 (caddr rgb)))))) |