diff light8/Lightboard.py @ 79:233fe8cefa36

ExtSliderMapping moved to new file
author dmcc
date Fri, 12 Jul 2002 10:38:25 +0000
parents 0969d8a6729d
children d5deeed83228
line wrap: on
line diff
--- a/light8/Lightboard.py	Fri Jul 12 10:05:57 2002 +0000
+++ b/light8/Lightboard.py	Fri Jul 12 10:38:25 2002 +0000
@@ -9,7 +9,8 @@
 from Xfader import *
 from subediting import Subediting
 from Fader import Fader
-import io, stage, Subs, Patch, ExternalInput
+from ExternalInput import ExternalSliders
+import io, stage, Subs, Patch, ExtSliderMapper
 
 class Pickles:
     def __init__(self, scalelevels, subs=None, windowpos=None):
@@ -56,8 +57,9 @@
         effect_tl = toplevelat('effect')
 
         mapping_tl = toplevelat('mapping')
-        self.slidermapper = ExtSliderMapper(mapping_tl, self.scalelevels, 
-                ExternalInput.ExternalSliders())
+        self.slidermapper = ExtSliderMapper.ExtSliderMapper(mapping_tl, 
+                                                            self.scalelevels, 
+                                                            ExternalSliders())
         self.slidermapper.pack()
 
         self.subpanels = Subpanels(sub_tl, effect_tl, scene_tl, self, self.scalelevels,
@@ -156,7 +158,8 @@
         # load levels from external sliders
         extlevels = self.slidermapper.get_levels()
         for name, val in extlevels.items():
-            self.scalelevels[name].set(val)
+            if name in self.scalelevels:
+                self.scalelevels[name].set(val)
         
         for lev,lab,oldlev,numlab in zip(levels, self.channel_levels, 
                                          self.oldlevels,