diff --git a/bin/keyboardcomposer b/bin/keyboardcomposer --- a/bin/keyboardcomposer +++ b/bin/keyboardcomposer @@ -204,14 +204,6 @@ class KeyboardComposer(Frame, SubClient) self.stop_frequent_update_time = 0 - def onNewSub(self, sub): - log.info("new %s", sub) - self.graph.addHandler(self.draw_sliders) - - def onLostSub(self, subUri): - log.info("lost %s", subUri) - self.graph.addHandler(self.draw_sliders) - def draw_sliders(self): for r in self.rows: r.destroy() @@ -223,6 +215,9 @@ class KeyboardComposer(Frame, SubClient) self.tk_focusFollowsMouse() + self.submasters.findSubs() # trigger graph load, but we read + # from get_all_subs, below + rowcount = -1 col = 0 last_group = None @@ -234,8 +229,6 @@ class KeyboardComposer(Frame, SubClient) self.graph.value(sub.uri, L9['order']), sub) for sub in self.submasters.get_all_subs()) - #dispatcher.connect(self.onNewSub, "new submaster") - #dispatcher.connect(self.onLostSub, "lost submaster") log.info("withgroups %s", withgroups) for group, order, sub in withgroups: diff --git a/light9/Submaster.py b/light9/Submaster.py --- a/light9/Submaster.py +++ b/light9/Submaster.py @@ -281,7 +281,7 @@ def combine_subdict(subdict, name=None, return maxes -class Submasters: +class Submasters(object): "Collection o' Submaster objects" def __init__(self, graph): self.submasters = {} # uri : Submaster