diff options
| author | Thomas White <taw@physics.org> | 2020-08-12 21:54:18 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-08-12 21:54:18 +0200 |
| commit | 607ca88f44d44f7eadaa631a944e34dde88726d3 (patch) | |
| tree | a1dfd99fa06e5a73f8aff353ab356aacfb8592b5 /guile | |
| parent | 1bc3b3224dc6c286ec1c1853193f82ec39a8bdf5 (diff) | |
Formatting/comments/remove unnecessary stuff
Diffstat (limited to 'guile')
| -rw-r--r-- | guile/starlet/base.scm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/guile/starlet/base.scm b/guile/starlet/base.scm index e0cdbaa..df28251 100644 --- a/guile/starlet/base.scm +++ b/guile/starlet/base.scm @@ -17,7 +17,6 @@ (define-class <fixture-attribute> (<object>) - (name #:init-value 'unnamed-attribute #:init-keyword #:name @@ -45,9 +44,7 @@ #:setter set-attr-home-value!)) - (define-class <fixture> (<object>) - (universe #:init-value #f #:init-keyword #:uni @@ -83,9 +80,11 @@ #:init-value '() #:getter get-active-fade-list #:setter set-active-fade-list!) + (cue-list #:init-keyword #:cue-list #:getter get-playback-cue-list) + (hash-table #:allocation #:virtual #:getter get-state-hash-table @@ -96,8 +95,6 @@ (error "Can't set hash table on playback")))) -(define-generic set-in-state!) - (define-method (set-in-state! (state <starlet-state>) (fix <fixture>) (attr <fixture-attribute>) @@ -342,7 +339,6 @@ combined-state)) - ;; Scanout (define (bytevec->string bv) (string-join @@ -411,10 +407,18 @@ (let ((trans (get-attr-translator attr))) (trans (get-fixture-universe fix) (get-fixture-addr fix) + + ;; This function call triggers evaluation of + ;; the whole chain of attribute functions, + ;; right down to a real number (value->number value (hirestime)) + + ;; Pass a helper function to set DMX values set-dmx))) (merge-states-htp + + ;; Reverse in order to put "home" state last (reverse (atomic-box-ref state-list)))) |