light9 Changeset - 1d0fbb6ae089

Changeset - 1d0fbb6ae089

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

drewp@bigasterisk.com - 6 years ago 2019-06-10 02:29:12
drewp@bigasterisk.com

fix KC sliders support
Ignore-this: c1a285064c54c07266660648a5c8dad

1 file changed with 7 insertions and 5 deletions:

bin/keyboardcomposer

0 comments (0 inline, 0 general)

bin/keyboardcomposer

➞

Show inline comments

@@ @@ -292,25 +292,25 @@ class KeyboardComposer(tk.Frame, SubClie @@
         rowcount = -1
         col = 0
         last_group = None
         withgroups = []
         for effect in self.graph.subjects(RDF.type, L9['Effect']):
             withgroups.append((self.graph.value(effect, L9['group']),
                                self.graph.value(effect, L9['order']),
                                self.graph.label(effect), effect))
         withgroups.sort()
-        log.info("withgroups %s", withgroups)
+        log.debug("withgroups %s", withgroups)
         self.effectEval: Dict[URIRef, light9.effect.effecteval.EffectEval] = {}
         imp.reload(light9.effect.effecteval)
         simpleOutputs = SimpleOutputs(self.graph)
         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)
@@ @@ -326,30 +326,31 @@ class KeyboardComposer(tk.Frame, SubClie @@
             last_group = group
     def toggle_slider_connectedness(self):
         self.use_hw_sliders = not self.use_hw_sliders
         if self.use_hw_sliders:
             self.sliders.reopen()
         else:
             self.sliders.close()
         self.change_row(self.current_row)
         self.rows[self.current_row].focus()
     def connect_to_hw(self, hw_sliders):
         log.info('connect_to_hw')
         if hw_sliders:
             try:
                 self.sliders = Sliders(self)
                 log.info("connected to sliders")
             except IOError:
                 log.info("no hardware sliders")
             except IOError as e:
                 log.info("no hardware sliders %r", e)
                 self.sliders = DummySliders()
                 self.use_hw_sliders = False
             dispatcher.connect(self.send_to_hw, 'send_to_hw')
         else:
             self.sliders = DummySliders()
     def make_key_hints(self):
         keyhintrow = tk.Frame(self)
         col = 0
         for upkey, downkey in zip(nudge_keys['up'], nudge_keys['down']):
             # what a hack!
@@ @@ -460,25 +461,25 @@ class KeyboardComposer(tk.Frame, SubClie @@
         value = int(value * 100) / 100
         try:
             subbox = self.slider_table[(self.current_row, col)]
         except KeyError:
             return  # no slider assigned at that column
         if hasattr(self, 'pendingHwSet'):
             import twisted.internet.error
             try:
                 self.pendingHwSet.cancel()
             except twisted.internet.error.AlreadyCalled:
                 pass
-        self.pendingHwSet = reactor.callLater(.01, subbox.safeSliderSet, value)
+        self.pendingHwSet = reactor.callLater(.01, subbox.setVal, value)
     def send_to_hw(self, sub, hwCol, boxRow):
         if isinstance(self.sliders, DummySliders):
             return
         assert isinstance(sub, URIRef), repr(sub)
         if boxRow != self.current_row:
             return
         try:
             level = self.get_levels()[sub]
@@ @@ -615,24 +616,25 @@ class LevelServerHttp(resource.Resource) @@
         else:
             raise NotImplementedError(repr(request))
 class Sliders(BCF2000):
     def __init__(self, kc):
         devices = [
             '/dev/snd/midiC3D0', '/dev/snd/midiC2D0', '/dev/snd/midiC1D0'
+        ]
         for dev in devices:
             try:
                 log.info('try sliders on %s', dev)
                 BCF2000.__init__(self, dev=dev)
             except IOError:
                 if dev is devices[-1]:
                     raise
             else:
                 break
         self.kc = kc
         log.info('found sliders on %s', dev)
     def valueIn(self, name, value):
         kc = self.kc
@@ @@ -679,25 +681,25 @@ def launch(opts: Any, root: tk.Tk, graph @@
                  anchor='w').pack(side='top', fill='x')
 if __name__ == "__main__":
     parser = OptionParser()
     parser.add_option('--no-sliders',
                       action='store_true',
                       help="don't attach to hardware sliders")
     clientsession.add_option(parser)
     parser.add_option('-v', action='store_true', help="log info level")
     opts, args = parser.parse_args()
-    log.setLevel(logging.DEBUG if opts.v else logging.WARN)
+    log.setLevel(logging.DEBUG if opts.v else logging.INFO)
     logging.getLogger('colormath').setLevel(logging.INFO)
     graph = SyncedGraph(networking.rdfdb.url, "keyboardcomposer")
     # i think this also needs delayed start (like subcomposer has), to have a valid graph
     # before setting any stuff from the ui
     root = tk.Tk()
     initTkdnd(root.tk, 'tkdnd/trunk/')
     session = clientsession.getUri('keyboardcomposer', opts)

0 comments (0 inline, 0 general)