summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-06-16 23:18:55 +0200
committerThomas White <taw@physics.org>2020-06-16 23:18:55 +0200
commitdfcf44a02eb1a9759e1d29cd2a33a1f58d122de4 (patch)
tree0ef7a0d61f69f61939fbc6c971010b9bae737fec
parent746b0c880ce786ba6ceb900228abbab0eed1dd54 (diff)
Rename functions
Avoiding "get" seems to just result in confusion
-rw-r--r--guile/nanolight/fixture.scm18
-rw-r--r--guile/nanolight/state.scm12
2 files changed, 15 insertions, 15 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)))
diff --git a/guile/nanolight/state.scm b/guile/nanolight/state.scm
index 7752156..f6f0193 100644
--- a/guile/nanolight/state.scm
+++ b/guile/nanolight/state.scm
@@ -114,15 +114,15 @@
(stable-sort state (lambda (a b)
(or
(<
- (universe (fixture a))
- (universe (fixture b)))
+ (get-fixture-universe (fixture a))
+ (get-fixture-universe (fixture b)))
(and
(eq?
- (universe (fixture a))
- (universe (fixture b)))
+ (get-fixture-universe (fixture a))
+ (get-fixture-universe (fixture b)))
(<
- (start-addr (fixture a))
- (start-addr (fixture b))))))))
+ (get-fixture-start-addr (fixture a))
+ (get-fixture-start-addr (fixture b))))))))
(define (print-state st)