Op: vis method instead of field

2 files changed, 26 insertions, 10 deletions

diff --git a/alv-lib/midi.moon b/alv-lib/midi.moon
index 30acc33..3f9eedd 100644
--- a/alv-lib/midi.moon
+++ b/alv-lib/midi.moon
@@ -80,7 +80,6 @@ cc = Constant.meta
         range: Input.cold range or Constant.str 'uni'
 
       @out or= T.num\mk_sig apply_range @inputs.range, 0
-      @vis.bar = 0
 
     tick: =>
       { :port, :cc, :chan, :range } = @inputs
@@ -88,8 +87,14 @@ cc = Constant.meta
         if msg.status == 'control-change' and
            (chan! == -1 or msg.chan == chan!) and
            msg.a == cc!
+          @state = msg.b / 128
           @out\set apply_range range, msg.b
-          @vis.bar = msg.b / 127
+
+    vis: =>
+      {
+        type: 'bar'
+        bar: @state
+      }
 
 {
   :input
diff --git a/alv-lib/time.moon b/alv-lib/time.moon
index aeab467..85145b4 100644
--- a/alv-lib/time.moon
+++ b/alv-lib/time.moon
@@ -110,7 +110,12 @@ lfo = Constant.meta
         when 'saw' then @state % 1
         when 'tri' then math.abs (2*@state % 2) - 1
         else error Error 'argument', "unknown wave type '#{wave}'"
-      @vis.bar = @out!
+
+    vis: =>
+      {
+        type: 'bar'
+        bar: @.out!
+      }
 
 ramp = Constant.meta
   meta:
@@ -145,9 +150,14 @@ ramp = Constant.meta
       while @state >= 1
         @state -= 1
 
-      @vis.bar = @state
       @out\set @state * max
 
+    vis: =>
+      {
+        type: 'bar'
+        bar: @state
+      }
+
 tick = Constant.meta
   meta:
     name: 'tick'
@@ -164,7 +174,6 @@ tick = Constant.meta
       super ...
       @state or= { phase: 0, count: 0 }
       @out or= T.num\mk_sig @state.count
-      @vis.onchange = true
 
     pattern = -evt.clock + sig.num
     setup: (inputs, scope) =>
@@ -181,6 +190,8 @@ tick = Constant.meta
         @state.count += 1
         @out\set @state.count
 
+    vis: => type: 'event'
+
 every = Constant.meta
   meta:
     name: 'every'
@@ -231,7 +242,6 @@ Emits `evt1`, `evt2`, … as events with delays `delay0`, `delay1`, … in betwe
     new: (...) =>
       super ...
       @state or= { i: 1, t: 0 }
-      @vis.step = @state.i
 
     pair = (sig! + sig.num)\named('value', 'delay')
     pattern = -evt.clock + sig.num + pair*0
@@ -260,7 +270,6 @@ Emits `evt1`, `evt2`, … as events with delays `delay0`, `delay1`, … in betwe
         if @state.t >= current.delay!
           @state.t -= current.delay!
           @state.i = 1 + (@state.i % #@inputs.steps)
-          @vis.step = @state.i
           change = true
         else
           break
@@ -268,6 +277,8 @@ Emits `evt1`, `evt2`, … as events with delays `delay0`, `delay1`, … in betwe
       if current.value and (change or current.value\dirty!)
         @out\set current.value!
 
+    vis: => step: @state.i
+
 bang_seq = Constant.meta
   meta:
     name: 'bang-seq'
@@ -285,7 +296,6 @@ Emits `bang!`s with delays `delay0`, `delay1`, … in between.
       super ...
       @out = T.bang\mk_evt!
       @state or= { i: 1, t: 0 }
-      @vis.step = @state.i
 
     pattern = -evt.clock + sig.num*0
     setup: (inputs, scope) =>
@@ -305,13 +315,14 @@ Emits `bang!`s with delays `delay0`, `delay1`, … in between.
         if @state.t >= current
           @state.t -= current
           @state.i = 1 + (@state.i % #@inputs.steps)
-          @vis.step = @state.i
           bang = true
         else
           break
 
       if bang
-        @out\set true
+        @out
+
+    vis: => step: @state.i\set true
 
 {
   :clock