light9 Changeset - a4c294b8c9c2

Changeset - a4c294b8c9c2

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

David McClosky - 18 years ago 2007-06-15 21:07:04
dmcc@bigasterisk.com

keyboardcomposer: reorganize Sliders, add bump buttons

1 file changed with 13 insertions and 4 deletions:

bin/keyboardcomposer

0 comments (0 inline, 0 general)

bin/keyboardcomposer

➞

Show inline comments

@@ @@ -108,25 +108,25 @@ class KeyboardComposer(Frame, SubClient) @@
             command=self.refresh, bg='black', fg='white')
         self.refreshbutton.pack(side=LEFT)
         self.save_stage_button = Button(self.buttonframe, text="Save",
             command=lambda: self.save_current_stage(self.sub_name.get()),
             bg='black', fg='white')
         self.save_stage_button.pack(side=LEFT)
         self.sub_name = Entry(self.buttonframe, bg='black', fg='white')
         self.sub_name.pack(side=LEFT)
         self.stop_frequent_update_time = 0
     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()
     def make_key_hints(self):
         keyhintrow = Frame(self)
         col = 0
         for upkey, downkey in zip(nudge_keys['up'],
                                   nudge_keys['down']):
             # what a hack!
             downkey = downkey.replace('semicolon', ';')
             upkey, downkey = (upkey.upper(), downkey.upper())
@@ @@ -325,30 +325,39 @@ class LevelServer(xmlrpc.XMLRPC): @@
         self.name_to_subtk = name_to_subtk
     def xmlrpc_fadesub(self,subname,level,secs):
         """submaster will fade to level in secs"""
         try:
             self.name_to_subtk[subname].scale.fade(level,secs)
             ret='ok'
         except Exception,e:
             ret=str(e)
         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()
     parser.add_option('--nonpersistent', action="store_true",
                       help="don't load or save levels")
     parser.add_option('--sliders', action='store_true',
                       help="attach to hardware sliders")
     opts, args = parser.parse_args()
     s = Submasters()
     root = Tk()

0 comments (0 inline, 0 general)