From adba2eeed583885cd5586d1cf221d6b20139f958 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@bitwiz.me.uk>
Date: Fri, 15 Jan 2021 17:15:37 +0100
Subject: Remove selection-state

There's no reason for this to exist.  Just change things directly in
programmer-state.
---
 guile/starlet/base.scm                | 10 ++--------
 guile/starlet/midi-control/faders.scm |  8 ++------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'guile')

diff --git a/guile/starlet/base.scm b/guile/starlet/base.scm
index 78dd120..8673be3 100644
--- a/guile/starlet/base.scm
+++ b/guile/starlet/base.scm
@@ -45,7 +45,6 @@
             fixture?
             fixture-attribute?
             programmer-state
-            selection-state
             current-value))
 
 (define-class <fixture-attribute> (<object>)
@@ -136,9 +135,6 @@
 ;; The state used to build a new scene for recording
 (define programmer-state (make <starlet-state>))
 
-;; The state which holds the fixtures being altered right now
-(define selection-state (make <starlet-state>))
-
 (define (blackout state)
   (state-for-each
    (lambda (fix attr val)
@@ -379,8 +375,7 @@
                              (merge-states-htp
                               (reverse   ;; Put "home" state last
                                (atomic-box-ref state-list)))
-                             programmer-state
-                             selection-state))))
+                             programmer-state))))
 
       ;; Request all fixtures to output their DMX values
       (for-each (lambda (fix)
@@ -457,8 +452,7 @@
                           (merge-states-htp
                            (reverse   ;; Put "home" state last
                             (atomic-box-ref state-list)))
-                          programmer-state
-                          selection-state)))
+                          programmer-state)))
         (attr (find-attr fix attr-name)))
     (value->number (state-find fix attr combined-state) 0)))
 
diff --git a/guile/starlet/midi-control/faders.scm b/guile/starlet/midi-control/faders.scm
index 27089ab..1c321aa 100644
--- a/guile/starlet/midi-control/faders.scm
+++ b/guile/starlet/midi-control/faders.scm
@@ -47,7 +47,7 @@
      #:cc-number cc-number
      #:func (lambda (prev-cc-val new-cc-value)
               (set! offset (+ offset (ccval->offset new-cc-value)))
-              (set-attr! selection-state
+              (set-attr! programmer-state
                          fix
                          attr
                          (+ old-val offset))))))
@@ -83,7 +83,7 @@
      #:func (lambda (prev-cc-val new-cc-value)
 
               (when congruent
-                (set-attr! selection-state
+                (set-attr! programmer-state
                            fix
                            attr
                            (ccval->percent new-cc-value)))
@@ -164,10 +164,6 @@
       (send-note-off leds))))
 
 
-  (add-state-to-state! merge-rule-replace
-                       selection-state
-                       programmer-state)
-  (clear-state! selection-state)
   (for-each remove-midi-callback! midi-callbacks)
 
   (for-each (lambda (control-spec)
-- 
cgit v1.2.3