diff options
| author | Thomas White <taw@physics.org> | 2023-06-04 11:09:55 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2023-06-04 11:09:55 +0200 |
| commit | dc1dd7e978bf05bd72c3bb27f458ea1e46c73ace (patch) | |
| tree | bebd3b60c10be1d9988da24120aa66fb5a5c48f6 | |
| parent | bdf94b87a52d65406769bb0fc3e43411d3f33f2e (diff) | |
Rearrange arguments of osc-select-button and osc-parameter-encoder
| -rw-r--r-- | examples/demo-show.scm | 22 | ||||
| -rw-r--r-- | guile/starlet/open-sound-control/utils.scm | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/examples/demo-show.scm b/examples/demo-show.scm index 263343e..42c9d45 100644 --- a/examples/demo-show.scm +++ b/examples/demo-show.scm @@ -114,17 +114,17 @@ (add-osc-method osc-server "/x1k2/buttons/31" "" sel) (osc-send x1k2 "/x1k2/leds/31" 'green) -(osc-select-button osc-server "/x1k2/buttons/17" x1k2 "/x1k2/leds/17" front-leds) -(osc-select-button osc-server "/x1k2/buttons/18" x1k2 "/x1k2/leds/18" front-wash) -(osc-select-button osc-server "/x1k2/buttons/21" x1k2 "/x1k2/leds/21" mhLL) -(osc-select-button osc-server "/x1k2/buttons/22" x1k2 "/x1k2/leds/22" mhL) -(osc-select-button osc-server "/x1k2/buttons/23" x1k2 "/x1k2/leds/23" mhR) -(osc-select-button osc-server "/x1k2/buttons/24" x1k2 "/x1k2/leds/24" mhRR) - -(osc-parameter-encoder osc-server "/x1k2/encoders/1" x1k2 "/x1k2/leds/1" pan) -(osc-parameter-encoder osc-server "/x1k2/encoders/2" x1k2 "/x1k2/leds/2" tilt) -(osc-parameter-encoder osc-server "/x1k2/encoders/3" x1k2 "/x1k2/leds/3" gobo) -(osc-parameter-encoder osc-server "/x1k2/encoders/102" x1k2 "/x1k2/nothing" intensity) +(osc-select-button front-leds osc-server "/x1k2/buttons/17" x1k2 "/x1k2/leds/17") +(osc-select-button front-wash osc-server "/x1k2/buttons/18" x1k2 "/x1k2/leds/18") +(osc-select-button mhLL osc-server "/x1k2/buttons/21" x1k2 "/x1k2/leds/21") +(osc-select-button mhL osc-server "/x1k2/buttons/22" x1k2 "/x1k2/leds/22") +(osc-select-button mhR osc-server "/x1k2/buttons/23" x1k2 "/x1k2/leds/23") +(osc-select-button mhRR osc-server "/x1k2/buttons/24" x1k2 "/x1k2/leds/24") + +(osc-parameter-encoder pan osc-server "/x1k2/encoders/1" x1k2 "/x1k2/leds/1") +(osc-parameter-encoder tilt osc-server "/x1k2/encoders/2" x1k2 "/x1k2/leds/2") +(osc-parameter-encoder gobo osc-server "/x1k2/encoders/3" x1k2 "/x1k2/leds/3") +(osc-parameter-encoder intensity osc-server "/x1k2/encoders/102" x1k2 "/x1k2/nothing") (osc-state-fader osc-server "/x1k2/faders/4" (lighting-state diff --git a/guile/starlet/open-sound-control/utils.scm b/guile/starlet/open-sound-control/utils.scm index 932abaa..2b9bba5 100644 --- a/guile/starlet/open-sound-control/utils.scm +++ b/guile/starlet/open-sound-control/utils.scm @@ -78,7 +78,7 @@ (osc-send addr back-led 'green)) -(define (osc-select-button server button-method addr led fix) +(define (osc-select-button fix server button-method addr led) (add-osc-method server button-method "" (lambda () (toggle-sel fix))) @@ -107,7 +107,7 @@ (get-selection))) -(define (osc-parameter-encoder server encoder-method addr led attr) +(define (osc-parameter-encoder attr server encoder-method addr led) (add-osc-method server (string-append encoder-method "/inc") "" (lambda () (encoder-inc attr 3))) |