Mercurial > code > home > repos > light9

changeset 1427:e070c9f1c5e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
partial fixes to KC Ignore-this: 52c7627484ebcb2f9ae6b981a7344e4f
author drewp@bigasterisk.com
date Sat, 11 Jun 2016 04:33:36 +0000
parents 05a5226a8d61
children 7fd31c549e17
files bin/keyboardcomposer
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/bin/keyboardcomposer	Sat Jun 11 04:31:11 2016 +0000
+++ b/bin/keyboardcomposer	Sat Jun 11 04:33:36 2016 +0000
@@ -19,7 +19,7 @@
 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
 
@@ -224,6 +224,7 @@
         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)
@@ -236,7 +237,7 @@
 
             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
@@ -450,7 +451,7 @@
             strength = graph.value(setting, L9['level'])
             outputSettings.extend(
                 self.effectEval[effect].outputFromEffect(
-                    [(L9['strength'], strength)]))
+                    [(L9['strength'], strength)], songTime=time.time()))
 
         return outputSettings