aboutsummaryrefslogtreecommitdiff
path: root/guile/starlet/fixture-library/robe
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2022-06-26 21:34:39 +0200
committerThomas White <taw@physics.org>2022-06-26 21:37:17 +0200
commit31436be9c2e4fa72d95eacf9c196abc0f9544b31 (patch)
tree905441ff8326625cc4ef2d7785aefa7129bb91ef /guile/starlet/fixture-library/robe
parentc69990c8cd4f1ae00e722d8ac75bdc2782ccb83a (diff)
Fixture library: update older definitions to new system
Diffstat (limited to 'guile/starlet/fixture-library/robe')
-rw-r--r--guile/starlet/fixture-library/robe/mmxwashbeam.scm (renamed from guile/starlet/fixture-library/robe/mmxwashbeam/mode1.scm)47
1 files changed, 23 insertions, 24 deletions
diff --git a/guile/starlet/fixture-library/robe/mmxwashbeam/mode1.scm b/guile/starlet/fixture-library/robe/mmxwashbeam.scm
index b412a24..282bd0f 100644
--- a/guile/starlet/fixture-library/robe/mmxwashbeam/mode1.scm
+++ b/guile/starlet/fixture-library/robe/mmxwashbeam.scm
@@ -1,7 +1,7 @@
;;
-;; starlet/fixture-library/robe/mmxwashbeam/mode1.scm
+;; starlet/fixture-library/robe/mmxwashbeam.scm
;;
-;; Copyright © 2020-2021 Thomas White <taw@bitwiz.org.uk>
+;; Copyright © 2020-2022 Thomas White <taw@bitwiz.org.uk>
;;
;; This file is part of Starlet.
;;
@@ -18,35 +18,34 @@
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;
-(define-module (starlet fixture-library robe mmxwashbeam mode1)
- #:use-module (oop goops)
+(define-module (starlet fixture-library robe mmxwashbeam)
+ #:use-module (starlet scanout)
#:use-module (starlet fixture)
+ #:use-module (starlet utils)
#:use-module (starlet colours)
#:export (<robe-mmxwashbeam-mode1>))
-(define-class <robe-mmxwashbeam-mode1> (<fixture>)
- (attributes
- #:init-form (list
- (attr-continuous 'intensity '(0 100) 0)
- (attr-continuous 'pan '(0 540) 270)
- (attr-continuous 'tilt '(0 270) 135)
- (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)
- (attr-colour 'colour white)
- (attr-continuous 'zoom '(0 100) 0)
- (attr-continuous 'focus '(0 100) 0)
- (attr-continuous 'barndoor-rot '(0 180) 90)
- (attr-continuous 'barndoor1 '(0 180) 0)
- (attr-continuous 'barndoor2 '(0 100) 0)
- (attr-continuous 'barndoor3 '(0 100) 0)
- (attr-continuous 'barndoor4 '(0 100) 0))))
+(define-fixture
+ <robe-mmxwashbeam-mode1>
-(define-method (scanout-fixture (fixture <robe-mmxwashbeam-mode1>)
- get-attr set-chan8 set-chan16)
+ (fixture-attributes
+ (attr-continuous 'intensity '(0 100) 0)
+ (attr-continuous 'pan '(0 540) 270)
+ (attr-continuous 'tilt '(0 270) 135)
+ (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)
+ (attr-colour 'colour white)
+ (attr-continuous 'zoom '(0 100) 0)
+ (attr-continuous 'focus '(0 100) 0)
+ (attr-continuous 'barndoor-rot '(0 180) 90)
+ (attr-continuous 'barndoor1 '(0 180) 0)
+ (attr-continuous 'barndoor2 '(0 100) 0)
+ (attr-continuous 'barndoor3 '(0 100) 0)
+ (attr-continuous 'barndoor4 '(0 100) 0))
(set-chan16 33 (percent->dmxval16 (get-attr 'intensity)))