diff options
| -rw-r--r-- | examples/demo.scm | 8 | ||||
| -rw-r--r-- | guile/guile-midi/control.scm | 28 | ||||
| -rw-r--r-- | guile/starlet/base.scm | 16 | ||||
| -rw-r--r-- | guile/venues/demo-venue.scm | 96 |
4 files changed, 74 insertions, 74 deletions
diff --git a/examples/demo.scm b/examples/demo.scm index 57c8257..1ff0832 100644 --- a/examples/demo.scm +++ b/examples/demo.scm @@ -27,8 +27,8 @@ ;; Set up working lights on a MIDI fader (define working-light-fader - (make-midi-controller #:channel 14 - #:cc-number 19)) + (make-midi-controller! #:channel 14 + #:cc-number 19)) (define (worklight) (let ((state (make-empty-state)) @@ -42,8 +42,8 @@ (define pot1 - (make-midi-controller #:channel 14 - #:cc-number 7)) + (make-midi-controller! #:channel 14 + #:cc-number 7)) (define (example-state-1) diff --git a/guile/guile-midi/control.scm b/guile/guile-midi/control.scm index 0314d1d..e3ff848 100644 --- a/guile/guile-midi/control.scm +++ b/guile/guile-midi/control.scm @@ -5,7 +5,7 @@ #:use-module (ice-9 binary-ports) #:use-module (srfi srfi-1) #:export (start-midi-control - make-midi-controller + make-midi-controller! get-controller-value make-midi-led set-midi-led! @@ -62,7 +62,7 @@ (atomic-box-ref (get-value-box a))) -(define* (make-midi-controller +(define* (make-midi-controller! #:key (channel 1) (cc-number 1)) (let ((new-controller (make <midi-control> #:channel channel @@ -93,28 +93,28 @@ new-callback)) -(define enqueue-midi-bytes +(define enqueue-midi-bytes! (lambda bytes (unless (eq? (atomic-box-compare-and-swap! send-queue '() bytes) '()) - (apply enqueue-midi-bytes bytes)))) + (apply enqueue-midi-bytes! bytes)))) (define (set-midi-led! led val) (if val ;; Note on - (enqueue-midi-bytes (+ #b10010000 (get-channel led)) - (get-note-number led) - 127) + (enqueue-midi-bytes! (+ #b10010000 (get-channel led)) + (get-note-number led) + 127) ;; Note off - (enqueue-midi-bytes (+ #b10000000 (get-channel led)) - (get-note-number led) - 0))) + (enqueue-midi-bytes! (+ #b10000000 (get-channel led)) + (get-note-number led) + 0))) -(define (handle-cc-change channel cc-number value) +(define (handle-cc-change! channel cc-number value) (for-each (lambda (a) (atomic-box-set! (get-value-box a) value)) (filter (lambda (a) @@ -156,9 +156,9 @@ ;; Control value ((11) (let* ((cc-number (get-u8 midi-port)) (value (get-u8 midi-port))) - (handle-cc-change channel - cc-number - (scale-127-100 value))))) + (handle-cc-change! channel + cc-number + (scale-127-100 value))))) (yield) (again)))) diff --git a/guile/starlet/base.scm b/guile/starlet/base.scm index 83fb04d..39dc214 100644 --- a/guile/starlet/base.scm +++ b/guile/starlet/base.scm @@ -8,7 +8,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:export (<fixture> <fixture-attribute> <starlet-state> - start-ola-output patch-fixture + start-ola-output patch-fixture! set-attr! home-attr! home-all! blackout scanout-freq make-empty-state register-state! percent->dmxval msb lsb chan @@ -143,9 +143,9 @@ ;; Patch a new fixture -(define* (patch-fixture class - start-addr - #:key (universe 1) (friendly-name "Fixture")) +(define* (patch-fixture! class + start-addr + #:key (universe 1) (friendly-name "Fixture")) (let ((new-fixture (make class #:sa start-addr #:uni universe @@ -189,7 +189,7 @@ ;; Add the contents of state "new" to "combined-state" -(define (add-state-to-state merge-rule new combined-state) +(define (add-state-to-state! merge-rule new combined-state) (state-for-each (lambda (fix attr value) (let ((current-value (state-find fix attr @@ -244,9 +244,9 @@ (define (merge-states merge-rule list-of-states) (let ((combined-state (make <starlet-state>))) (for-each (lambda (state) - (add-state-to-state merge-rule - (expand-state state) - combined-state)) + (add-state-to-state! merge-rule + (expand-state state) + combined-state)) list-of-states) combined-state)) diff --git a/guile/venues/demo-venue.scm b/guile/venues/demo-venue.scm index 2ec1eec..f334720 100644 --- a/guile/venues/demo-venue.scm +++ b/guile/venues/demo-venue.scm @@ -3,55 +3,55 @@ #:use-module (starlet fixture-library generic)) ;; Conventional dimmers (1-48) -(define-public dim1 (patch-fixture <generic-dimmer> 1)) -(define-public dim2 (patch-fixture <generic-dimmer> 2)) -(define-public dim3 (patch-fixture <generic-dimmer> 3)) -(define-public dim4 (patch-fixture <generic-dimmer> 4)) -(define-public dim5 (patch-fixture <generic-dimmer> 5)) -(define-public dim6 (patch-fixture <generic-dimmer> 6)) -(define-public dim7 (patch-fixture <generic-dimmer> 7)) -(define-public dim8 (patch-fixture <generic-dimmer> 8)) -(define-public dim9 (patch-fixture <generic-dimmer> 9)) +(define-public dim1 (patch-fixture! <generic-dimmer> 1)) +(define-public dim2 (patch-fixture! <generic-dimmer> 2)) +(define-public dim3 (patch-fixture! <generic-dimmer> 3)) +(define-public dim4 (patch-fixture! <generic-dimmer> 4)) +(define-public dim5 (patch-fixture! <generic-dimmer> 5)) +(define-public dim6 (patch-fixture! <generic-dimmer> 6)) +(define-public dim7 (patch-fixture! <generic-dimmer> 7)) +(define-public dim8 (patch-fixture! <generic-dimmer> 8)) +(define-public dim9 (patch-fixture! <generic-dimmer> 9)) -(define-public dim10 (patch-fixture <generic-dimmer> 10)) -(define-public dim11 (patch-fixture <generic-dimmer> 11)) -(define-public dim12 (patch-fixture <generic-dimmer> 12)) -(define-public dim13 (patch-fixture <generic-dimmer> 13)) -(define-public dim14 (patch-fixture <generic-dimmer> 14)) -(define-public dim15 (patch-fixture <generic-dimmer> 15)) -(define-public dim16 (patch-fixture <generic-dimmer> 16)) -(define-public dim17 (patch-fixture <generic-dimmer> 17)) -(define-public dim18 (patch-fixture <generic-dimmer> 18)) -(define-public dim19 (patch-fixture <generic-dimmer> 19)) +(define-public dim10 (patch-fixture! <generic-dimmer> 10)) +(define-public dim11 (patch-fixture! <generic-dimmer> 11)) +(define-public dim12 (patch-fixture! <generic-dimmer> 12)) +(define-public dim13 (patch-fixture! <generic-dimmer> 13)) +(define-public dim14 (patch-fixture! <generic-dimmer> 14)) +(define-public dim15 (patch-fixture! <generic-dimmer> 15)) +(define-public dim16 (patch-fixture! <generic-dimmer> 16)) +(define-public dim17 (patch-fixture! <generic-dimmer> 17)) +(define-public dim18 (patch-fixture! <generic-dimmer> 18)) +(define-public dim19 (patch-fixture! <generic-dimmer> 19)) -(define-public dim20 (patch-fixture <generic-dimmer> 20)) -(define-public dim21 (patch-fixture <generic-dimmer> 21)) -(define-public dim22 (patch-fixture <generic-dimmer> 22)) -(define-public dim23 (patch-fixture <generic-dimmer> 23)) -(define-public dim24 (patch-fixture <generic-dimmer> 24)) -(define-public dim25 (patch-fixture <generic-dimmer> 25)) -(define-public dim26 (patch-fixture <generic-dimmer> 26)) -(define-public dim27 (patch-fixture <generic-dimmer> 27)) -(define-public dim28 (patch-fixture <generic-dimmer> 28)) -(define-public dim29 (patch-fixture <generic-dimmer> 29)) +(define-public dim20 (patch-fixture! <generic-dimmer> 20)) +(define-public dim21 (patch-fixture! <generic-dimmer> 21)) +(define-public dim22 (patch-fixture! <generic-dimmer> 22)) +(define-public dim23 (patch-fixture! <generic-dimmer> 23)) +(define-public dim24 (patch-fixture! <generic-dimmer> 24)) +(define-public dim25 (patch-fixture! <generic-dimmer> 25)) +(define-public dim26 (patch-fixture! <generic-dimmer> 26)) +(define-public dim27 (patch-fixture! <generic-dimmer> 27)) +(define-public dim28 (patch-fixture! <generic-dimmer> 28)) +(define-public dim29 (patch-fixture! <generic-dimmer> 29)) -(define-public dim30 (patch-fixture <generic-dimmer> 30)) -(define-public dim31 (patch-fixture <generic-dimmer> 31)) -(define-public dim32 (patch-fixture <generic-dimmer> 32)) -(define-public dim33 (patch-fixture <generic-dimmer> 33)) -(define-public dim34 (patch-fixture <generic-dimmer> 34)) -(define-public dim35 (patch-fixture <generic-dimmer> 35)) -(define-public dim36 (patch-fixture <generic-dimmer> 36)) -(define-public dim37 (patch-fixture <generic-dimmer> 37)) -(define-public dim38 (patch-fixture <generic-dimmer> 38)) -(define-public dim39 (patch-fixture <generic-dimmer> 39)) +(define-public dim30 (patch-fixture! <generic-dimmer> 30)) +(define-public dim31 (patch-fixture! <generic-dimmer> 31)) +(define-public dim32 (patch-fixture! <generic-dimmer> 32)) +(define-public dim33 (patch-fixture! <generic-dimmer> 33)) +(define-public dim34 (patch-fixture! <generic-dimmer> 34)) +(define-public dim35 (patch-fixture! <generic-dimmer> 35)) +(define-public dim36 (patch-fixture! <generic-dimmer> 36)) +(define-public dim37 (patch-fixture! <generic-dimmer> 37)) +(define-public dim38 (patch-fixture! <generic-dimmer> 38)) +(define-public dim39 (patch-fixture! <generic-dimmer> 39)) -(define-public dim40 (patch-fixture <generic-dimmer> 40)) -(define-public dim41 (patch-fixture <generic-dimmer> 41)) -(define-public dim42 (patch-fixture <generic-dimmer> 42)) -(define-public dim43 (patch-fixture <generic-dimmer> 43)) -(define-public dim44 (patch-fixture <generic-dimmer> 44)) -(define-public dim45 (patch-fixture <generic-dimmer> 45)) -(define-public dim46 (patch-fixture <generic-dimmer> 46)) -(define-public dim47 (patch-fixture <generic-dimmer> 47)) -(define-public dim48 (patch-fixture <generic-dimmer> 48)) +(define-public dim40 (patch-fixture! <generic-dimmer> 40)) +(define-public dim41 (patch-fixture! <generic-dimmer> 41)) +(define-public dim42 (patch-fixture! <generic-dimmer> 42)) +(define-public dim43 (patch-fixture! <generic-dimmer> 43)) +(define-public dim44 (patch-fixture! <generic-dimmer> 44)) +(define-public dim45 (patch-fixture! <generic-dimmer> 45)) +(define-public dim46 (patch-fixture! <generic-dimmer> 46)) +(define-public dim47 (patch-fixture! <generic-dimmer> 47)) +(define-public dim48 (patch-fixture! <generic-dimmer> 48)) |