light9 Changeset - e070c9f1c5e7

Changeset - e070c9f1c5e7

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

drewp@bigasterisk.com - 9 years ago 2016-06-11 04:33:36
drewp@bigasterisk.com

partial fixes to KC
Ignore-this: 52c7627484ebcb2f9ae6b981a7344e4f

1 file changed with 4 insertions and 3 deletions:

bin/keyboardcomposer

0 comments (0 inline, 0 general)

bin/keyboardcomposer

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ from light9.subclient import SubClient @@
 from light9 import showconfig, networking, prof
 from light9.uihelpers import toplevelat
 from light9.namespaces import L9
 from light9.tkdnd import initTkdnd, dragSourceRegister, dropTargetRegister
 from light9.rdfdb import clientsession
 from light9.rdfdb.syncedgraph import SyncedGraph
-from light9.effect.sequencer import EffectEval
+import light9.effect.effecteval
 from bcf2000 import BCF2000
 nudge_keys = {
     'up'   : list('qwertyui'),
     'down' : list('asdfghjk')
@@ @@ -221,25 +221,26 @@ class KeyboardComposer(tk.Frame, SubClie @@
                 effect))
         withgroups.sort()
         log.info("withgroups %s", withgroups)
         self.effectEval = {}
         reload(light9.effect.effecteval)
         for group, order, sortLabel, effect in withgroups:
             if col == 0 or group != last_group:
                 row = self.make_row(group)
                 rowcount += 1
                 col = 0
             subbox = SubmasterBox(row, self.graph, effect, self.session, col, rowcount)
             subbox.place(relx=col / 8, rely=0, relwidth=1 / 8, relheight=1)
             self.subbox[effect] = self.slider_table[(rowcount, col)] = subbox
             self.setup_key_nudgers(subbox.scale)
             self.effectEval[effect] = EffectEval(self.graph, effect)
+            self.effectEval[effect] = light9.effect.effecteval.EffectEval(self.graph, effect)
             col = (col + 1) % 8
             last_group = group
     def toggle_slider_connectedness(self):
         self.use_hw_sliders = not self.use_hw_sliders
@@ @@ -447,13 +448,13 @@ class KeyboardComposer(tk.Frame, SubClie @@
         outputSettings = []
         for setting in graph.objects(self.session, L9['subSetting']):
             effect = graph.value(setting, L9['sub'])
             strength = graph.value(setting, L9['level'])
             outputSettings.extend(
                 self.effectEval[effect].outputFromEffect(
                     [(L9['strength'], strength)]))
+                    [(L9['strength'], strength)], songTime=time.time()))
         return outputSettings
     def save_current_stage(self, subname):
         raise NotImplementedError
         log.info("saving current levels as %s", subname)

0 comments (0 inline, 0 general)