From 2382fb2b47c87e574c79f095d62c6523177f66c7 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Sat, 6 Jun 2020 15:45:34 +0200
Subject: Remove "get-"

---
 guile/nanolight/fixture.scm | 18 +++++++++---------
 guile/nanolight/state.scm   | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/guile/nanolight/fixture.scm b/guile/nanolight/fixture.scm
index fbaecb2..78fb596 100644
--- a/guile/nanolight/fixture.scm
+++ b/guile/nanolight/fixture.scm
@@ -5,7 +5,7 @@
              make-output patch-fixture
              fixture-string fixture-address-string
              percent->dmxval chan
-             get-start-addr get-universe
+             start-addr universe
              assign-attr!))
 
 (use-modules (srfi srfi-1))
@@ -54,19 +54,19 @@
   (universe
     #:init-value #f
     #:init-keyword #:uni
-    #:getter get-universe
+    #:getter universe
     #:setter set-universe!)
 
   (start-addr
     #:init-value #f
     #:init-keyword #:sa
-    #:getter get-start-addr
+    #:getter start-addr
     #:setter set-start-addr!)
 
   (friendly-name
     #:init-value "Fixture"
     #:init-keyword #:friendly-name
-    #:getter get-friendly-name
+    #:getter friendly-name
     #:setter set-friendly-name!))
 
 
@@ -89,14 +89,14 @@
 
 (define (fixture-address-string fix)
   (string-append
-    (number->string (get-universe fix))
+    (number->string (universe fix))
     "."
-    (number->string (get-start-addr fix))))
+    (number->string (start-addr fix))))
 
 
 (define (fixture-string fix)
   (string-append
-    (get-friendly-name fix)
+    (friendly-name fix)
     " at "
     (fixture-address-string fix)))
 
@@ -148,8 +148,8 @@
         (define (run-translator fix attr set-dmx)
           (let ((trans (translator attr)))
             (trans
-              (get-universe fix)
-              (get-start-addr fix)
+              (universe fix)
+              (start-addr fix)
               ((value-func attr))
               set-dmx)))
 
diff --git a/guile/nanolight/state.scm b/guile/nanolight/state.scm
index 8237d6e..6c95c3d 100644
--- a/guile/nanolight/state.scm
+++ b/guile/nanolight/state.scm
@@ -118,15 +118,15 @@
   (stable-sort state (lambda (a b)
                        (or
                          (<
-                           (get-universe (fixture a))
-                           (get-universe (fixture b)))
+                           (universe (fixture a))
+                           (universe (fixture b)))
                          (and
                            (eq?
-                             (get-universe (fixture a))
-                             (get-universe (fixture b)))
+                             (universe (fixture a))
+                             (universe (fixture b)))
                            (<
-                             (get-start-addr (fixture a))
-                             (get-start-addr (fixture b))))))))
+                             (start-addr (fixture a))
+                             (start-addr (fixture b))))))))
 
 
 (define (print-state st)
-- 
cgit v1.2.3