OO closure bits no longer needed, because fixture list is now top-level

1 files changed, 4 insertions, 14 deletions

diff --git a/guile/nanolight/fixture.scm b/guile/nanolight/fixture.scm
index 7fdb5c4..cad2ba5 100644
--- a/guile/nanolight/fixture.scm
+++ b/guile/nanolight/fixture.scm
@@ -146,8 +146,9 @@
     (home-all-attributes new-fixture)
     (unless output
       (set! output (make-output)))           ; Start output if not already running
-    (output 'add-fixture fixture-name new-fixture)
-    new-fixture))
+    (set! fixtures (acons fixture-name
+                          new-fixture
+                          fixtures))))
 
 
 (define* (patch-many fixture-name-base
@@ -262,15 +263,4 @@
       (run-scanout))
 
     ;; Start sending output
-    (make-thread run-scanout)
-
-    ;; Method functions
-    (define (add-fixture fixture fixture-name)
-      (set! fixtures (acons fixture fixture-name fixtures)))
-
-    (lambda args
-      (apply
-        (case (car args)
-          ((add-fixture) add-fixture)
-          (else => (error "Invalid method")))
-        (cdr args)))))
+    (make-thread run-scanout)))