light9 Changeset - 4c3060ceddcc

Changeset - 4c3060ceddcc

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

dmcc - 21 years ago 2003-07-07 06:56:15

autoshifting is controllable now

1 file changed with 23 insertions and 8 deletions:

flax/CueFaders.py

0 comments (0 inline, 0 general)

flax/CueFaders.py

➞

Show inline comments

@@ @@ -57,70 +57,85 @@ class TimedGoButton(Tk.Frame): @@
                 (percent * (self.end_level - self.start_level))
             self.scale_to_fade.scale_var.set(newlevel)
             if newlevel != self.end_level:
                 self.after(10, self.do_fade)
         else:
             self.scale_to_fade.scale_var.set(self.end_level)
 class CueFader(Tk.Frame):
     def __init__(self, master, cuelist):
         Tk.Frame.__init__(self, master)
         self.cuelist = cuelist
         self.auto_shift = 0
         self.auto_shift = Tk.IntVar()
         self.auto_shift.set(1)
         self.scales = {}
         self.shift_buttons = {}
         topframe = Tk.Frame(self)
         self.current_cues = Tk.Label(topframe)
         self.current_cues.pack()
         self.update_cue_display()
         topframe.pack()
         bottomframe = Tk.Frame(self)
         self.auto_shift_checkbutton = Tk.Checkbutton(self,
             variable=self.auto_shift, text='Autoshift',
             command=self.toggle_autoshift)
         self.auto_shift_checkbutton.pack()
         bottomframe.pack(side='bottom')
         middleframe = Tk.Frame(self)
         for name, start, end, side in (('Prev', 1, 0, 'left'),
                                        ('Next', 0, 1, 'right')):
             shift = Tk.Button(self, text="Shift %s" % name, state='disabled',
                 command=lambda name=name: self.shift(name))
             shift.pack(side=side, fill='both', expand=1)
             frame = Tk.Frame(self)
             scale = LabelledScale(frame, name, from_=start, to_=end,
                 res=0.01, orient='horiz')
             scale.pack(fill='both', expand=1)
             go = TimedGoButton(frame, 'Go %s' % name, scale)
             go.pack(fill='both', expand=1)
             frame.pack(side=side, fill='both', expand=1)
             shift = Tk.Button(frame, text="Shift %s" % name, state='disabled',
                 command=lambda name=name: self.shift(name))
             self.scales[name] = scale
             self.shift_buttons[name] = shift
             scale.scale_var.trace('w', \
                 lambda x, y, z, name=name, scale=scale: self.xfade(name, scale))
         middleframe.pack(side='bottom', fill='both', expand=1)
     def toggle_autoshift(self):
         for name, button in self.shift_buttons.items():
             if not self.auto_shift.get():
                 button.pack(side='bottom', fill='both', expand=1)
             else:
                 button.pack_forget()
     def shift(self, name):
         for scale in self.scales.values():
             scale.scale_var.set(0)
-            if name == 'Next': scale.update()
+            scale.scale.update()
         print "shift", name
         self.cuelist.shift((-1, 1)[name == 'Next'])
         self.update_cue_display()
     def update_cue_display(self):
         current_cues = [cue.name for cue in self.cuelist.get_current_cues()]
         self.current_cues['text'] = ', '.join(current_cues)
     def xfade(self, name, scale):
         scale_val = scale.scale_var.get()
         if scale_val == 1:
             if self.auto_shift:
+            if self.auto_shift.get():
                 self.shift(name)
             else:
                 self.shift_buttons[name]['state'] = 'normal'
         else:
             # disable any dangerous shifting
             self.shift_buttons[name]['state'] = 'disabled'
         if scale_val != 0:
             # disable illegal three part crossfades
             # TODO:
             # if name == 'Next':
             #   disable go_prev button and slider, lock slider at 0

0 comments (0 inline, 0 general)