diff options
Diffstat (limited to 'guile/nanolight/fixture.scm')
-rw-r--r-- | guile/nanolight/fixture.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/guile/nanolight/fixture.scm b/guile/nanolight/fixture.scm index b3f1395..58ec3b4 100644 --- a/guile/nanolight/fixture.scm +++ b/guile/nanolight/fixture.scm @@ -8,7 +8,7 @@ patch-fixture patch-many fixture-string fixture-address-string percent->dmxval msb lsb chan - start-addr universe + get-fixture-start-addr get-fixture-universe assign-attr!)) (use-modules (srfi srfi-1)) @@ -77,16 +77,16 @@ (define fixtures '()) -(define (universe fixture-name) +(define (get-fixture-universe fixture-name) (get-universe (assq-ref fixtures fixture-name))) -(define (start-addr fixture-name) +(define (get-fixture-start-addr fixture-name) (get-start-addr (assq-ref fixtures fixture-name))) -(define (friendly-name fixture-name) +(define (get-fixture-friendly-name fixture-name) (get-friendly-name (assq-ref fixtures fixture-name))) -(define (attributes fixture-name) +(define (get-fixture-attributes fixture-name) (get-attributes (assq-ref fixtures fixture-name))) @@ -102,21 +102,21 @@ (define (assign-attr! fix-name attr-name value-func) (set-value-func! (find-attribute-by-name - (attributes fix-name) + (get-fixture-attributes fix-name) attr-name) value-func)) (define (fixture-address-string fix) (string-append - (number->string (universe fix)) + (number->string (get-fixture-universe fix)) "." - (number->string (start-addr fix)))) + (number->string (get-fixture-start-addr fix)))) (define (fixture-string fix) (string-append - (friendly-name fix) + (get-fixture-friendly-name fix) " at " (fixture-address-string fix))) |