# HG changeset patch
# User David McClosky <dmcc@bigasterisk.com>
# Date 1119058643 0
# Node ID 2848cf5e14c5cbcde45cab7231c435ec19f7d6af
# Parent  34d29b3a1ce30f38229db1b86db3ceffe4a0aa17
keyboardcomposer: skip subs at 0 when combining, temporary subs don't listen for reloads

diff -r 34d29b3a1ce3 -r 2848cf5e14c5 bin/keyboardcomposer
--- a/bin/keyboardcomposer	Sat Jun 18 01:37:57 2005 +0000
+++ b/bin/keyboardcomposer	Sat Jun 18 01:37:23 2005 +0000
@@ -209,7 +209,7 @@
             for name, slidervar in self.slider_vars.items()])
     def get_levels_as_sub(self):
         scaledsubs = [self.submasters.get_sub_by_name(sub) * level \
-            for sub, level in self.get_levels().items()]
+            for sub, level in self.get_levels().items() if level > 0.0]
 
         maxes = sub_maxes(*scaledsubs)
         return maxes
diff -r 34d29b3a1ce3 -r 2848cf5e14c5 light9/Submaster.py
--- a/light9/Submaster.py	Sat Jun 18 01:37:57 2005 +0000
+++ b/light9/Submaster.py	Sat Jun 18 01:37:23 2005 +0000
@@ -14,7 +14,8 @@
         else:
             self.levels = {}
             self.reload(quiet=True)
-        dispatcher.connect(self.reload, 'reload all subs')
+        if not self.temporary:
+            dispatcher.connect(self.reload, 'reload all subs')
     def reload(self, quiet=False):
         if self.temporary:
             return