# HG changeset patch # User David McClosky # Date 2007-06-15 21:07:04 # Node ID a4c294b8c9c28aea2d8f1798fa600a9da3e3cd2a # Parent c58e781829a3a42bb576918b4792d1eeba3c00b9 keyboardcomposer: reorganize Sliders, add bump buttons diff --git a/bin/keyboardcomposer b/bin/keyboardcomposer --- a/bin/keyboardcomposer +++ b/bin/keyboardcomposer @@ -117,7 +117,7 @@ class KeyboardComposer(Frame, SubClient) def connect_to_hw(self, hw_sliders): if hw_sliders: - self.sliders = Sliders(self.hw_slider_moved) + self.sliders = Sliders(self) else: self.sliders = DummySliders() @@ -334,12 +334,21 @@ class LevelServer(xmlrpc.XMLRPC): return ret class Sliders(BCF2000): - def __init__(self, cb): + def __init__(self, kc): BCF2000.__init__(self) - self.cb = cb + self.kc = kc def valueIn(self, name, value): + kc = self.kc if name.startswith("slider"): - self.cb(int(name[6:]) - 1, value / 127) + kc.hw_slider_moved(int(name[6:]) - 1, value / 127) + elif name.startswith("button-lower"): + col = int(name[12:]) - 1 + tkslider = kc.slider_table[(kc.current_row, col)] + slider_var = tkslider.slider_var + if slider_var.get() == 1: + slider_var.set(0) + else: + slider_var.set(1) if __name__ == "__main__": parser = OptionParser()